cerc-io/solidity
15
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 endVisit() to visit()

Browse Source
This commit is contained in:
Lu Guanqun 2016-01-07 09:01:46 +00:00
parent c781b130ef
commit 82ee9503e9
2 changed files with 41 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
libsolidity/analysis/TypeChecker.cpp
View File

@ -744,44 +744,55 @@ void TypeChecker::endVisit(ExpressionStatement const& _statement)
typeError(_statement.expression().location(), "Invalid integer constant.");
}
void TypeChecker::endVisit(Conditional const& _conditional)
bool TypeChecker::visit(Conditional const& _conditional)
{
TypePointer const& conditionType = type(_conditional.condition());
if (!conditionType->isImplicitlyConvertibleTo(BoolType()))
typeError(
_conditional.location(),
"Conditional expression's type " +
conditionType->toString() +
" doesn't match bool type."
);
TypePointer const& trueType = type(_conditional.trueExpression());
TypePointer const& falseType = type(_conditional.falseExpression());
// 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 " +
trueType->toString() +
" 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;
expectType(_conditional.condition(), BoolType());
if (_conditional.annotation().lValueRequested)
{
requireLValue(_conditional.trueExpression());
requireLValue(_conditional.falseExpression());
TypePointer const& trueType = type(_conditional.trueExpression());
TypePointer const& falseType = type(_conditional.falseExpression());
// as a left value, we require exact match to prevent subtle conversion issues.
if (*trueType != *falseType)
typeError(
_conditional.location(),
"True expression's type " +
trueType->toString() +
" doesn't match false expression's type " +
falseType->toString() +
"."
);
_conditional.annotation().type = trueType;
_conditional.annotation().isLValue = true;
}
else
{
_conditional.trueExpression().accept(*this);
_conditional.falseExpression().accept(*this);
TypePointer const& trueType = type(_conditional.trueExpression());
TypePointer const& falseType = type(_conditional.falseExpression());
// 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 " +
trueType->toString() +
" doesn't match false expression's type " +
falseType->toString() +
"."
);
_conditional.annotation().type = commonType;
}
return false;
}
bool TypeChecker::visit(Assignment const& _assignment)

2
libsolidity/analysis/TypeChecker.h
View File

@ -90,7 +90,7 @@ private:
virtual void endVisit(Return const& _return) override;
virtual bool visit(VariableDeclarationStatement const& _variable) override;
virtual void endVisit(ExpressionStatement const& _statement) override;
virtual void endVisit(Conditional const& _conditional) override;
virtual bool visit(Conditional const& _conditional) override;
virtual bool visit(Assignment const& _assignment) override;
virtual bool visit(TupleExpression const& _tuple) override;
virtual void endVisit(BinaryOperation const& _operation) override;