cerc-io/solidity
11
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-22 17:14:00 +00:00
parent 82ee9503e9
commit b003290638
4 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsolidity/analysis/TypeChecker.cpp
+7 -2
View File
@@ -765,7 +765,7 @@ bool TypeChecker::visit(Conditional const& _conditional)
" doesn't match false expression's type " +
falseType->toString() +
"."
);
);
_conditional.annotation().type = trueType;
_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.
TypePointer commonType = trueType->binaryOperatorResult(Token::Equal, falseType);
if (!commonType)
{
typeError(
_conditional.location(),
"True expression's type " +
@@ -788,7 +789,11 @@ bool TypeChecker::visit(Conditional const& _conditional)
" doesn't match false expression's type " +
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;
}