Isolating files shared between Yul- and Solidity language frontend.

libevmasm/Assembly.h

@@ -18,12 +18,12 @@
 #pragma once
 
 #include <libevmasm/Instruction.h>
-#include <libevmasm/SourceLocation.h>
+#include <liblangutil/SourceLocation.h>
 #include <libevmasm/AssemblyItem.h>
 #include <libevmasm/LinkerObject.h>
 #include <libevmasm/Exceptions.h>
 
-#include <libsolidity/interface/EVMVersion.h>
+#include <liblangutil/EVMVersion.h>
 
 #include <libdevcore/Common.h>
 #include <libdevcore/Assertions.h>

libevmasm/AssemblyItem.h

@@ -26,7 +26,7 @@
 #include <libdevcore/Common.h>
 #include <libdevcore/Assertions.h>
 #include <libevmasm/Instruction.h>
-#include <libevmasm/SourceLocation.h>
+#include <liblangutil/SourceLocation.h>
 #include "Exceptions.h"
 using namespace dev::solidity;
 

libevmasm/ConstantOptimiser.h

@@ -23,7 +23,7 @@
 
 #include <libevmasm/Exceptions.h>
 
-#include <libsolidity/interface/EVMVersion.h>
+#include <liblangutil/EVMVersion.h>
 
 #include <libdevcore/Assertions.h>
 #include <libdevcore/CommonData.h>

libevmasm/GasMeter.h

@@ -24,7 +24,7 @@
 #include <libevmasm/ExpressionClasses.h>
 #include <libevmasm/AssemblyItem.h>
 
-#include <libsolidity/interface/EVMVersion.h>
+#include <liblangutil/EVMVersion.h>
 
 #include <ostream>
 #include <tuple>

libevmasm/PathGasMeter.h

@@ -23,7 +23,7 @@
 
 #include <libevmasm/GasMeter.h>
 
-#include <libsolidity/interface/EVMVersion.h>
+#include <liblangutil/EVMVersion.h>
 
 #include <set>
 #include <vector>

liblangutil/ErrorReporter.cpp

@@ -20,7 +20,7 @@
  * Error helper class.
  */
 
-#include <libsolidity/interface/ErrorReporter.h>
+#include <liblangutil/ErrorReporter.h>
 #include <libsolidity/ast/AST.h>
 #include <memory>
 

liblangutil/ErrorReporter.h

@@ -22,8 +22,8 @@
 
 #pragma once
 
-#include <libsolidity/interface/Exceptions.h>
-#include <libevmasm/SourceLocation.h>
+#include <liblangutil/Exceptions.h>
+#include <liblangutil/SourceLocation.h>
 
 namespace dev
 {

liblangutil/Exceptions.cpp

@@ -20,7 +20,7 @@
  * Solidity exception hierarchy.
  */
 
-#include <libsolidity/interface/Exceptions.h>
+#include <liblangutil/Exceptions.h>
 
 using namespace std;
 using namespace dev;

liblangutil/Exceptions.h

@@ -26,7 +26,7 @@
 #include <utility>
 #include <libdevcore/Exceptions.h>
 #include <libdevcore/Assertions.h>
-#include <libevmasm/SourceLocation.h>
+#include <liblangutil/SourceLocation.h>
 
 namespace dev
 {

liblangutil/ParserBase.cpp

@@ -20,9 +20,9 @@
  * Solidity parser shared functionality.
  */
 
-#include <libsolidity/parsing/ParserBase.h>
-#include <libsolidity/parsing/Scanner.h>
-#include <libsolidity/interface/ErrorReporter.h>
+#include <liblangutil/ParserBase.h>
+#include <liblangutil/Scanner.h>
+#include <liblangutil/ErrorReporter.h>
 
 using namespace std;
 using namespace dev;

liblangutil/ParserBase.h

@@ -23,7 +23,7 @@
 #pragma once
 
 #include <memory>
-#include <libsolidity/parsing/Token.h>
+#include <liblangutil/Token.h>
 
 namespace dev
 {

liblangutil/Scanner.cpp

@@ -52,8 +52,8 @@
 
 #include <algorithm>
 #include <tuple>
-#include <libsolidity/interface/Exceptions.h>
-#include <libsolidity/parsing/Scanner.h>
+#include <liblangutil/Exceptions.h>
+#include <liblangutil/Scanner.h>
 
 using namespace std;
 

liblangutil/Scanner.h

@@ -54,8 +54,8 @@
 
 #include <libdevcore/Common.h>
 #include <libdevcore/CommonData.h>
-#include <libevmasm/SourceLocation.h>
-#include <libsolidity/parsing/Token.h>
+#include <liblangutil/SourceLocation.h>
+#include <liblangutil/Token.h>
 
 namespace dev
 {

liblangutil/Token.cpp

@@ -41,7 +41,7 @@
 // along with solidity.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <map>
-#include <libsolidity/parsing/Token.h>
+#include <liblangutil/Token.h>
 #include <boost/range/iterator_range.hpp>
 
 using namespace std;

liblangutil/Token.h

@@ -43,8 +43,8 @@
 #pragma once
 
 #include <libdevcore/Common.h>
-#include <libsolidity/interface/Exceptions.h>
-#include <libsolidity/parsing/UndefMacros.h>
+#include <liblangutil/Exceptions.h>
+#include <liblangutil/UndefMacros.h>
 #include <iosfwd>
 
 namespace dev

liblll/Compiler.h

@@ -23,7 +23,7 @@
 
 #include <libdevcore/Common.h>
 
-#include <libsolidity/interface/EVMVersion.h>
+#include <liblangutil/EVMVersion.h>
 
 #include <string>
 #include <vector>

libsolidity/CMakeLists.txt

@@ -1,6 +1,6 @@
 # Until we have a clear separation, libyul has to be included here
-file(GLOB_RECURSE sources "*.cpp" "../libyul/*.cpp")
-file(GLOB_RECURSE headers "*.h" "../libyul/*.h")
+file(GLOB_RECURSE sources "*.cpp" "../libyul/*.cpp" "../liblangutil/*.cpp")
+file(GLOB_RECURSE headers "*.h" "../libyul/*.h" "../liblangutil/*.h")
 
 find_package(Z3 QUIET)
 if (${Z3_FOUND})

libsolidity/analysis/ConstantEvaluator.cpp

@@ -22,7 +22,7 @@
 
 #include <libsolidity/analysis/ConstantEvaluator.h>
 #include <libsolidity/ast/AST.h>
-#include <libsolidity/interface/ErrorReporter.h>
+#include <liblangutil/ErrorReporter.h>
 
 using namespace std;
 using namespace dev;

libsolidity/analysis/ControlFlowGraph.h

@@ -19,7 +19,7 @@
 
 #include <libsolidity/ast/AST.h>
 #include <libsolidity/ast/ASTVisitor.h>
-#include <libsolidity/interface/ErrorReporter.h>
+#include <liblangutil/ErrorReporter.h>
 
 #include <map>
 #include <memory>

libsolidity/analysis/DocStringAnalyser.cpp

@@ -23,7 +23,7 @@
 
 #include <libsolidity/analysis/DocStringAnalyser.h>
 #include <libsolidity/ast/AST.h>
-#include <libsolidity/interface/ErrorReporter.h>
+#include <liblangutil/ErrorReporter.h>
 #include <libsolidity/parsing/DocStringParser.h>
 
 using namespace std;

libsolidity/analysis/NameAndTypeResolver.cpp

@@ -24,7 +24,7 @@
 
 #include <libsolidity/ast/AST.h>
 #include <libsolidity/analysis/TypeChecker.h>
-#include <libsolidity/interface/ErrorReporter.h>
+#include <liblangutil/ErrorReporter.h>
 #include <libdevcore/StringUtils.h>
 
 #include <boost/algorithm/string.hpp>

libsolidity/analysis/PostTypeChecker.cpp

@@ -18,7 +18,7 @@
 #include <libsolidity/analysis/PostTypeChecker.h>
 #include <libsolidity/ast/AST.h>
 #include <libsolidity/analysis/SemVerHandler.h>
-#include <libsolidity/interface/ErrorReporter.h>
+#include <liblangutil/ErrorReporter.h>
 #include <libsolidity/interface/Version.h>
 
 #include <libdevcore/Algorithms.h>

libsolidity/analysis/ReferencesResolver.cpp

@@ -23,12 +23,12 @@
 #include <libsolidity/analysis/ReferencesResolver.h>
 #include <libsolidity/ast/AST.h>
 #include <libsolidity/analysis/NameAndTypeResolver.h>
-#include <libsolidity/interface/Exceptions.h>
+#include <liblangutil/Exceptions.h>
 #include <libsolidity/analysis/ConstantEvaluator.h>
 #include <libsolidity/inlineasm/AsmAnalysis.h>
 #include <libsolidity/inlineasm/AsmAnalysisInfo.h>
 #include <libsolidity/inlineasm/AsmData.h>
-#include <libsolidity/interface/ErrorReporter.h>
+#include <liblangutil/ErrorReporter.h>
 
 #include <libdevcore/StringUtils.h>
 

libsolidity/analysis/SemVerHandler.h

@@ -23,7 +23,7 @@
 #pragma once
 
 #include <vector>
-#include <libsolidity/parsing/Token.h>
+#include <liblangutil/Token.h>
 
 namespace dev
 {

libsolidity/analysis/StaticAnalyzer.cpp

@@ -23,7 +23,7 @@
 #include <libsolidity/analysis/StaticAnalyzer.h>
 #include <libsolidity/analysis/ConstantEvaluator.h>
 #include <libsolidity/ast/AST.h>
-#include <libsolidity/interface/ErrorReporter.h>
+#include <liblangutil/ErrorReporter.h>
 #include <memory>
 
 using namespace std;

libsolidity/analysis/SyntaxChecker.cpp

@@ -20,7 +20,7 @@
 #include <libsolidity/ast/AST.h>
 #include <libsolidity/ast/ExperimentalFeatures.h>
 #include <libsolidity/analysis/SemVerHandler.h>
-#include <libsolidity/interface/ErrorReporter.h>
+#include <liblangutil/ErrorReporter.h>
 #include <libsolidity/interface/Version.h>
 #include <boost/algorithm/cxx11/all_of.hpp>
 

libsolidity/analysis/TypeChecker.cpp

@@ -30,7 +30,7 @@
 #include <libsolidity/inlineasm/AsmAnalysis.h>
 #include <libsolidity/inlineasm/AsmAnalysisInfo.h>
 #include <libsolidity/inlineasm/AsmData.h>
-#include <libsolidity/interface/ErrorReporter.h>
+#include <liblangutil/ErrorReporter.h>
 #include <libdevcore/Algorithms.h>
 
 using namespace std;

libsolidity/analysis/TypeChecker.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <libsolidity/interface/EVMVersion.h>
+#include <liblangutil/EVMVersion.h>
 
 #include <libsolidity/ast/Types.h>
 #include <libsolidity/ast/ASTAnnotations.h>

libsolidity/analysis/ViewPureChecker.h

@@ -21,7 +21,7 @@
 #include <libsolidity/ast/ASTForward.h>
 #include <libsolidity/ast/ASTVisitor.h>
 
-#include <libsolidity/interface/ErrorReporter.h>
+#include <liblangutil/ErrorReporter.h>
 
 #include <map>
 #include <memory>

libsolidity/ast/AST.h

@@ -24,12 +24,12 @@
 
 
 #include <libsolidity/ast/ASTForward.h>
-#include <libsolidity/parsing/Token.h>
+#include <liblangutil/Token.h>
 #include <libsolidity/ast/Types.h>
 #include <libsolidity/ast/ASTAnnotations.h>
 #include <libsolidity/ast/ASTEnums.h>
 
-#include <libevmasm/SourceLocation.h>
+#include <liblangutil/SourceLocation.h>
 #include <libevmasm/Instruction.h>
 
 #include <libdevcore/FixedHash.h>

libsolidity/ast/ASTEnums.h

@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <libsolidity/interface/Exceptions.h>
+#include <liblangutil/Exceptions.h>
 
 #include <string>
 

libsolidity/ast/ASTJsonConverter.h

@@ -25,7 +25,7 @@
 #include <ostream>
 #include <stack>
 #include <libsolidity/ast/ASTVisitor.h>
-#include <libsolidity/interface/Exceptions.h>
+#include <liblangutil/Exceptions.h>
 #include <libsolidity/ast/ASTAnnotations.h>
 #include <json/json.h>
 

libsolidity/ast/Types.h

@@ -22,10 +22,10 @@
 
 #pragma once
 
-#include <libsolidity/interface/Exceptions.h>
+#include <liblangutil/Exceptions.h>
 #include <libsolidity/ast/ASTForward.h>
 #include <libsolidity/ast/ASTEnums.h>
-#include <libsolidity/parsing/Token.h>
+#include <liblangutil/Token.h>
 
 #include <libdevcore/Common.h>
 #include <libdevcore/CommonIO.h>

libsolidity/codegen/ABIFunctions.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <libsolidity/interface/EVMVersion.h>
+#include <liblangutil/EVMVersion.h>
 
 #include <libsolidity/ast/ASTForward.h>
 

libsolidity/codegen/ArrayUtils.cpp

@@ -25,7 +25,7 @@
 #include <libsolidity/codegen/CompilerContext.h>
 #include <libsolidity/codegen/CompilerUtils.h>
 #include <libsolidity/ast/Types.h>
-#include <libsolidity/interface/Exceptions.h>
+#include <liblangutil/Exceptions.h>
 #include <libsolidity/codegen/LValue.h>
 
 using namespace std;

libsolidity/codegen/Compiler.h

@@ -23,7 +23,7 @@
 #pragma once
 
 #include <libsolidity/codegen/CompilerContext.h>
-#include <libsolidity/interface/EVMVersion.h>
+#include <liblangutil/EVMVersion.h>
 
 #include <libevmasm/Assembly.h>
 

libsolidity/codegen/CompilerContext.cpp

@@ -25,9 +25,9 @@
 #include <libsolidity/ast/AST.h>
 #include <libsolidity/codegen/Compiler.h>
 #include <libsolidity/interface/Version.h>
-#include <libsolidity/interface/ErrorReporter.h>
+#include <liblangutil/ErrorReporter.h>
 #include <libsolidity/interface/SourceReferenceFormatter.h>
-#include <libsolidity/parsing/Scanner.h>
+#include <liblangutil/Scanner.h>
 #include <libsolidity/inlineasm/AsmParser.h>
 #include <libsolidity/inlineasm/AsmCodeGen.h>
 #include <libsolidity/inlineasm/AsmAnalysis.h>

libsolidity/codegen/CompilerContext.h

@@ -24,7 +24,7 @@
 
 #include <libsolidity/codegen/ABIFunctions.h>
 
-#include <libsolidity/interface/EVMVersion.h>
+#include <liblangutil/EVMVersion.h>
 
 #include <libsolidity/ast/ASTForward.h>
 #include <libsolidity/ast/Types.h>

libsolidity/codegen/ContractCompiler.cpp

@@ -23,7 +23,7 @@
 #include <libsolidity/codegen/ContractCompiler.h>
 #include <libsolidity/inlineasm/AsmCodeGen.h>
 #include <libsolidity/ast/AST.h>
-#include <libsolidity/interface/ErrorReporter.h>
+#include <liblangutil/ErrorReporter.h>
 #include <libsolidity/codegen/ExpressionCompiler.h>
 #include <libsolidity/codegen/CompilerUtils.h>
 

libsolidity/codegen/ExpressionCompiler.h

@@ -25,10 +25,10 @@
 #include <memory>
 #include <boost/noncopyable.hpp>
 #include <libdevcore/Common.h>
-#include <libevmasm/SourceLocation.h>
+#include <liblangutil/SourceLocation.h>
 #include <libsolidity/ast/ASTVisitor.h>
 #include <libsolidity/codegen/LValue.h>
-#include <libsolidity/interface/Exceptions.h>
+#include <liblangutil/Exceptions.h>
 
 namespace dev {
 namespace eth

libsolidity/codegen/LValue.h

@@ -24,7 +24,7 @@
 
 #include <memory>
 #include <vector>
-#include <libevmasm/SourceLocation.h>
+#include <liblangutil/SourceLocation.h>
 #include <libsolidity/codegen/ArrayUtils.h>
 
 namespace dev

libsolidity/formal/CVC4Interface.cpp

@@ -17,7 +17,7 @@
 
 #include <libsolidity/formal/CVC4Interface.h>
 
-#include <libsolidity/interface/Exceptions.h>
+#include <liblangutil/Exceptions.h>
 
 #include <libdevcore/CommonIO.h>
 

libsolidity/formal/SMTChecker.cpp

@@ -22,7 +22,7 @@
 #include <libsolidity/formal/VariableUsage.h>
 #include <libsolidity/formal/SymbolicTypes.h>
 
-#include <libsolidity/interface/ErrorReporter.h>
+#include <liblangutil/ErrorReporter.h>
 
 #include <boost/range/adaptor/map.hpp>
 #include <boost/algorithm/string/replace.hpp>

libsolidity/formal/SMTChecker.h

@@ -25,7 +25,7 @@
 
 #include <libsolidity/interface/ReadFile.h>
 
-#include <libsolidity/parsing/Scanner.h>
+#include <liblangutil/Scanner.h>
 
 #include <unordered_map>
 #include <string>

libsolidity/formal/SMTLib2Interface.cpp

@@ -17,7 +17,7 @@
 
 #include <libsolidity/formal/SMTLib2Interface.h>
 
-#include <libsolidity/interface/Exceptions.h>
+#include <liblangutil/Exceptions.h>
 #include <libsolidity/interface/ReadFile.h>
 
 #include <boost/algorithm/string/predicate.hpp>

libsolidity/formal/SMTLib2Interface.h

@@ -19,7 +19,7 @@
 
 #include <libsolidity/formal/SolverInterface.h>
 
-#include <libsolidity/interface/Exceptions.h>
+#include <liblangutil/Exceptions.h>
 #include <libsolidity/interface/ReadFile.h>
 
 #include <libdevcore/Common.h>

libsolidity/formal/SolverInterface.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include <libsolidity/interface/Exceptions.h>
+#include <liblangutil/Exceptions.h>
 #include <libsolidity/interface/ReadFile.h>
 
 #include <libdevcore/Common.h>

libsolidity/formal/Z3Interface.cpp

@@ -17,7 +17,7 @@
 
 #include <libsolidity/formal/Z3Interface.h>
 
-#include <libsolidity/interface/Exceptions.h>
+#include <liblangutil/Exceptions.h>
 
 #include <libdevcore/CommonIO.h>
 

libsolidity/inlineasm/AsmAnalysis.cpp

@@ -25,7 +25,7 @@
 #include <libsolidity/inlineasm/AsmScope.h>
 #include <libsolidity/inlineasm/AsmAnalysisInfo.h>
 
-#include <libsolidity/interface/ErrorReporter.h>
+#include <liblangutil/ErrorReporter.h>
 
 #include <boost/range/adaptor/reversed.hpp>
 #include <boost/algorithm/string.hpp>

libsolidity/inlineasm/AsmAnalysis.h

@@ -20,8 +20,8 @@
 
 #pragma once
 
-#include <libsolidity/interface/Exceptions.h>
-#include <libsolidity/interface/EVMVersion.h>
+#include <liblangutil/Exceptions.h>
+#include <liblangutil/EVMVersion.h>
 
 #include <libsolidity/inlineasm/AsmScope.h>
 

libsolidity/inlineasm/AsmCodeGen.cpp

@@ -29,7 +29,7 @@
 #include <libsolidity/inlineasm/AsmAnalysisInfo.h>
 
 #include <libevmasm/Assembly.h>
-#include <libevmasm/SourceLocation.h>
+#include <liblangutil/SourceLocation.h>
 #include <libevmasm/Instruction.h>
 
 #include <libyul/backends/evm/AbstractAssembly.h>

libsolidity/inlineasm/AsmData.h

@@ -25,7 +25,7 @@
 #include <libsolidity/inlineasm/AsmDataForward.h>
 
 #include <libevmasm/Instruction.h>
-#include <libevmasm/SourceLocation.h>
+#include <liblangutil/SourceLocation.h>
 
 #include <libyul/YulString.h>
 

libsolidity/inlineasm/AsmParser.cpp

@@ -21,8 +21,8 @@
  */
 
 #include <libsolidity/inlineasm/AsmParser.h>
-#include <libsolidity/parsing/Scanner.h>
-#include <libsolidity/interface/ErrorReporter.h>
+#include <liblangutil/Scanner.h>
+#include <liblangutil/ErrorReporter.h>
 
 #include <boost/algorithm/string.hpp>
 

libsolidity/inlineasm/AsmParser.h

@@ -25,7 +25,7 @@
 #include <memory>
 #include <vector>
 #include <libsolidity/inlineasm/AsmData.h>
-#include <libsolidity/parsing/ParserBase.h>
+#include <liblangutil/ParserBase.h>
 
 namespace dev
 {

libsolidity/inlineasm/AsmPrinter.cpp

@@ -22,7 +22,7 @@
 
 #include <libsolidity/inlineasm/AsmPrinter.h>
 #include <libsolidity/inlineasm/AsmData.h>
-#include <libsolidity/interface/Exceptions.h>
+#include <liblangutil/Exceptions.h>
 
 #include <libdevcore/CommonData.h>
 

libsolidity/inlineasm/AsmScope.h

@@ -20,7 +20,7 @@
 
 #pragma once
 
-#include <libsolidity/interface/Exceptions.h>
+#include <liblangutil/Exceptions.h>
 
 #include <libyul/YulString.h>
 

libsolidity/inlineasm/AsmScopeFiller.cpp

@@ -24,8 +24,8 @@
 #include <libsolidity/inlineasm/AsmScope.h>
 #include <libsolidity/inlineasm/AsmAnalysisInfo.h>
 
-#include <libsolidity/interface/ErrorReporter.h>
-#include <libsolidity/interface/Exceptions.h>
+#include <liblangutil/ErrorReporter.h>
+#include <liblangutil/Exceptions.h>
 
 #include <libdevcore/CommonData.h>
 

libsolidity/interface/AssemblyStack.cpp

@@ -22,7 +22,7 @@
 
 #include <libsolidity/interface/AssemblyStack.h>
 
-#include <libsolidity/parsing/Scanner.h>
+#include <liblangutil/Scanner.h>
 #include <libsolidity/inlineasm/AsmPrinter.h>
 #include <libsolidity/inlineasm/AsmParser.h>
 #include <libsolidity/inlineasm/AsmAnalysis.h>

libsolidity/interface/AssemblyStack.h

@@ -21,8 +21,8 @@
 
 #pragma once
 
-#include <libsolidity/interface/ErrorReporter.h>
-#include <libsolidity/interface/EVMVersion.h>
+#include <liblangutil/ErrorReporter.h>
+#include <liblangutil/EVMVersion.h>
 
 #include <libevmasm/LinkerObject.h>
 

libsolidity/interface/CompilerStack.cpp

@@ -27,7 +27,7 @@
 #include <libsolidity/interface/Version.h>
 #include <libsolidity/analysis/SemVerHandler.h>
 #include <libsolidity/ast/AST.h>
-#include <libsolidity/parsing/Scanner.h>
+#include <liblangutil/Scanner.h>
 #include <libsolidity/parsing/Parser.h>
 #include <libsolidity/analysis/ControlFlowAnalyzer.h>
 #include <libsolidity/analysis/ControlFlowGraph.h>

libsolidity/interface/CompilerStack.h

@@ -23,11 +23,11 @@
 
 #pragma once
 
-#include <libsolidity/interface/ErrorReporter.h>
+#include <liblangutil/ErrorReporter.h>
 #include <libsolidity/interface/ReadFile.h>
-#include <libsolidity/interface/EVMVersion.h>
+#include <liblangutil/EVMVersion.h>
 
-#include <libevmasm/SourceLocation.h>
+#include <liblangutil/SourceLocation.h>
 #include <libevmasm/LinkerObject.h>
 
 #include <libdevcore/Common.h>

libsolidity/interface/GasEstimator.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <libsolidity/interface/EVMVersion.h>
+#include <liblangutil/EVMVersion.h>
 
 #include <libevmasm/GasMeter.h>
 #include <libevmasm/Assembly.h>

libsolidity/interface/SourceReferenceFormatter.cpp

@@ -21,8 +21,8 @@
  */
 
 #include <libsolidity/interface/SourceReferenceFormatter.h>
-#include <libsolidity/parsing/Scanner.h>
-#include <libsolidity/interface/Exceptions.h>
+#include <liblangutil/Scanner.h>
+#include <liblangutil/Exceptions.h>
 
 using namespace std;
 

libsolidity/interface/SourceReferenceFormatter.h

@@ -25,7 +25,7 @@
 #include <ostream>
 #include <sstream>
 #include <functional>
-#include <libevmasm/SourceLocation.h>
+#include <liblangutil/SourceLocation.h>
 
 namespace dev
 {

libsolidity/interface/Version.cpp

@@ -24,7 +24,7 @@
 #include <string>
 #include <libdevcore/CommonData.h>
 #include <libdevcore/Common.h>
-#include <libsolidity/interface/Exceptions.h>
+#include <liblangutil/Exceptions.h>
 #include <solidity/BuildInfo.h>
 
 using namespace dev;

libsolidity/parsing/DocStringParser.cpp

@@ -1,7 +1,7 @@
 
 #include <libsolidity/parsing/DocStringParser.h>
-#include <libsolidity/interface/ErrorReporter.h>
-#include <libsolidity/interface/Exceptions.h>
+#include <liblangutil/ErrorReporter.h>
+#include <liblangutil/Exceptions.h>
 
 #include <boost/range/irange.hpp>
 #include <boost/range/algorithm.hpp>

libsolidity/parsing/Parser.cpp

@@ -22,11 +22,11 @@
 
 #include <cctype>
 #include <vector>
-#include <libevmasm/SourceLocation.h>
+#include <liblangutil/SourceLocation.h>
 #include <libsolidity/parsing/Parser.h>
-#include <libsolidity/parsing/Scanner.h>
+#include <liblangutil/Scanner.h>
 #include <libsolidity/inlineasm/AsmParser.h>
-#include <libsolidity/interface/ErrorReporter.h>
+#include <liblangutil/ErrorReporter.h>
 
 using namespace std;
 

libsolidity/parsing/Parser.h

@@ -23,7 +23,7 @@
 #pragma once
 
 #include <libsolidity/ast/AST.h>
-#include <libsolidity/parsing/ParserBase.h>
+#include <liblangutil/ParserBase.h>
 
 namespace dev
 {

libyul/backends/evm/EVMAssembly.cpp

@@ -22,7 +22,7 @@
 
 #include <libevmasm/Instruction.h>
 
-#include <libsolidity/interface/Exceptions.h>
+#include <liblangutil/Exceptions.h>
 
 using namespace std;
 using namespace dev;

libyul/backends/evm/EVMCodeTransform.cpp

@@ -23,7 +23,7 @@
 #include <libsolidity/inlineasm/AsmAnalysisInfo.h>
 #include <libsolidity/inlineasm/AsmData.h>
 
-#include <libsolidity/interface/Exceptions.h>
+#include <liblangutil/Exceptions.h>
 
 #include <boost/range/adaptor/reversed.hpp>
 

libyul/optimiser/FullInliner.h

@@ -26,7 +26,7 @@
 #include <libyul/optimiser/NameDispenser.h>
 #include <libyul/Exceptions.h>
 
-#include <libevmasm/SourceLocation.h>
+#include <liblangutil/SourceLocation.h>
 
 #include <boost/variant.hpp>
 #include <boost/optional.hpp>

solc/CommandLineInterface.cpp

@@ -26,12 +26,12 @@
 #include "license.h"
 
 #include <libsolidity/interface/Version.h>
-#include <libsolidity/parsing/Scanner.h>
+#include <liblangutil/Scanner.h>
 #include <libsolidity/parsing/Parser.h>
 #include <libsolidity/ast/ASTPrinter.h>
 #include <libsolidity/ast/ASTJsonConverter.h>
 #include <libsolidity/analysis/NameAndTypeResolver.h>
-#include <libsolidity/interface/Exceptions.h>
+#include <liblangutil/Exceptions.h>
 #include <libsolidity/interface/CompilerStack.h>
 #include <libsolidity/interface/StandardCompiler.h>
 #include <libsolidity/interface/SourceReferenceFormatter.h>

solc/CommandLineInterface.h

@@ -23,7 +23,7 @@
 
 #include <libsolidity/interface/CompilerStack.h>
 #include <libsolidity/interface/AssemblyStack.h>
-#include <libsolidity/interface/EVMVersion.h>
+#include <liblangutil/EVMVersion.h>
 
 #include <boost/program_options.hpp>
 #include <boost/filesystem/path.hpp>

test/CMakeLists.txt

@@ -5,6 +5,8 @@ file(GLOB contracts_sources "contracts/*.cpp")
 file(GLOB contracts_headers "contracts/*.h")
 file(GLOB libdevcore_sources "libdevcore/*.cpp")
 file(GLOB libdevcore_headers "libdevcore/*.h")
+file(GLOB liblangutil_sources "liblangutil/*.cpp")
+file(GLOB liblangutil_headers "liblangutil/*.h")
 file(GLOB libevmasm_sources "libevmasm/*.cpp")
 file(GLOB libevmasm_headers "libevmasm/*.h")
 file(GLOB libyul_sources "libyul/*.cpp")
@@ -19,6 +21,7 @@ file(GLOB libsolidity_headers "libsolidity/*.h")
 add_executable(soltest ${sources} ${headers}
     ${contracts_sources} ${contracts_headers}
     ${libdevcore_sources} ${libdevcore_headers}
+    ${liblangutil_sources} ${liblangutil_headers}
     ${libevmasm_sources} ${libevmasm_headers}
     ${libyul_sources} ${libyul_headers}
     ${liblll_sources} ${liblll_headers}

test/ExecutionFramework.h

@@ -25,7 +25,7 @@
 #include <test/Options.h>
 #include <test/RPCSession.h>
 
-#include <libsolidity/interface/EVMVersion.h>
+#include <liblangutil/EVMVersion.h>
 
 #include <libdevcore/FixedHash.h>
 #include <libdevcore/Keccak256.h>

test/Options.cpp

@@ -23,8 +23,8 @@
 
 #include <test/Common.h>
 
-#include <libsolidity/interface/EVMVersion.h>
-#include <libsolidity/interface/Exceptions.h>
+#include <liblangutil/EVMVersion.h>
+#include <liblangutil/Exceptions.h>
 
 #include <boost/test/framework.hpp>
 #include <boost/filesystem.hpp>

test/Options.h

@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <libsolidity/interface/EVMVersion.h>
+#include <liblangutil/EVMVersion.h>
 
 #include <boost/test/unit_test.hpp>
 #include <boost/filesystem.hpp>

test/RPCSession.cpp

@@ -23,7 +23,7 @@
 
 #include <test/Options.h>
 
-#include <libsolidity/interface/EVMVersion.h>
+#include <liblangutil/EVMVersion.h>
 
 #include <libdevcore/CommonData.h>
 

test/liblangutil/SourceLocation.cpp

@@ -20,7 +20,7 @@
  * Unit tests for the SourceLocation class.
  */
 
-#include <libevmasm/SourceLocation.h>
+#include <liblangutil/SourceLocation.h>
 
 #include <test/Options.h>
 

test/libsolidity/ABIDecoderTests.cpp

@@ -22,7 +22,7 @@
 #include <string>
 #include <tuple>
 #include <boost/test/unit_test.hpp>
-#include <libsolidity/interface/Exceptions.h>
+#include <liblangutil/Exceptions.h>
 #include <test/libsolidity/SolidityExecutionFramework.h>
 
 #include <test/libsolidity/ABITestsCommon.h>

test/libsolidity/ABIEncoderTests.cpp

@@ -22,7 +22,7 @@
 #include <string>
 #include <tuple>
 #include <boost/test/unit_test.hpp>
-#include <libsolidity/interface/Exceptions.h>
+#include <liblangutil/Exceptions.h>
 #include <test/libsolidity/SolidityExecutionFramework.h>
 
 #include <test/libsolidity/ABITestsCommon.h>

test/libsolidity/AnalysisFramework.cpp

@@ -27,7 +27,7 @@
 
 #include <libsolidity/ast/AST.h>
 
-#include <libsolidity/parsing/Scanner.h>
+#include <liblangutil/Scanner.h>
 
 #include <libdevcore/Keccak256.h>
 

test/libsolidity/Assembly.cpp

@@ -22,16 +22,16 @@
 
 #include <test/Options.h>
 
-#include <libevmasm/SourceLocation.h>
+#include <liblangutil/SourceLocation.h>
 #include <libevmasm/Assembly.h>
 
-#include <libsolidity/parsing/Scanner.h>
+#include <liblangutil/Scanner.h>
 #include <libsolidity/parsing/Parser.h>
 #include <libsolidity/analysis/NameAndTypeResolver.h>
 #include <libsolidity/codegen/Compiler.h>
 #include <libsolidity/ast/AST.h>
 #include <libsolidity/analysis/TypeChecker.h>
-#include <libsolidity/interface/ErrorReporter.h>
+#include <liblangutil/ErrorReporter.h>
 
 #include <boost/test/unit_test.hpp>
 

test/libsolidity/ErrorCheck.h

@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <libsolidity/interface/Exceptions.h>
+#include <liblangutil/Exceptions.h>
 
 #include <vector>
 #include <tuple>

test/libsolidity/Imports.cpp

@@ -23,7 +23,7 @@
 #include <test/libsolidity/ErrorCheck.h>
 #include <test/Options.h>
 
-#include <libsolidity/interface/Exceptions.h>
+#include <liblangutil/Exceptions.h>
 #include <libsolidity/interface/CompilerStack.h>
 
 #include <boost/test/unit_test.hpp>

test/libsolidity/InlineAssembly.cpp

@@ -23,8 +23,8 @@
 #include <test/Options.h>
 
 #include <libsolidity/interface/AssemblyStack.h>
-#include <libsolidity/parsing/Scanner.h>
-#include <libsolidity/interface/Exceptions.h>
+#include <liblangutil/Scanner.h>
+#include <liblangutil/Exceptions.h>
 #include <libsolidity/ast/AST.h>
 #include <test/libsolidity/ErrorCheck.h>
 #include <libevmasm/Assembly.h>

test/libsolidity/SemVerMatcher.cpp

@@ -23,7 +23,7 @@
 #include <string>
 #include <vector>
 #include <tuple>
-#include <libsolidity/parsing/Scanner.h>
+#include <liblangutil/Scanner.h>
 #include <libsolidity/analysis/SemVerHandler.h>
 #include <test/Options.h>
 

test/libsolidity/SolidityEndToEndTest.cpp

@@ -25,8 +25,8 @@
 
 #include <test/Options.h>
 
-#include <libsolidity/interface/Exceptions.h>
-#include <libsolidity/interface/EVMVersion.h>
+#include <liblangutil/Exceptions.h>
+#include <liblangutil/EVMVersion.h>
 
 #include <libevmasm/Assembly.h>
 

test/libsolidity/SolidityExecutionFramework.h

@@ -27,7 +27,7 @@
 #include <test/ExecutionFramework.h>
 
 #include <libsolidity/interface/CompilerStack.h>
-#include <libsolidity/interface/Exceptions.h>
+#include <liblangutil/Exceptions.h>
 #include <libsolidity/interface/SourceReferenceFormatter.h>
 
 namespace dev

test/libsolidity/SolidityExpressionCompiler.cpp

@@ -22,14 +22,14 @@
 
 #include <string>
 
-#include <libsolidity/parsing/Scanner.h>
+#include <liblangutil/Scanner.h>
 #include <libsolidity/parsing/Parser.h>
 #include <libsolidity/analysis/NameAndTypeResolver.h>
 #include <libsolidity/codegen/CompilerContext.h>
 #include <libsolidity/codegen/ExpressionCompiler.h>
 #include <libsolidity/ast/AST.h>
 #include <libsolidity/analysis/TypeChecker.h>
-#include <libsolidity/interface/ErrorReporter.h>
+#include <liblangutil/ErrorReporter.h>
 #include <test/Options.h>
 
 using namespace std;

test/libsolidity/SolidityNatspecJSON.cpp

@@ -24,7 +24,7 @@
 #include <string>
 #include <libdevcore/JSON.h>
 #include <libsolidity/interface/CompilerStack.h>
-#include <libsolidity/interface/Exceptions.h>
+#include <liblangutil/Exceptions.h>
 #include <libdevcore/Exceptions.h>
 
 namespace dev

test/libsolidity/SolidityParser.cpp

@@ -22,9 +22,9 @@
 
 #include <string>
 #include <memory>
-#include <libsolidity/parsing/Scanner.h>
+#include <liblangutil/Scanner.h>
 #include <libsolidity/parsing/Parser.h>
-#include <libsolidity/interface/ErrorReporter.h>
+#include <liblangutil/ErrorReporter.h>
 #include <test/Options.h>
 #include <test/libsolidity/ErrorCheck.h>
 

test/libsolidity/SolidityScanner.cpp

@@ -20,7 +20,7 @@
  * Unit tests for the solidity scanner.
  */
 
-#include <libsolidity/parsing/Scanner.h>
+#include <liblangutil/Scanner.h>
 #include <boost/test/unit_test.hpp>
 
 using namespace std;

test/libsolidity/SyntaxTest.h

@@ -20,7 +20,7 @@
 #include <test/libsolidity/AnalysisFramework.h>
 #include <test/libsolidity/FormattedScope.h>
 #include <test/libsolidity/TestCase.h>
-#include <libsolidity/interface/Exceptions.h>
+#include <liblangutil/Exceptions.h>
 
 #include <iosfwd>
 #include <string>

test/libyul/Common.cpp

@@ -25,14 +25,14 @@
 
 #include <libyul/optimiser/Disambiguator.h>
 
-#include <libsolidity/parsing/Scanner.h>
+#include <liblangutil/Scanner.h>
 
 #include <libsolidity/inlineasm/AsmParser.h>
 #include <libsolidity/inlineasm/AsmAnalysis.h>
 #include <libsolidity/inlineasm/AsmPrinter.h>
 
 #include <libsolidity/interface/SourceReferenceFormatter.h>
-#include <libsolidity/interface/ErrorReporter.h>
+#include <liblangutil/ErrorReporter.h>
 
 #include <boost/test/unit_test.hpp>
 

test/libyul/Parser.cpp

@@ -26,8 +26,8 @@
 #include <libsolidity/inlineasm/AsmParser.h>
 #include <libsolidity/inlineasm/AsmAnalysis.h>
 #include <libsolidity/inlineasm/AsmAnalysisInfo.h>
-#include <libsolidity/parsing/Scanner.h>
-#include <libsolidity/interface/ErrorReporter.h>
+#include <liblangutil/Scanner.h>
+#include <liblangutil/ErrorReporter.h>
 
 #include <boost/optional.hpp>
 #include <boost/algorithm/string/replace.hpp>

test/libyul/YulOptimizerTest.cpp

@@ -41,12 +41,12 @@
 #include <libyul/optimiser/RedundantAssignEliminator.h>
 #include <libyul/optimiser/Suite.h>
 
-#include <libsolidity/parsing/Scanner.h>
+#include <liblangutil/Scanner.h>
 #include <libsolidity/inlineasm/AsmPrinter.h>
 #include <libsolidity/inlineasm/AsmParser.h>
 #include <libsolidity/inlineasm/AsmAnalysis.h>
 #include <libsolidity/interface/SourceReferenceFormatter.h>
-#include <libsolidity/interface/ErrorReporter.h>
+#include <liblangutil/ErrorReporter.h>
 
 #include <boost/test/unit_test.hpp>
 #include <boost/algorithm/string.hpp>