diff options
| -rw-r--r-- | libsolidity/interface/ABI.cpp | 1 | ||||
| -rw-r--r-- | libsolidity/interface/ABI.h | 4 | ||||
| -rw-r--r-- | libsolidity/interface/AssemblyStack.cpp | 14 | ||||
| -rw-r--r-- | libsolidity/interface/AssemblyStack.h | 2 | ||||
| -rw-r--r-- | libsolidity/interface/CompilerStack.cpp | 17 | ||||
| -rw-r--r-- | libsolidity/interface/CompilerStack.h | 7 | ||||
| -rw-r--r-- | libsolidity/interface/GasEstimator.cpp | 19 | ||||
| -rw-r--r-- | libsolidity/interface/GasEstimator.h | 6 | ||||
| -rw-r--r-- | libsolidity/interface/Natspec.cpp | 3 | ||||
| -rw-r--r-- | libsolidity/interface/Natspec.h | 4 | ||||
| -rw-r--r-- | libsolidity/interface/ReadFile.h | 4 | ||||
| -rw-r--r-- | libsolidity/interface/StandardCompiler.cpp | 6 | ||||
| -rw-r--r-- | libsolidity/interface/Version.cpp | 5 | ||||
| -rw-r--r-- | libsolidity/interface/Version.h | 2 |
14 files changed, 49 insertions, 45 deletions
diff --git a/libsolidity/interface/ABI.cpp b/libsolidity/interface/ABI.cpp index aefb34af..0d27109e 100644 --- a/libsolidity/interface/ABI.cpp +++ b/libsolidity/interface/ABI.cpp @@ -19,6 +19,7 @@ */ #include <libsolidity/interface/ABI.h> + #include <libsolidity/ast/AST.h> using namespace std; diff --git a/libsolidity/interface/ABI.h b/libsolidity/interface/ABI.h index db70729d..082f3900 100644 --- a/libsolidity/interface/ABI.h +++ b/libsolidity/interface/ABI.h @@ -20,9 +20,9 @@ #pragma once -#include <string> -#include <memory> #include <json/json.h> +#include <memory> +#include <string> namespace dev { diff --git a/libsolidity/interface/AssemblyStack.cpp b/libsolidity/interface/AssemblyStack.cpp index b97e00ae..69bceefc 100644 --- a/libsolidity/interface/AssemblyStack.cpp +++ b/libsolidity/interface/AssemblyStack.cpp @@ -23,20 +23,18 @@ #include <libsolidity/interface/AssemblyStack.h> #include <libsolidity/codegen/AsmCodeGen.h> - +#include <libevmasm/Assembly.h> #include <liblangutil/Scanner.h> -#include <libyul/AsmPrinter.h> -#include <libyul/AsmParser.h> + #include <libyul/AsmAnalysis.h> #include <libyul/AsmAnalysisInfo.h> -#include <libyul/backends/evm/EVMObjectCompiler.h> -#include <libyul/backends/evm/EVMCodeTransform.h> +#include <libyul/AsmParser.h> +#include <libyul/AsmPrinter.h> #include <libyul/backends/evm/EVMAssembly.h> +#include <libyul/backends/evm/EVMCodeTransform.h> #include <libyul/backends/evm/EVMDialect.h> +#include <libyul/backends/evm/EVMObjectCompiler.h> #include <libyul/ObjectParser.h> - -#include <libevmasm/Assembly.h> - #include <libyul/optimiser/Suite.h> using namespace std; diff --git a/libsolidity/interface/AssemblyStack.h b/libsolidity/interface/AssemblyStack.h index c8e3d35a..01db6b61 100644 --- a/libsolidity/interface/AssemblyStack.h +++ b/libsolidity/interface/AssemblyStack.h @@ -29,8 +29,8 @@ #include <libevmasm/LinkerObject.h> -#include <string> #include <memory> +#include <string> namespace langutil { diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp index 1e6e2330..625a665d 100644 --- a/libsolidity/interface/CompilerStack.cpp +++ b/libsolidity/interface/CompilerStack.cpp @@ -24,26 +24,27 @@ #include <libsolidity/interface/CompilerStack.h> -#include <libsolidity/interface/Version.h> -#include <libsolidity/analysis/SemVerHandler.h> -#include <libsolidity/ast/AST.h> -#include <libsolidity/parsing/Parser.h> -#include <libsolidity/analysis/ContractLevelChecker.h> #include <libsolidity/analysis/ControlFlowAnalyzer.h> #include <libsolidity/analysis/ControlFlowGraph.h> +#include <libsolidity/analysis/ContractLevelChecker.h> +#include <libsolidity/analysis/DocStringAnalyser.h> #include <libsolidity/analysis/GlobalContext.h> #include <libsolidity/analysis/NameAndTypeResolver.h> -#include <libsolidity/analysis/TypeChecker.h> -#include <libsolidity/analysis/DocStringAnalyser.h> -#include <libsolidity/analysis/StaticAnalyzer.h> #include <libsolidity/analysis/PostTypeChecker.h> +#include <libsolidity/analysis/SemVerHandler.h> +#include <libsolidity/analysis/StaticAnalyzer.h> #include <libsolidity/analysis/SyntaxChecker.h> +#include <libsolidity/analysis/TypeChecker.h> #include <libsolidity/analysis/ViewPureChecker.h> + +#include <libsolidity/ast/AST.h> #include <libsolidity/codegen/Compiler.h> #include <libsolidity/formal/SMTChecker.h> #include <libsolidity/interface/ABI.h> #include <libsolidity/interface/Natspec.h> #include <libsolidity/interface/GasEstimator.h> +#include <libsolidity/interface/Version.h> +#include <libsolidity/parsing/Parser.h> #include <libyul/YulString.h> diff --git a/libsolidity/interface/CompilerStack.h b/libsolidity/interface/CompilerStack.h index 2c7add3b..74033170 100644 --- a/libsolidity/interface/CompilerStack.h +++ b/libsolidity/interface/CompilerStack.h @@ -34,15 +34,14 @@ #include <libdevcore/Common.h> #include <libdevcore/FixedHash.h> -#include <json/json.h> - #include <boost/noncopyable.hpp> +#include <json/json.h> +#include <functional> +#include <memory> #include <ostream> #include <string> -#include <memory> #include <vector> -#include <functional> namespace langutil { diff --git a/libsolidity/interface/GasEstimator.cpp b/libsolidity/interface/GasEstimator.cpp index de6b2ce5..8ffcf951 100644 --- a/libsolidity/interface/GasEstimator.cpp +++ b/libsolidity/interface/GasEstimator.cpp @@ -20,18 +20,21 @@ * Gas consumption estimator working alongside the AST. */ -#include "GasEstimator.h" -#include <map> -#include <functional> -#include <memory> -#include <libdevcore/Keccak256.h> -#include <libevmasm/ControlFlowGraph.h> -#include <libevmasm/KnownState.h> -#include <libevmasm/PathGasMeter.h> +#include <libsolidity/interface/GasEstimator.h> + #include <libsolidity/ast/AST.h> #include <libsolidity/ast/ASTVisitor.h> #include <libsolidity/codegen/CompilerUtils.h> +#include <libevmasm/ControlFlowGraph.h> +#include <libevmasm/KnownState.h> +#include <libevmasm/PathGasMeter.h> +#include <libdevcore/Keccak256.h> + +#include <functional> +#include <map> +#include <memory> + using namespace std; using namespace dev; using namespace dev::eth; diff --git a/libsolidity/interface/GasEstimator.h b/libsolidity/interface/GasEstimator.h index 214a3e58..f40cffeb 100644 --- a/libsolidity/interface/GasEstimator.h +++ b/libsolidity/interface/GasEstimator.h @@ -24,12 +24,12 @@ #include <liblangutil/EVMVersion.h> -#include <libevmasm/GasMeter.h> #include <libevmasm/Assembly.h> +#include <libevmasm/GasMeter.h> -#include <vector> -#include <map> #include <array> +#include <map> +#include <vector> namespace dev { diff --git a/libsolidity/interface/Natspec.cpp b/libsolidity/interface/Natspec.cpp index 11dde349..7a89abae 100644 --- a/libsolidity/interface/Natspec.cpp +++ b/libsolidity/interface/Natspec.cpp @@ -24,8 +24,9 @@ */ #include <libsolidity/interface/Natspec.h> -#include <boost/range/irange.hpp> + #include <libsolidity/ast/AST.h> +#include <boost/range/irange.hpp> using namespace std; using namespace dev; diff --git a/libsolidity/interface/Natspec.h b/libsolidity/interface/Natspec.h index 0be4dda2..fbaa6d4d 100644 --- a/libsolidity/interface/Natspec.h +++ b/libsolidity/interface/Natspec.h @@ -25,9 +25,9 @@ #pragma once -#include <string> -#include <memory> #include <json/json.h> +#include <memory> +#include <string> namespace dev { diff --git a/libsolidity/interface/ReadFile.h b/libsolidity/interface/ReadFile.h index 7068629d..3b3d747e 100644 --- a/libsolidity/interface/ReadFile.h +++ b/libsolidity/interface/ReadFile.h @@ -17,9 +17,9 @@ #pragma once -#include <string> -#include <functional> #include <boost/noncopyable.hpp> +#include <functional> +#include <string> namespace dev { diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp index 21d213e7..5be267e9 100644 --- a/libsolidity/interface/StandardCompiler.cpp +++ b/libsolidity/interface/StandardCompiler.cpp @@ -21,16 +21,16 @@ */ #include <libsolidity/interface/StandardCompiler.h> -#include <liblangutil/SourceReferenceFormatter.h> + #include <libsolidity/ast/ASTJsonConverter.h> +#include <liblangutil/SourceReferenceFormatter.h> #include <libevmasm/Instruction.h> #include <libdevcore/JSON.h> #include <libdevcore/Keccak256.h> -#include <algorithm> - #include <boost/algorithm/string.hpp> #include <boost/optional.hpp> +#include <algorithm> using namespace std; using namespace dev; diff --git a/libsolidity/interface/Version.cpp b/libsolidity/interface/Version.cpp index b785d557..efd46d40 100644 --- a/libsolidity/interface/Version.cpp +++ b/libsolidity/interface/Version.cpp @@ -21,11 +21,12 @@ */ #include <libsolidity/interface/Version.h> -#include <string> + +#include <liblangutil/Exceptions.h> #include <libdevcore/CommonData.h> #include <libdevcore/Common.h> -#include <liblangutil/Exceptions.h> #include <solidity/BuildInfo.h> +#include <string> using namespace dev; using namespace dev::solidity; diff --git a/libsolidity/interface/Version.h b/libsolidity/interface/Version.h index 24c3555d..38d63ec6 100644 --- a/libsolidity/interface/Version.h +++ b/libsolidity/interface/Version.h @@ -22,8 +22,8 @@ #pragma once -#include <string> #include <libdevcore/Common.h> +#include <string> namespace dev { |