diff options
| author | chriseth <c@ethdev.com> | 2015-11-03 00:11:02 +0800 |
|---|---|---|
| committer | chriseth <c@ethdev.com> | 2015-11-03 00:11:02 +0800 |
| commit | 5981ee4013c0409a37fb29dbcfaa23f8f95c4a54 (patch) | |
| tree | e92ab4d3ccd6bfbd7c0b89a9ffde4eb8d88f2251 /libsolidity/codegen | |
| parent | 22723da1809b24ec901c2fdf2fffc8cc29e5f387 (diff) | |
| parent | a5c227778d7f0145434147830bd07a16f0f72134 (diff) | |
| download | dexon-solidity-5981ee4013c0409a37fb29dbcfaa23f8f95c4a54.tar dexon-solidity-5981ee4013c0409a37fb29dbcfaa23f8f95c4a54.tar.gz dexon-solidity-5981ee4013c0409a37fb29dbcfaa23f8f95c4a54.tar.bz2 dexon-solidity-5981ee4013c0409a37fb29dbcfaa23f8f95c4a54.tar.lz dexon-solidity-5981ee4013c0409a37fb29dbcfaa23f8f95c4a54.tar.xz dexon-solidity-5981ee4013c0409a37fb29dbcfaa23f8f95c4a54.tar.zst dexon-solidity-5981ee4013c0409a37fb29dbcfaa23f8f95c4a54.zip | |
Merge pull request #185 from chriseth/fix_strings_in_tuples
Bugfix: Returning literal strings in tuples.
Diffstat (limited to 'libsolidity/codegen')
| -rw-r--r-- | libsolidity/codegen/Compiler.cpp | 6 | ||||
| -rw-r--r-- | libsolidity/codegen/CompilerUtils.cpp | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/libsolidity/codegen/Compiler.cpp b/libsolidity/codegen/Compiler.cpp index 457b1e02..5daa37de 100644 --- a/libsolidity/codegen/Compiler.cpp +++ b/libsolidity/codegen/Compiler.cpp @@ -606,7 +606,11 @@ bool Compiler::visit(Return const& _return) for (auto const& retVariable: returnParameters) types.push_back(retVariable->annotation().type); - TypePointer expectedType = types.size() == 1 ? types.front() : make_shared<TupleType>(types); + TypePointer expectedType; + if (expression->annotation().type->category() == Type::Category::Tuple || types.size() != 1) + expectedType = make_shared<TupleType>(types); + else + expectedType = types.front(); compileExpression(*expression, expectedType); for (auto const& retVariable: boost::adaptors::reverse(returnParameters)) diff --git a/libsolidity/codegen/CompilerUtils.cpp b/libsolidity/codegen/CompilerUtils.cpp index cd84f5fc..dd38ef97 100644 --- a/libsolidity/codegen/CompilerUtils.cpp +++ b/libsolidity/codegen/CompilerUtils.cpp @@ -598,7 +598,7 @@ void CompilerUtils::convertType(Type const& _typeOnStack, Type const& _targetTyp } // Value grew if (targetSize > sourceSize) - moveIntoStack(depth + targetSize - sourceSize, targetSize - sourceSize); + moveIntoStack(depth + targetSize - sourceSize - 1, targetSize - sourceSize); } } depth -= sourceSize; |