cerc-io/solidity
10
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

find common type

Browse Source
This commit is contained in:
RJ 2016-01-10 01:09:58 -06:00
parent 10a1c352b9
commit df9dfa8fef
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libsolidity/analysis/TypeChecker.cpp
View File

@ -780,8 +780,9 @@ bool TypeChecker::visit(Assignment const& _assignment)
bool TypeChecker::visit(TupleExpression const& _tuple) bool TypeChecker::visit(TupleExpression const& _tuple)
{ {
vector<ASTPointer<Expression>> const& components = _tuple.components(); vector<ASTPointer<Expression>> const& components = _tuple.components();
solAssert(!_tuple.isInlineArray(), "Tuple type not properly declared");
TypePointers types; TypePointers types;
TypePointer internalArrayType;
bool isArray = _tuple.isInlineArray();
if (_tuple.annotation().lValueRequested) if (_tuple.annotation().lValueRequested)
{ {
for (auto const& component: components) for (auto const& component: components)
@ -810,12 +811,20 @@ bool TypeChecker::visit(TupleExpression const& _tuple)
{ {
components[i]->accept(*this); components[i]->accept(*this);
types.push_back(type(*components[i])); types.push_back(type(*components[i]));
if (i == 0 && isArray)
internalArrayType = types[i]->mobileType();
else if (isArray && internalArrayType && types[i]->mobileType())
internalArrayType = Type::commonType(internalArrayType, types[i]->mobileType());
} }
else else
types.push_back(TypePointer()); types.push_back(TypePointer());
} }
if (components.size() == 1) if (components.size() == 1 && !isArray)
_tuple.annotation().type = type(*components[0]); _tuple.annotation().type = type(*components[0]);
else if (!internalArrayType && isArray)
fatalTypeError(_tuple.location(), "Unable to deduce common type for array elements.");
else if (isArray)
_tuple.annotation().type = make_shared<ArrayType>(DataLocation::Memory, internalArrayType, types.size());
else else
{ {
if (components.size() == 2 && !components[1]) if (components.size() == 2 && !components[1])