diff options
| author | Jordan Last <jordan.michael.last@gmail.com> | 2018-09-14 04:29:12 +0800 |
|---|---|---|
| committer | Jordan Last <jordan.michael.last@gmail.com> | 2018-09-14 05:53:06 +0800 |
| commit | d0497aacc06524749c20f169dc59d2123f410581 (patch) | |
| tree | 049e546794c62895b92da4bf1b607bc5310915bb /libsolidity/analysis | |
| parent | e7daed68c1977683546ac3e72d4f84ff538f6711 (diff) | |
| download | dexon-solidity-d0497aacc06524749c20f169dc59d2123f410581.tar.gz dexon-solidity-d0497aacc06524749c20f169dc59d2123f410581.tar.zst dexon-solidity-d0497aacc06524749c20f169dc59d2123f410581.zip | |
fixing rebase conflicts
add ElementaryTypes::BytesMemory and ElementaryTypes::StringMemory
fix rebase conflicts
fixing rebase conflicts
use make_shared instead of new
fix tabs and StateMutability parameter
create address and addressType functions, fix spaces in comment
fix typo and switch nonpayable to payable
fix spaces
fix comment again
Diffstat (limited to 'libsolidity/analysis')
| -rw-r--r-- | libsolidity/analysis/TypeChecker.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp index e023dc38..13294476 100644 --- a/libsolidity/analysis/TypeChecker.cpp +++ b/libsolidity/analysis/TypeChecker.cpp @@ -535,7 +535,7 @@ TypePointers TypeChecker::typeCheckABIDecodeAndRetrieveReturnType(FunctionCall c toString(arguments.size()) + " were provided." ); - if (arguments.size() >= 1 && !type(*arguments.front())->isImplicitlyConvertibleTo(ArrayType(DataLocation::Memory))) + if (arguments.size() >= 1 && !type(*arguments.front())->isImplicitlyConvertibleTo(ArrayType::bytesMemory())) m_errorReporter.typeError( arguments.front()->location(), "Invalid type for argument in function call. " @@ -2131,7 +2131,7 @@ bool TypeChecker::visit(MemberAccess const& _memberAccess) "after argument-dependent lookup in " + exprType->toString() + (memberName == "value" ? " - did you forget the \"payable\" modifier?" : "."); if (exprType->category() == Type::Category::Contract) - for (auto const& addressMember: AddressType(StateMutability::Payable).nativeMembers(nullptr)) + for (auto const& addressMember: AddressType::addressPayable().nativeMembers(nullptr)) if (addressMember.name == memberName) { Identifier const* var = dynamic_cast<Identifier const*>(&_memberAccess.expression()); |