From 949b00ed591303c531ed8fa73087b710b7a554de Mon Sep 17 00:00:00 2001
From: chriseth <c@ethdev.com>
Date: Mon, 22 Feb 2016 02:13:41 +0100
Subject: Parsing for inline assembly.

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

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

diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
index 7bda3610..29377380 100644
--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -20,11 +20,13 @@
  * Solidity parser.
  */
 
+#include <ctype.h>
 #include <vector>
 #include <libdevcore/Log.h>
 #include <libevmasm/SourceLocation.h>
 #include <libsolidity/parsing/Parser.h>
 #include <libsolidity/parsing/Scanner.h>
+#include <libsolidity/inlineasm/AsmParser.h>
 #include <libsolidity/interface/Exceptions.h>
 #include <libsolidity/interface/InterfaceHandler.h>
 
@@ -712,6 +714,8 @@ ASTPointer<Statement> Parser::parseStatement()
 		m_scanner->next();
 		break;
 	}
+	case Token::Assembly:
+		return parseInlineAssembly(docString);
 	case Token::Identifier:
 		if (m_insideModifier && m_scanner->currentLiteral() == "_")
 		{
@@ -727,6 +731,22 @@ ASTPointer<Statement> Parser::parseStatement()
 	return statement;
 }
 
+ASTPointer<InlineAssembly> Parser::parseInlineAssembly(ASTPointer<ASTString> const& _docString)
+{
+	ASTNodeFactory nodeFactory(*this);
+	expectToken(Token::Assembly);
+	if (m_scanner->currentToken() != Token::StringLiteral)
+		fatalParserError("Expected assembly name.");
+	if (m_scanner->currentLiteral() != "evmasm")
+		fatalParserError("Only \"evmasm\" supported.");
+	m_scanner->next();
+
+	InlineAssemblyParser parser(m_errors);
+	shared_ptr<InlineAssemblyBlock> operations = parser.parse(m_scanner);
+	nodeFactory.markEndPosition();
+	return nodeFactory.createNode<InlineAssembly>(_docString, operations);
+}
+
 ASTPointer<IfStatement> Parser::parseIfStatement(ASTPointer<ASTString> const& _docString)
 {
 	ASTNodeFactory nodeFactory(*this);
-- 
cgit v1.2.3


From f0494307232e52dcc268f5f32d26cc89d7e98e3a Mon Sep 17 00:00:00 2001
From: chriseth <c@ethdev.com>
Date: Tue, 1 Mar 2016 22:56:39 +0100
Subject: Code generation (missing external access and source locations).

---
 libsolidity/parsing/Parser.cpp | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

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

diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
index 29377380..bb50f47f 100644
--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -735,16 +735,17 @@ ASTPointer<InlineAssembly> Parser::parseInlineAssembly(ASTPointer<ASTString> con
 {
 	ASTNodeFactory nodeFactory(*this);
 	expectToken(Token::Assembly);
-	if (m_scanner->currentToken() != Token::StringLiteral)
-		fatalParserError("Expected assembly name.");
-	if (m_scanner->currentLiteral() != "evmasm")
-		fatalParserError("Only \"evmasm\" supported.");
-	m_scanner->next();
+	if (m_scanner->currentToken() == Token::StringLiteral)
+	{
+		if (m_scanner->currentLiteral() != "evmasm")
+			fatalParserError("Only \"evmasm\" supported.");
+		m_scanner->next();
+	}
 
-	InlineAssemblyParser parser(m_errors);
-	shared_ptr<InlineAssemblyBlock> operations = parser.parse(m_scanner);
+	assembly::Parser asmParser(m_errors);
+	shared_ptr<assembly::Block> block = asmParser.parse(m_scanner);
 	nodeFactory.markEndPosition();
-	return nodeFactory.createNode<InlineAssembly>(_docString, operations);
+	return nodeFactory.createNode<InlineAssembly>(_docString, block);
 }
 
 ASTPointer<IfStatement> Parser::parseIfStatement(ASTPointer<ASTString> const& _docString)
-- 
cgit v1.2.3