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')

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