diff options
author | chriseth <chris@ethereum.org> | 2017-08-29 23:07:32 +0800 |
---|---|---|
committer | chriseth <chris@ethereum.org> | 2017-09-06 19:50:49 +0800 |
commit | 342367d5dcb897d1ef3bbc00853538859773ed37 (patch) | |
tree | a8201102ef9e0176e33b1cc35783a4dd7c7abfca /libsolidity/analysis | |
parent | eacee5b25c1edbcf3e32128bd28bce5e58fc2a74 (diff) | |
download | dexon-solidity-342367d5dcb897d1ef3bbc00853538859773ed37.tar dexon-solidity-342367d5dcb897d1ef3bbc00853538859773ed37.tar.gz dexon-solidity-342367d5dcb897d1ef3bbc00853538859773ed37.tar.bz2 dexon-solidity-342367d5dcb897d1ef3bbc00853538859773ed37.tar.lz dexon-solidity-342367d5dcb897d1ef3bbc00853538859773ed37.tar.xz dexon-solidity-342367d5dcb897d1ef3bbc00853538859773ed37.tar.zst dexon-solidity-342367d5dcb897d1ef3bbc00853538859773ed37.zip |
Store super function.
Diffstat (limited to 'libsolidity/analysis')
-rw-r--r-- | libsolidity/analysis/TypeChecker.cpp | 3 | ||||
-rw-r--r-- | libsolidity/analysis/TypeChecker.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp index c46485d8..966ca560 100644 --- a/libsolidity/analysis/TypeChecker.cpp +++ b/libsolidity/analysis/TypeChecker.cpp @@ -315,6 +315,9 @@ void TypeChecker::checkFunctionOverride(FunctionDefinition const& function, Func if (!functionType.hasEqualArgumentTypes(superType)) return; + if (!function.annotation().superFunction) + function.annotation().superFunction = &super; + if (function.visibility() != super.visibility()) overrideError(function, super, "Overriding function visibility differs."); diff --git a/libsolidity/analysis/TypeChecker.h b/libsolidity/analysis/TypeChecker.h index f2e13765..0c6f54d3 100644 --- a/libsolidity/analysis/TypeChecker.h +++ b/libsolidity/analysis/TypeChecker.h @@ -63,6 +63,7 @@ private: void checkContractDuplicateFunctions(ContractDefinition const& _contract); void checkContractIllegalOverrides(ContractDefinition const& _contract); /// Reports a type error with an appropiate message if overriden function signature differs. + /// Also stores the direct super function in the AST annotations. void checkFunctionOverride(FunctionDefinition const& function, FunctionDefinition const& super); void overrideError(FunctionDefinition const& function, FunctionDefinition const& super, std::string message); void checkContractAbstractFunctions(ContractDefinition const& _contract); |