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] change the end to end test

Browse Source
This commit is contained in:
Lu Guanqun
2016-01-22 17:14:01 +00:00
parent ac3019298a
commit c8b0533933
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsolidity/analysis/TypeChecker.cpp
+6 -2
View File
@@ -758,8 +758,12 @@ bool TypeChecker::visit(Conditional const& _conditional)
if (*trueType == *falseType)
commonType = trueType;
else
// we fake it as an equal operator, but any other comparison operator can work.
commonType = trueType->binaryOperatorResult(Token::Equal, falseType);
{
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);
}
if (!commonType)
{
typeError(