From 5b6a211b8aea80fc857e043fe5eb33f43c3f7df4 Mon Sep 17 00:00:00 2001
From: Christian <c@ethdev.com>
Date: Wed, 3 Dec 2014 07:46:55 +0100
Subject: Import directive.

---
 solidityCompiler.cpp | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

(limited to 'solidityCompiler.cpp')

diff --git a/solidityCompiler.cpp b/solidityCompiler.cpp
index 3e86919a..883cecf2 100644
--- a/solidityCompiler.cpp
+++ b/solidityCompiler.cpp
@@ -46,16 +46,22 @@ namespace
 bytes compileContract(const string& _sourceCode)
 {
 	Parser parser;
-	ASTPointer<ContractDefinition> contract;
-	BOOST_REQUIRE_NO_THROW(contract = parser.parse(make_shared<Scanner>(CharStream(_sourceCode))));
-	NameAndTypeResolver resolver({});
-	BOOST_REQUIRE_NO_THROW(resolver.resolveNamesAndTypes(*contract));
-
-	Compiler compiler;
-	compiler.compileContract(*contract, {});
-	// debug
-	//compiler.streamAssembly(cout);
-	return compiler.getAssembledBytecode();
+	ASTPointer<SourceUnit> sourceUnit;
+	BOOST_REQUIRE_NO_THROW(sourceUnit = parser.parse(make_shared<Scanner>(CharStream(_sourceCode))));
+	for (ASTPointer<ASTNode> const& node: sourceUnit->getNodes())
+		if (ContractDefinition* contract = dynamic_cast<ContractDefinition*>(node.get()))
+		{
+			NameAndTypeResolver resolver({});
+			BOOST_REQUIRE_NO_THROW(resolver.resolveNamesAndTypes(*contract));
+
+			Compiler compiler;
+			compiler.compileContract(*contract, {});
+			// debug
+			//compiler.streamAssembly(cout);
+			return compiler.getAssembledBytecode();
+		}
+	BOOST_FAIL("No contract found in source.");
+	return bytes();
 }
 
 /// Checks that @a _compiledCode is present starting from offset @a _offset in @a _expectation.
-- 
cgit