cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cond-expr: use the mobile type instead of the original type

Browse Source
This commit is contained in:
Lu Guanqun 2016-01-11 16:00:14 +00:00
parent c8b0533933
commit d36537e737
2 changed files with 37 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libsolidity/analysis/TypeChecker.cpp
View File

@ -751,19 +751,10 @@ bool TypeChecker::visit(Conditional const& _conditional)
_conditional.trueExpression().accept(*this);
_conditional.falseExpression().accept(*this);
TypePointer const& trueType = type(_conditional.trueExpression());
TypePointer const& falseType = type(_conditional.falseExpression());
TypePointer trueType = type(_conditional.trueExpression())->mobileType();
TypePointer falseType = type(_conditional.falseExpression())->mobileType();
TypePointer commonType;
if (*trueType == *falseType)
commonType = trueType;
else
{
commonType = Type::commonType(trueType, falseType);
if (!commonType)
// we fake it as an equal operator, but any other comparison operator can work.
commonType = trueType->binaryOperatorResult(Token::Equal, falseType);
}
TypePointer commonType = Type::commonType(trueType, falseType);
if (!commonType)
{
typeError(

35
test/libsolidity/SolidityEndToEndTest.cpp
View File

@ -141,7 +141,40 @@ BOOST_AUTO_TEST_CASE(conditional_expression_with_return_values)
BOOST_CHECK(callContractFunction("f(bool,uint256)", false, u256(20)) == encodeArgs(u256(0), u256(20)));
}
BOOST_AUTO_TEST_CASE(conditional_expression_storage_memory)
BOOST_AUTO_TEST_CASE(conditional_expression_storage_memory_1)
{
char const* sourceCode = R"(
contract test {
bytes2[2] data1;
function f(bool cond) returns (uint) {
bytes2[2] memory x;
x[0] = "aa";
bytes2[2] memory y;
y[0] = "bb";
data1 = cond ? x : y;
uint ret = 0;
if (data1[0] == "aa")
{
ret = 1;
}
if (data1[0] == "bb")
{
ret = 2;
}
return ret;
}
}
)";
compileAndRun(sourceCode);
BOOST_CHECK(callContractFunction("f(bool)", true) == encodeArgs(u256(1)));
BOOST_CHECK(callContractFunction("f(bool)", false) == encodeArgs(u256(2)));
}
BOOST_AUTO_TEST_CASE(conditional_expression_storage_memory_2)
{
char const* sourceCode = R"(
contract test {