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] fixup according to code review

Browse Source
This commit is contained in:
Lu Guanqun 2016-01-07 09:14:29 +00:00
parent 82ee9503e9
commit b003290638
4 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libsolidity/analysis/TypeChecker.cpp
View File

@ -765,7 +765,7 @@ bool TypeChecker::visit(Conditional const& _conditional)
" doesn't match false expression's type " + " doesn't match false expression's type " +
falseType->toString() + falseType->toString() +
"." "."
); );
_conditional.annotation().type = trueType; _conditional.annotation().type = trueType;
_conditional.annotation().isLValue = true; _conditional.annotation().isLValue = true;
@ -781,6 +781,7 @@ bool TypeChecker::visit(Conditional const& _conditional)
// we fake it as an equal operator, but any other comparison operator can work. // we fake it as an equal operator, but any other comparison operator can work.
TypePointer commonType = trueType->binaryOperatorResult(Token::Equal, falseType); TypePointer commonType = trueType->binaryOperatorResult(Token::Equal, falseType);
if (!commonType) if (!commonType)
{
typeError( typeError(
_conditional.location(), _conditional.location(),
"True expression's type " + "True expression's type " +
@ -788,7 +789,11 @@ bool TypeChecker::visit(Conditional const& _conditional)
" doesn't match false expression's type " + " doesn't match false expression's type " +
falseType->toString() + falseType->toString() +
"." "."
); );
// even we can't find a common type, we have to set a type here,
// otherwise the upper statement will not be able to check the type.
commonType = trueType;
}
_conditional.annotation().type = commonType; _conditional.annotation().type = commonType;
} }

4
libsolidity/codegen/ExpressionCompiler.cpp
View File

@ -182,10 +182,12 @@ bool ExpressionCompiler::visit(Conditional const& _condition)
_condition.condition().accept(*this); _condition.condition().accept(*this);
eth::AssemblyItem trueTag = m_context.appendConditionalJump(); eth::AssemblyItem trueTag = m_context.appendConditionalJump();
_condition.falseExpression().accept(*this); _condition.falseExpression().accept(*this);
utils().convertType(*_condition.falseExpression().annotation().type, *_condition.annotation().type);
eth::AssemblyItem endTag = m_context.appendJumpToNew(); eth::AssemblyItem endTag = m_context.appendJumpToNew();
m_context << trueTag; m_context << trueTag;
m_context.adjustStackOffset(-1); m_context.adjustStackOffset(-_condition.annotation().type->sizeOnStack());
_condition.trueExpression().accept(*this); _condition.trueExpression().accept(*this);
utils().convertType(*_condition.trueExpression().annotation().type, *_condition.annotation().type);
m_context << endTag; m_context << endTag;
return false; return false;
} }

2
libsolidity/parsing/Parser.cpp
View File

@ -947,7 +947,7 @@ ASTPointer<Expression> Parser::parseExpression(
expectToken(Token::Colon); expectToken(Token::Colon);
ASTPointer<Expression> falseExpression = parseExpression(); ASTPointer<Expression> falseExpression = parseExpression();
ASTNodeFactory nodeFactory(*this, expression); ASTNodeFactory nodeFactory(*this, expression);
nodeFactory.setEndPositionFromNode(falseExpression); // TODO: nodeFactory.setEndPositionFromNode(falseExpression);
return nodeFactory.createNode<Conditional>(expression, trueExpression, falseExpression); return nodeFactory.createNode<Conditional>(expression, trueExpression, falseExpression);
} }
else else

15
test/libsolidity/SolidityEndToEndTest.cpp
View File

@ -128,7 +128,6 @@ BOOST_AUTO_TEST_CASE(conditional_expression_multiple)
BOOST_CHECK(callContractFunction("f(uint256)", u256(40)) == toBigEndian(u256(10))); BOOST_CHECK(callContractFunction("f(uint256)", u256(40)) == toBigEndian(u256(10)));
} }
/*
BOOST_AUTO_TEST_CASE(conditional_expression_as_left_value) BOOST_AUTO_TEST_CASE(conditional_expression_as_left_value)
{ {
char const* sourceCode = R"( char const* sourceCode = R"(
@ -144,7 +143,19 @@ BOOST_AUTO_TEST_CASE(conditional_expression_as_left_value)
BOOST_CHECK(callContractFunction("f(uint256)", u256(20)) == toBigEndian(u256(3))); BOOST_CHECK(callContractFunction("f(uint256)", u256(20)) == toBigEndian(u256(3)));
BOOST_CHECK(callContractFunction("f(uint256)", u256(5)) == toBigEndian(u256(1))); BOOST_CHECK(callContractFunction("f(uint256)", u256(5)) == toBigEndian(u256(1)));
} }
*/
BOOST_AUTO_TEST_CASE(conditional_expression_with_return_values)
{
char const* sourceCode = R"(
contract test {
function f(bool cond, uint v) returns (uint a, uint b) {
cond ? a = v : b = v;
}
})";
compileAndRun(sourceCode);
BOOST_CHECK(callContractFunction("f(bool,uint256)", true, u256(20)) == encodeArgs(u256(20), u256(0)));
BOOST_CHECK(callContractFunction("f(bool,uint256)", false, u256(20)) == encodeArgs(u256(0), u256(20)));
}
BOOST_AUTO_TEST_CASE(recursive_calls) BOOST_AUTO_TEST_CASE(recursive_calls)
{ {