Merge remote-tracking branch 'ethereum/develop' into sol_overloadingFunctions

1 files changed, 11 insertions, 1 deletions

diff --git a/SolidityNameAndTypeResolution.cpp b/SolidityNameAndTypeResolution.cpp
index fd439fc8..fdbe46d0 100644
--- a/SolidityNameAndTypeResolution.cpp
+++ b/SolidityNameAndTypeResolution.cpp
@@ -99,7 +99,7 @@ BOOST_AUTO_TEST_CASE(smoke_test)
 {
 	char const* text = "contract test {\n"
 					   "  uint256 stateVariable1;\n"
-					   "  function fun(uint256 arg1) { var x; uint256 y; }"
+					   "  function fun(uint256 arg1) { uint256 y; }"
 					   "}\n";
 	ETH_TEST_CHECK_NO_THROW(parseTextAndResolveNames(text), "Parsing and Name Resolving Failed");
 }
@@ -1720,6 +1720,16 @@ BOOST_AUTO_TEST_CASE(equal_overload)
 	BOOST_CHECK_THROW(parseTextAndResolveNames(sourceCode), DeclarationError);
 }
 
+BOOST_AUTO_TEST_CASE(uninitialized_var)
+{
+	char const* sourceCode = R"(
+		contract C {
+			function f() returns (uint) { var x; return 2; }
+		}
+	)";
+	BOOST_CHECK_THROW(parseTextAndResolveNames(sourceCode), TypeError);
+}
+
 BOOST_AUTO_TEST_SUITE_END()
 
 }