Merge remote-tracking branch 'upstream/develop' into addTests

3 files changed, 132 insertions, 2 deletions

diff --git a/Assembly.cpp b/Assembly.cpp
new file mode 100644
index 00000000..3869919e
--- /dev/null
+++ b/Assembly.cpp
@@ -0,0 +1,129 @@
+/*
+	This file is part of cpp-ethereum.
+
+	cpp-ethereum is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	cpp-ethereum is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/**
+ * @author Lefteris Karapetsas <lefteris@ethdev.com>
+ * @date 2015
+ * Unit tests for Assembly Items from evmcore/Assembly.h
+ */
+
+#include <string>
+#include <iostream>
+#include <boost/test/unit_test.hpp>
+#include <libdevcore/Log.h>
+#include <libevmcore/SourceLocation.h>
+#include <libsolidity/Scanner.h>
+#include <libsolidity/Parser.h>
+#include <libsolidity/NameAndTypeResolver.h>
+#include <libsolidity/Compiler.h>
+#include <libsolidity/AST.h>
+#include <libevmcore/Assembly.h>
+
+using namespace std;
+using namespace dev::eth;
+
+namespace dev
+{
+namespace solidity
+{
+namespace test
+{
+
+namespace
+{
+
+eth::AssemblyItems compileContract(const string& _sourceCode)
+{
+	Parser parser;
+	ASTPointer<SourceUnit> sourceUnit;
+	BOOST_REQUIRE_NO_THROW(sourceUnit = parser.parse(make_shared<Scanner>(CharStream(_sourceCode))));
+	NameAndTypeResolver resolver({});
+	resolver.registerDeclarations(*sourceUnit);
+	for (ASTPointer<ASTNode> const& node: sourceUnit->getNodes())
+		if (ContractDefinition* contract = dynamic_cast<ContractDefinition*>(node.get()))
+		{
+			BOOST_REQUIRE_NO_THROW(resolver.resolveNamesAndTypes(*contract));
+		}
+	for (ASTPointer<ASTNode> const& node: sourceUnit->getNodes())
+		if (ContractDefinition* contract = dynamic_cast<ContractDefinition*>(node.get()))
+		{
+			BOOST_REQUIRE_NO_THROW(resolver.checkTypeRequirements(*contract));
+		}
+	for (ASTPointer<ASTNode> const& node: sourceUnit->getNodes())
+		if (ContractDefinition* contract = dynamic_cast<ContractDefinition*>(node.get()))
+		{
+			Compiler compiler;
+			compiler.compileContract(*contract, map<ContractDefinition const*, bytes const*>{});
+
+			return compiler.getRuntimeAssemblyItems();
+		}
+	BOOST_FAIL("No contract found in source.");
+	return AssemblyItems();
+}
+
+void checkAssemblyLocations(AssemblyItems const& _items, std::vector<SourceLocation> _locations)
+{
+	size_t i = 0;
+	BOOST_CHECK_EQUAL(_items.size(), _locations.size());
+	for (auto const& it: _items)
+	{
+		BOOST_CHECK_MESSAGE(it.getLocation() == _locations[i],
+							std::string("Location mismatch for assembly item ") + std::to_string(i));
+		++i;
+	}
+
+}
+
+} // end anonymous namespace
+
+BOOST_AUTO_TEST_SUITE(Assembly)
+
+BOOST_AUTO_TEST_CASE(location_test)
+{
+	char const* sourceCode = "contract test {\n"
+							 "  function f() returns (uint256 a)\n"
+							 "  {\n"
+							 "      return 16;\n"
+							 "  }\n"
+							 "}\n";
+	std::shared_ptr<std::string const> n = make_shared<std::string>("source");
+	AssemblyItems items = compileContract(sourceCode);
+	std::vector<SourceLocation> locations {
+		SourceLocation(0, 77, n), SourceLocation(0, 77, n),
+		SourceLocation(0, 77, n), SourceLocation(0, 77, n),
+		SourceLocation(0, 77, n), SourceLocation(0, 77, n),
+		SourceLocation(0, 77, n), SourceLocation(0, 77, n),
+		SourceLocation(), SourceLocation(),
+		SourceLocation(0, 77, n), SourceLocation(0, 77, n),
+		SourceLocation(), SourceLocation(), SourceLocation(),
+		SourceLocation(0, 77, n), SourceLocation(0, 77, n),
+		SourceLocation(0, 77, n), SourceLocation(0, 77, n),
+		SourceLocation(0, 77, n), SourceLocation(0, 77, n),
+		SourceLocation(0, 77, n),
+		SourceLocation(18, 75, n), SourceLocation(40, 49, n),
+		SourceLocation(61, 70, n), SourceLocation(61, 70, n), SourceLocation(61, 70, n),
+		SourceLocation(), SourceLocation(),
+		SourceLocation(61, 70, n), SourceLocation(61, 70, n), SourceLocation(61, 70, n)
+		};
+	checkAssemblyLocations(items, locations);
+}
+
+BOOST_AUTO_TEST_SUITE_END()
+
+}
+}
+} // end namespaces
+
diff --git a/SolidityExpressionCompiler.cpp b/SolidityExpressionCompiler.cpp
index 9cd13dcf..3340334f 100644
--- a/SolidityExpressionCompiler.cpp
+++ b/SolidityExpressionCompiler.cpp
@@ -127,6 +127,7 @@ bytes compileFirstExpression(const string& _sourceCode, vector<vector<string>> _
 			BOOST_REQUIRE(extractor.getExpression() != nullptr);
 
 			CompilerContext context;
+			context.resetVisitedNodes(contract);
 			context.setInheritanceHierarchy(inheritanceHierarchy);
 			unsigned parametersSize = _localVariables.size(); // assume they are all one slot on the stack
 			context.adjustStackOffset(parametersSize);
@@ -134,7 +135,7 @@ bytes compileFirstExpression(const string& _sourceCode, vector<vector<string>> _
 				context.addVariable(dynamic_cast<VariableDeclaration const&>(resolveDeclaration(variable, resolver)),
 									parametersSize--);
 
-			ExpressionCompiler::compileExpression(context, *extractor.getExpression());
+			ExpressionCompiler(context).compile(*extractor.getExpression());
 
 			for (vector<string> const& function: _functions)
 				context << context.getFunctionEntryLabel(dynamic_cast<FunctionDefinition const&>(resolveDeclaration(function, resolver)));
diff --git a/SolidityInterface.cpp b/SolidityInterface.cpp
index a73c118b..35471518 100644
--- a/SolidityInterface.cpp
+++ b/SolidityInterface.cpp
@@ -50,7 +50,7 @@ public:
 
 	string getSourcePart(ASTNode const& _node) const
 	{
-		Location location = _node.getLocation();
+		SourceLocation location = _node.getLocation();
 		BOOST_REQUIRE(!location.isEmpty());
 		return m_interface.substr(location.start, location.end - location.start);
 	}