diff options
| author | Christian Parpart <christian@ethereum.org> | 2018-11-23 18:31:45 +0800 |
|---|---|---|
| committer | Christian Parpart <christian@ethereum.org> | 2018-11-23 19:37:19 +0800 |
| commit | 713d94476ec5ba61901b538c622c8cca6873c2af (patch) | |
| tree | fb9ce815bd1aff7c1b0269d47afd3a1116db4762 /libyul | |
| parent | 0f4ed52a719af90b52a15eb6709f46f03d4108b9 (diff) | |
| download | dexon-solidity-713d94476ec5ba61901b538c622c8cca6873c2af.tar.gz dexon-solidity-713d94476ec5ba61901b538c622c8cca6873c2af.tar.zst dexon-solidity-713d94476ec5ba61901b538c622c8cca6873c2af.zip | |
Reorder some include files and group <libyul/>'s together (as much as possible)
Diffstat (limited to 'libyul')
29 files changed, 7 insertions, 35 deletions
diff --git a/libyul/AsmCodeGen.cpp b/libyul/AsmCodeGen.cpp index 862337a7..5bc2fee3 100644 --- a/libyul/AsmCodeGen.cpp +++ b/libyul/AsmCodeGen.cpp @@ -28,12 +28,13 @@ #include <libyul/AsmAnalysis.h> #include <libyul/AsmAnalysisInfo.h> +#include <libyul/backends/evm/AbstractAssembly.h> +#include <libyul/backends/evm/EVMCodeTransform.h> + #include <libevmasm/Assembly.h> -#include <liblangutil/SourceLocation.h> #include <libevmasm/Instruction.h> -#include <libyul/backends/evm/AbstractAssembly.h> -#include <libyul/backends/evm/EVMCodeTransform.h> +#include <liblangutil/SourceLocation.h> #include <libdevcore/CommonIO.h> diff --git a/libyul/AsmData.h b/libyul/AsmData.h index e7af61bb..6979d29c 100644 --- a/libyul/AsmData.h +++ b/libyul/AsmData.h @@ -24,11 +24,11 @@ #include <libyul/AsmDataForward.h> +#include <libyul/YulString.h> + #include <libevmasm/Instruction.h> #include <liblangutil/SourceLocation.h> -#include <libyul/YulString.h> - #include <boost/variant.hpp> #include <boost/noncopyable.hpp> diff --git a/libyul/optimiser/CommonSubexpressionEliminator.cpp b/libyul/optimiser/CommonSubexpressionEliminator.cpp index 118d14ad..fc78b1ad 100644 --- a/libyul/optimiser/CommonSubexpressionEliminator.cpp +++ b/libyul/optimiser/CommonSubexpressionEliminator.cpp @@ -24,7 +24,6 @@ #include <libyul/optimiser/Metrics.h> #include <libyul/optimiser/SyntacticalEquality.h> #include <libyul/Exceptions.h> - #include <libyul/AsmData.h> using namespace std; diff --git a/libyul/optimiser/DataFlowAnalyzer.cpp b/libyul/optimiser/DataFlowAnalyzer.cpp index 7642948a..046f466c 100644 --- a/libyul/optimiser/DataFlowAnalyzer.cpp +++ b/libyul/optimiser/DataFlowAnalyzer.cpp @@ -25,7 +25,6 @@ #include <libyul/optimiser/NameCollector.h> #include <libyul/optimiser/Semantics.h> #include <libyul/Exceptions.h> - #include <libyul/AsmData.h> #include <libdevcore/CommonData.h> diff --git a/libyul/optimiser/DataFlowAnalyzer.h b/libyul/optimiser/DataFlowAnalyzer.h index a946529a..f83543c5 100644 --- a/libyul/optimiser/DataFlowAnalyzer.h +++ b/libyul/optimiser/DataFlowAnalyzer.h @@ -23,7 +23,6 @@ #pragma once #include <libyul/optimiser/ASTWalker.h> - #include <libyul/YulString.h> #include <map> diff --git a/libyul/optimiser/Disambiguator.cpp b/libyul/optimiser/Disambiguator.cpp index f6553ef6..e8c31aea 100644 --- a/libyul/optimiser/Disambiguator.cpp +++ b/libyul/optimiser/Disambiguator.cpp @@ -21,7 +21,6 @@ #include <libyul/optimiser/Disambiguator.h> #include <libyul/Exceptions.h> - #include <libyul/AsmData.h> #include <libyul/AsmScope.h> diff --git a/libyul/optimiser/Disambiguator.h b/libyul/optimiser/Disambiguator.h index 032bfedc..b2f80e47 100644 --- a/libyul/optimiser/Disambiguator.h +++ b/libyul/optimiser/Disambiguator.h @@ -21,12 +21,10 @@ #pragma once #include <libyul/ASTDataForward.h> - +#include <libyul/AsmAnalysisInfo.h> #include <libyul/optimiser/ASTCopier.h> #include <libyul/optimiser/NameDispenser.h> -#include <libyul/AsmAnalysisInfo.h> - #include <boost/variant.hpp> #include <boost/optional.hpp> diff --git a/libyul/optimiser/ExpressionInliner.cpp b/libyul/optimiser/ExpressionInliner.cpp index 2a1b8e63..abc006d4 100644 --- a/libyul/optimiser/ExpressionInliner.cpp +++ b/libyul/optimiser/ExpressionInliner.cpp @@ -23,7 +23,6 @@ #include <libyul/optimiser/InlinableExpressionFunctionFinder.h> #include <libyul/optimiser/Substitution.h> #include <libyul/optimiser/Semantics.h> - #include <libyul/AsmData.h> #include <boost/algorithm/cxx11/all_of.hpp> diff --git a/libyul/optimiser/ExpressionInliner.h b/libyul/optimiser/ExpressionInliner.h index ee98da8f..46c27080 100644 --- a/libyul/optimiser/ExpressionInliner.h +++ b/libyul/optimiser/ExpressionInliner.h @@ -20,7 +20,6 @@ #pragma once #include <libyul/optimiser/ASTWalker.h> - #include <libyul/ASTDataForward.h> #include <boost/variant.hpp> diff --git a/libyul/optimiser/ExpressionJoiner.cpp b/libyul/optimiser/ExpressionJoiner.cpp index 647e2705..90301bad 100644 --- a/libyul/optimiser/ExpressionJoiner.cpp +++ b/libyul/optimiser/ExpressionJoiner.cpp @@ -24,7 +24,6 @@ #include <libyul/optimiser/NameCollector.h> #include <libyul/optimiser/Utilities.h> #include <libyul/Exceptions.h> - #include <libyul/AsmData.h> #include <libdevcore/CommonData.h> diff --git a/libyul/optimiser/ExpressionJoiner.h b/libyul/optimiser/ExpressionJoiner.h index 0cc61981..62d3beb9 100644 --- a/libyul/optimiser/ExpressionJoiner.h +++ b/libyul/optimiser/ExpressionJoiner.h @@ -21,7 +21,6 @@ #pragma once #include <libyul/ASTDataForward.h> - #include <libyul/optimiser/ASTWalker.h> #include <map> diff --git a/libyul/optimiser/ExpressionSimplifier.cpp b/libyul/optimiser/ExpressionSimplifier.cpp index 2c67c77a..8746a783 100644 --- a/libyul/optimiser/ExpressionSimplifier.cpp +++ b/libyul/optimiser/ExpressionSimplifier.cpp @@ -23,7 +23,6 @@ #include <libyul/optimiser/SimplificationRules.h> #include <libyul/optimiser/Semantics.h> #include <libyul/optimiser/SSAValueTracker.h> - #include <libyul/AsmData.h> #include <libdevcore/CommonData.h> diff --git a/libyul/optimiser/FullInliner.cpp b/libyul/optimiser/FullInliner.cpp index a77f12f3..47299f5f 100644 --- a/libyul/optimiser/FullInliner.cpp +++ b/libyul/optimiser/FullInliner.cpp @@ -27,7 +27,6 @@ #include <libyul/optimiser/Metrics.h> #include <libyul/optimiser/SSAValueTracker.h> #include <libyul/Exceptions.h> - #include <libyul/AsmData.h> #include <libdevcore/CommonData.h> diff --git a/libyul/optimiser/FunctionHoister.cpp b/libyul/optimiser/FunctionHoister.cpp index d5c25e23..51755968 100644 --- a/libyul/optimiser/FunctionHoister.cpp +++ b/libyul/optimiser/FunctionHoister.cpp @@ -22,7 +22,6 @@ #include <libyul/optimiser/FunctionHoister.h> #include <libyul/optimiser/Utilities.h> - #include <libyul/AsmData.h> #include <libdevcore/CommonData.h> diff --git a/libyul/optimiser/FunctionHoister.h b/libyul/optimiser/FunctionHoister.h index 823b9e2b..29894895 100644 --- a/libyul/optimiser/FunctionHoister.h +++ b/libyul/optimiser/FunctionHoister.h @@ -22,7 +22,6 @@ #pragma once #include <libyul/ASTDataForward.h> - #include <libyul/optimiser/ASTWalker.h> namespace dev diff --git a/libyul/optimiser/InlinableExpressionFunctionFinder.cpp b/libyul/optimiser/InlinableExpressionFunctionFinder.cpp index b15d17ce..22267b62 100644 --- a/libyul/optimiser/InlinableExpressionFunctionFinder.cpp +++ b/libyul/optimiser/InlinableExpressionFunctionFinder.cpp @@ -21,7 +21,6 @@ #include <libyul/optimiser/InlinableExpressionFunctionFinder.h> #include <libyul/optimiser/Utilities.h> - #include <libyul/AsmData.h> using namespace std; diff --git a/libyul/optimiser/NameDispenser.cpp b/libyul/optimiser/NameDispenser.cpp index 0109e606..11e85477 100644 --- a/libyul/optimiser/NameDispenser.cpp +++ b/libyul/optimiser/NameDispenser.cpp @@ -21,7 +21,6 @@ #include <libyul/optimiser/NameDispenser.h> #include <libyul/optimiser/NameCollector.h> - #include <libyul/AsmData.h> using namespace std; diff --git a/libyul/optimiser/RedundantAssignEliminator.cpp b/libyul/optimiser/RedundantAssignEliminator.cpp index e10fd549..f415a36c 100644 --- a/libyul/optimiser/RedundantAssignEliminator.cpp +++ b/libyul/optimiser/RedundantAssignEliminator.cpp @@ -22,7 +22,6 @@ #include <libyul/optimiser/RedundantAssignEliminator.h> #include <libyul/optimiser/Semantics.h> - #include <libyul/AsmData.h> #include <libdevcore/CommonData.h> diff --git a/libyul/optimiser/RedundantAssignEliminator.h b/libyul/optimiser/RedundantAssignEliminator.h index 76106aae..bffbb07a 100644 --- a/libyul/optimiser/RedundantAssignEliminator.h +++ b/libyul/optimiser/RedundantAssignEliminator.h @@ -22,7 +22,6 @@ #pragma once #include <libyul/ASTDataForward.h> - #include <libyul/optimiser/ASTWalker.h> #include <map> diff --git a/libyul/optimiser/Rematerialiser.cpp b/libyul/optimiser/Rematerialiser.cpp index 8578748f..b9a127bb 100644 --- a/libyul/optimiser/Rematerialiser.cpp +++ b/libyul/optimiser/Rematerialiser.cpp @@ -23,7 +23,6 @@ #include <libyul/optimiser/Metrics.h> #include <libyul/optimiser/ASTCopier.h> #include <libyul/Exceptions.h> - #include <libyul/AsmData.h> using namespace std; diff --git a/libyul/optimiser/SSATransform.cpp b/libyul/optimiser/SSATransform.cpp index dd981775..ae84dd94 100644 --- a/libyul/optimiser/SSATransform.cpp +++ b/libyul/optimiser/SSATransform.cpp @@ -23,7 +23,6 @@ #include <libyul/optimiser/NameCollector.h> #include <libyul/optimiser/NameDispenser.h> - #include <libyul/AsmData.h> #include <libdevcore/CommonData.h> diff --git a/libyul/optimiser/SSATransform.h b/libyul/optimiser/SSATransform.h index bb642549..69638904 100644 --- a/libyul/optimiser/SSATransform.h +++ b/libyul/optimiser/SSATransform.h @@ -21,7 +21,6 @@ #pragma once #include <libyul/ASTDataForward.h> - #include <libyul/optimiser/ASTWalker.h> #include <vector> diff --git a/libyul/optimiser/Semantics.cpp b/libyul/optimiser/Semantics.cpp index f16a1630..ad9b1922 100644 --- a/libyul/optimiser/Semantics.cpp +++ b/libyul/optimiser/Semantics.cpp @@ -21,7 +21,6 @@ #include <libyul/optimiser/Semantics.h> #include <libyul/Exceptions.h> - #include <libyul/AsmData.h> #include <libevmasm/SemanticInformation.h> diff --git a/libyul/optimiser/SimplificationRules.cpp b/libyul/optimiser/SimplificationRules.cpp index 48945fbc..ec5379fc 100644 --- a/libyul/optimiser/SimplificationRules.cpp +++ b/libyul/optimiser/SimplificationRules.cpp @@ -24,7 +24,6 @@ #include <libyul/optimiser/ASTCopier.h> #include <libyul/optimiser/Semantics.h> #include <libyul/optimiser/SyntacticalEquality.h> - #include <libyul/AsmData.h> #include <libevmasm/RuleList.h> diff --git a/libyul/optimiser/SimplificationRules.h b/libyul/optimiser/SimplificationRules.h index de8bcf20..3d3d8d2b 100644 --- a/libyul/optimiser/SimplificationRules.h +++ b/libyul/optimiser/SimplificationRules.h @@ -24,7 +24,6 @@ #include <libevmasm/SimplificationRule.h> #include <libyul/ASTDataForward.h> - #include <libyul/AsmData.h> #include <boost/noncopyable.hpp> diff --git a/libyul/optimiser/Substitution.h b/libyul/optimiser/Substitution.h index 3cc4b45e..6a0679f5 100644 --- a/libyul/optimiser/Substitution.h +++ b/libyul/optimiser/Substitution.h @@ -21,7 +21,6 @@ #pragma once #include <libyul/optimiser/ASTCopier.h> - #include <libyul/YulString.h> #include <map> diff --git a/libyul/optimiser/Suite.cpp b/libyul/optimiser/Suite.cpp index db6dbf3e..b6920633 100644 --- a/libyul/optimiser/Suite.cpp +++ b/libyul/optimiser/Suite.cpp @@ -35,10 +35,8 @@ #include <libyul/optimiser/SSATransform.h> #include <libyul/optimiser/RedundantAssignEliminator.h> #include <libyul/optimiser/VarDeclPropagator.h> - #include <libyul/AsmAnalysisInfo.h> #include <libyul/AsmData.h> - #include <libyul/AsmPrinter.h> #include <libdevcore/CommonData.h> diff --git a/libyul/optimiser/SyntacticalEquality.cpp b/libyul/optimiser/SyntacticalEquality.cpp index 092f9d82..ff4ff81b 100644 --- a/libyul/optimiser/SyntacticalEquality.cpp +++ b/libyul/optimiser/SyntacticalEquality.cpp @@ -21,7 +21,6 @@ #include <libyul/optimiser/SyntacticalEquality.h> #include <libyul/Exceptions.h> - #include <libyul/AsmData.h> #include <libdevcore/CommonData.h> diff --git a/libyul/optimiser/UnusedPruner.cpp b/libyul/optimiser/UnusedPruner.cpp index 2072f42b..484e7475 100644 --- a/libyul/optimiser/UnusedPruner.cpp +++ b/libyul/optimiser/UnusedPruner.cpp @@ -24,7 +24,6 @@ #include <libyul/optimiser/Semantics.h> #include <libyul/optimiser/Utilities.h> #include <libyul/Exceptions.h> - #include <libyul/AsmData.h> #include <boost/algorithm/cxx11/none_of.hpp> |