From c8b05339335d8e9166ef6863f7697bcc59f09260 Mon Sep 17 00:00:00 2001 From: Lu Guanqun Date: Mon, 11 Jan 2016 15:30:25 +0000 Subject: [cond-expr] change the end to end test --- libsolidity/analysis/TypeChecker.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'libsolidity') diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp index a8125573..016fe66a 100644 --- a/libsolidity/analysis/TypeChecker.cpp +++ b/libsolidity/analysis/TypeChecker.cpp @@ -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( -- cgit v1.2.3