diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2017-08-28 21:40:28 +0800 |
|---|---|---|
| committer | Alex Beregszaszi <alex@rtfs.hu> | 2017-08-29 02:43:35 +0800 |
| commit | 79e84a8fa43b55838100f9c24dec04b1e721c65c (patch) | |
| tree | 45cdc8bd9693da3a3654b7fdf9bc5a658b1b929e | |
| parent | aa94000a91be455af7b9436db172ffa86cc57494 (diff) | |
| download | dexon-solidity-79e84a8fa43b55838100f9c24dec04b1e721c65c.tar.gz dexon-solidity-79e84a8fa43b55838100f9c24dec04b1e721c65c.tar.zst dexon-solidity-79e84a8fa43b55838100f9c24dec04b1e721c65c.zip | |
Swap declaration/statemutability in FunctionType constructor
| -rw-r--r-- | libsolidity/analysis/TypeChecker.cpp | 1 | ||||
| -rw-r--r-- | libsolidity/ast/Types.cpp | 13 | ||||
| -rw-r--r-- | libsolidity/ast/Types.h | 3 | ||||
| -rw-r--r-- | libsolidity/codegen/ExpressionCompiler.cpp | 2 |
4 files changed, 8 insertions, 11 deletions
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp index c70b0497..7d5a0c8c 100644 --- a/libsolidity/analysis/TypeChecker.cpp +++ b/libsolidity/analysis/TypeChecker.cpp @@ -1628,7 +1628,6 @@ void TypeChecker::endVisit(NewExpression const& _newExpression) strings(), FunctionType::Kind::ObjectCreation, false, - nullptr, StateMutability::Pure ); _newExpression.annotation().isPure = true; diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp index 4bffd9a5..22751c45 100644 --- a/libsolidity/ast/Types.cpp +++ b/libsolidity/ast/Types.cpp @@ -2164,7 +2164,6 @@ FunctionTypePointer FunctionType::newExpressionType(ContractDefinition const& _c strings{""}, Kind::Creation, false, - nullptr, stateMutability ); } @@ -2416,8 +2415,8 @@ FunctionTypePointer FunctionType::interfaceFunctionType() const m_returnParameterNames, m_kind, m_arbitraryParameters, - m_declaration, - m_stateMutability + m_stateMutability, + m_declaration ); } @@ -2444,8 +2443,8 @@ MemberList::MemberMap FunctionType::nativeMembers(ContractDefinition const*) con strings(), Kind::SetValue, false, - nullptr, StateMutability::NonPayable, + nullptr, m_gasSet, m_valueSet ) @@ -2461,8 +2460,8 @@ MemberList::MemberMap FunctionType::nativeMembers(ContractDefinition const*) con strings(), Kind::SetGas, false, - nullptr, StateMutability::NonPayable, + nullptr, m_gasSet, m_valueSet ) @@ -2599,8 +2598,8 @@ TypePointer FunctionType::copyAndSetGasOrValue(bool _setGas, bool _setValue) con m_returnParameterNames, m_kind, m_arbitraryParameters, - m_declaration, m_stateMutability, + m_declaration, m_gasSet || _setGas, m_valueSet || _setValue, m_bound @@ -2648,8 +2647,8 @@ FunctionTypePointer FunctionType::asMemberFunction(bool _inLibrary, bool _bound) m_returnParameterNames, kind, m_arbitraryParameters, - m_declaration, m_stateMutability, + m_declaration, m_gasSet, m_valueSet, _bound diff --git a/libsolidity/ast/Types.h b/libsolidity/ast/Types.h index 310c34fe..de6dcee9 100644 --- a/libsolidity/ast/Types.h +++ b/libsolidity/ast/Types.h @@ -899,7 +899,6 @@ public: strings(), _kind, _arbitraryParameters, - nullptr, _stateMutability ) { @@ -916,8 +915,8 @@ public: strings _returnParameterNames = strings(), Kind _kind = Kind::Internal, bool _arbitraryParameters = false, - Declaration const* _declaration = nullptr, StateMutability _stateMutability = StateMutability::NonPayable, + Declaration const* _declaration = nullptr, bool _gasSet = false, bool _valueSet = false, bool _bound = false diff --git a/libsolidity/codegen/ExpressionCompiler.cpp b/libsolidity/codegen/ExpressionCompiler.cpp index 45c2170c..5c9b743a 100644 --- a/libsolidity/codegen/ExpressionCompiler.cpp +++ b/libsolidity/codegen/ExpressionCompiler.cpp @@ -644,8 +644,8 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall) strings(), FunctionType::Kind::BareCall, false, - nullptr, StateMutability::NonPayable, + nullptr, true, true ), |