From 0f4ed52a719af90b52a15eb6709f46f03d4108b9 Mon Sep 17 00:00:00 2001
From: Christian Parpart <christian@ethereum.org>
Date: Fri, 23 Nov 2018 11:18:57 +0100
Subject: Rewrite header paths to adapt to recent `git mv` of
 libsolidity/inlineasm to libyul

---
 libsolidity/parsing/Parser.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libsolidity/parsing/Parser.cpp')

diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
index de5293b4..1ec10a72 100644
--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -25,7 +25,7 @@
 #include <liblangutil/SourceLocation.h>
 #include <libsolidity/parsing/Parser.h>
 #include <liblangutil/Scanner.h>
-#include <libsolidity/inlineasm/AsmParser.h>
+#include <libyul/AsmParser.h>
 #include <liblangutil/ErrorReporter.h>
 
 using namespace std;
-- 
cgit v1.2.3


From 713d94476ec5ba61901b538c622c8cca6873c2af Mon Sep 17 00:00:00 2001
From: Christian Parpart <christian@ethereum.org>
Date: Fri, 23 Nov 2018 11:31:45 +0100
Subject: Reorder some include files and group <libyul/>'s together (as much as
 possible)

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

(limited to 'libsolidity/parsing/Parser.cpp')

diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
index 1ec10a72..560d8e8b 100644
--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -22,11 +22,11 @@
 
 #include <cctype>
 #include <vector>
-#include <liblangutil/SourceLocation.h>
 #include <libsolidity/parsing/Parser.h>
-#include <liblangutil/Scanner.h>
 #include <libyul/AsmParser.h>
+#include <liblangutil/SourceLocation.h>
 #include <liblangutil/ErrorReporter.h>
+#include <liblangutil/Scanner.h>
 
 using namespace std;
 using namespace langutil;
-- 
cgit v1.2.3


From ec47c8946ba5f78563b7eca2512b3cee68db45b4 Mon Sep 17 00:00:00 2001
From: Christian Parpart <christian@ethereum.org>
Date: Wed, 21 Nov 2018 12:42:34 +0100
Subject: Isolating libyul library API into its own namespace `yul`.

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

(limited to 'libsolidity/parsing/Parser.cpp')

diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
index 560d8e8b..ffe2be83 100644
--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -1012,8 +1012,8 @@ ASTPointer<InlineAssembly> Parser::parseInlineAssembly(ASTPointer<ASTString> con
 		m_scanner->next();
 	}
 
-	assembly::Parser asmParser(m_errorReporter);
-	shared_ptr<assembly::Block> block = asmParser.parse(m_scanner, true);
+	yul::Parser asmParser(m_errorReporter);
+	shared_ptr<yul::Block> block = asmParser.parse(m_scanner, true);
 	nodeFactory.markEndPosition();
 	return nodeFactory.createNode<InlineAssembly>(_docString, block);
 }
-- 
cgit v1.2.3