From 87821c53c3a73d3e35a0e50a7c159d9aa5d6b253 Mon Sep 17 00:00:00 2001
From: Christian Parpart <christian@ethereum.org>
Date: Wed, 14 Nov 2018 14:59:30 +0100
Subject: Isolating files shared between Yul- and Solidity language frontend.

---
 libsolidity/codegen/CompilerContext.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'libsolidity/codegen/CompilerContext.cpp')

diff --git a/libsolidity/codegen/CompilerContext.cpp b/libsolidity/codegen/CompilerContext.cpp
index 6e14d68a..fa6dfe60 100644
--- a/libsolidity/codegen/CompilerContext.cpp
+++ b/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>
-- 
cgit v1.2.3


From d67322a1861d60a88151f7c25d6c3478a9a39acf Mon Sep 17 00:00:00 2001
From: Christian Parpart <christian@ethereum.org>
Date: Wed, 14 Nov 2018 17:11:55 +0100
Subject: Introduce namespace `langutil` in liblangutil directory.

Also:
- Use {}-style list initialisation for SourceLocation construction
- Introduce new system includes
- Changes the API of the Scanner to take source as value (with move) as opposed to as a reference
---
 libsolidity/codegen/CompilerContext.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'libsolidity/codegen/CompilerContext.cpp')

diff --git a/libsolidity/codegen/CompilerContext.cpp b/libsolidity/codegen/CompilerContext.cpp
index fa6dfe60..9e4f2882 100644
--- a/libsolidity/codegen/CompilerContext.cpp
+++ b/libsolidity/codegen/CompilerContext.cpp
@@ -26,6 +26,7 @@
 #include <libsolidity/codegen/Compiler.h>
 #include <libsolidity/interface/Version.h>
 #include <liblangutil/ErrorReporter.h>
+#include <liblangutil/Scanner.h>
 #include <libsolidity/interface/SourceReferenceFormatter.h>
 #include <liblangutil/Scanner.h>
 #include <libsolidity/inlineasm/AsmParser.h>
@@ -47,6 +48,7 @@
 
 
 using namespace std;
+using namespace langutil;
 
 namespace dev
 {
@@ -359,7 +361,7 @@ void CompilerContext::appendInlineAssembly(
 
 	ErrorList errors;
 	ErrorReporter errorReporter(errors);
-	auto scanner = make_shared<Scanner>(CharStream(_assembly), "--CODEGEN--");
+	auto scanner = make_shared<langutil::Scanner>(langutil::CharStream(_assembly), "--CODEGEN--");
 	auto parserResult = assembly::Parser(errorReporter, assembly::AsmFlavour::Strict).parse(scanner, false);
 #ifdef SOL_OUTPUT_ASM
 	cout << assembly::AsmPrinter()(*parserResult) << endl;
-- 
cgit v1.2.3