From 99db4e3ff45c2a8d5d9c645774f099b82b7618ec Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Mon, 3 Dec 2018 15:49:23 +0100
Subject: Introduce the concept of builtin functions.

---
 libyul/ObjectParser.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libyul/ObjectParser.cpp')

diff --git a/libyul/ObjectParser.cpp b/libyul/ObjectParser.cpp
index 43dd4be9..ba19e099 100644
--- a/libyul/ObjectParser.cpp
+++ b/libyul/ObjectParser.cpp
@@ -104,7 +104,7 @@ shared_ptr<Block> ObjectParser::parseCode()
 
 shared_ptr<Block> ObjectParser::parseBlock()
 {
-	Parser parser(m_errorReporter, m_flavour);
+	Parser parser(m_errorReporter, m_dialect);
 	shared_ptr<Block> block = parser.parse(m_scanner, true);
 	yulAssert(block || m_errorReporter.hasErrors(), "Invalid block but no error!");
 	return block;
-- 
cgit v1.2.3


From 5ac7620045012c2ed565b81978dc35f5f83f7eea Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Mon, 10 Dec 2018 04:25:51 +0100
Subject: Use C++ user-defined literals for creating YulString constants.

---
 libyul/ObjectParser.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libyul/ObjectParser.cpp')

diff --git a/libyul/ObjectParser.cpp b/libyul/ObjectParser.cpp
index ba19e099..5f1eadef 100644
--- a/libyul/ObjectParser.cpp
+++ b/libyul/ObjectParser.cpp
@@ -42,7 +42,7 @@ shared_ptr<Object> ObjectParser::parse(shared_ptr<Scanner> const& _scanner, bool
 		{
 			// Special case: Code-only form.
 			object = make_shared<Object>();
-			object->name = YulString{"object"};
+			object->name = "object"_yulstring;
 			object->code = parseBlock();
 			if (!object->code)
 				return nullptr;
-- 
cgit v1.2.3