Merge pull request #251 from chriseth/bind2

Bind library functions to types.

1 files changed, 20 insertions, 0 deletions

diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
index 9272eb4b..2b886121 100644
--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -168,6 +168,8 @@ ASTPointer<ContractDefinition> Parser::parseContractDefinition(bool _isLibrary)
 			subNodes.push_back(parseModifierDefinition());
 		else if (currentTokenValue == Token::Event)
 			subNodes.push_back(parseEventDefinition());
+		else if (currentTokenValue == Token::Using)
+			subNodes.push_back(parseUsingDirective());
 		else
 			fatalParserError(std::string("Function, variable, struct or modifier declaration expected."));
 	}
@@ -475,6 +477,24 @@ ASTPointer<EventDefinition> Parser::parseEventDefinition()
 	return nodeFactory.createNode<EventDefinition>(name, docstring, parameters, anonymous);
 }
 
+ASTPointer<UsingForDirective> Parser::parseUsingDirective()
+{
+	ASTNodeFactory nodeFactory(*this);
+
+	expectToken(Token::Using);
+	//@todo this should actually parse a full path.
+	ASTPointer<Identifier> library(parseIdentifier());
+	ASTPointer<TypeName> typeName;
+	expectToken(Token::For);
+	if (m_scanner->currentToken() == Token::Mul)
+		m_scanner->next();
+	else
+		typeName = parseTypeName(false);
+	nodeFactory.markEndPosition();
+	expectToken(Token::Semicolon);
+	return nodeFactory.createNode<UsingForDirective>(library, typeName);
+}
+
 ASTPointer<ModifierInvocation> Parser::parseModifierInvocation()
 {
 	ASTNodeFactory nodeFactory(*this);