[cond-expr] add a test for different types

Lu Guanqun · Lu Guanqun · commit ac3019298a42 · 2016-01-22T17:14:01.000Z
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
@@ -759,7 +759,7 @@ bool TypeChecker::visit(Conditional const& _conditional)
 		commonType = trueType;
 	else
 		// we fake it as an equal operator, but any other comparison operator can work.
-		TypePointer commonType = trueType->binaryOperatorResult(Token::Equal, falseType);
+		commonType = trueType->binaryOperatorResult(Token::Equal, falseType);
 	if (!commonType)
 	{
 		typeError(
diff --git a/test/libsolidity/SolidityEndToEndTest.cpp b/test/libsolidity/SolidityEndToEndTest.cpp
@@ -174,6 +174,21 @@ BOOST_AUTO_TEST_CASE(conditional_expression_storage_memory)
 	BOOST_CHECK(callContractFunction("f(bool)", false) == encodeArgs(u256(2)));
 }
 
+BOOST_AUTO_TEST_CASE(conditional_expression_different_types)
+{
+	char const* sourceCode = R"(
+		contract test {
+			function f(bool cond) returns (uint) {
+				uint8 x = 0xcd;
+				uint16 y = 0xabab;
+				return cond ? x : y;
+			}    
+		}
+	)";
+	compileAndRun(sourceCode);
+	BOOST_CHECK(callContractFunction("f(bool)", true) == encodeArgs(u256(0xcd)));
+	BOOST_CHECK(callContractFunction("f(bool)", false) == encodeArgs(u256(0xabab)));
+}
 BOOST_AUTO_TEST_CASE(recursive_calls)
 {
 	char const* sourceCode = "contract test {\n"

Original file line number	Diff line number	Diff line change
`@@ -759,7 +759,7 @@ bool TypeChecker::visit(Conditional const& _conditional)`
`759`	`759`	`commonType = trueType;`
`760`	`760`	`else`
`761`	`761`	`// we fake it as an equal operator, but any other comparison operator can work.`
`762`		`- TypePointer commonType = trueType->binaryOperatorResult(Token::Equal, falseType);`
	`762`	`+ commonType = trueType->binaryOperatorResult(Token::Equal, falseType);`
`763`	`763`	`if (!commonType)`
`764`	`764`	`{`
`765`	`765`	`typeError(`