diff options
| author | chriseth <chris@ethereum.org> | 2018-07-04 04:49:02 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-04 04:49:02 +0800 |
| commit | 533d5d4b1cc4374decc704de8c86ad4cef6214fc (patch) | |
| tree | e4b053a8c1ce438d199c53fff6a5a71dab7298dc /libsolidity | |
| parent | 16f8c23aa01ae9472088e46224dd089153540291 (diff) | |
| parent | 8747079746c1ca78dfabaca22bf1c011a342bb97 (diff) | |
| download | dexon-solidity-533d5d4b1cc4374decc704de8c86ad4cef6214fc.tar dexon-solidity-533d5d4b1cc4374decc704de8c86ad4cef6214fc.tar.gz dexon-solidity-533d5d4b1cc4374decc704de8c86ad4cef6214fc.tar.bz2 dexon-solidity-533d5d4b1cc4374decc704de8c86ad4cef6214fc.tar.lz dexon-solidity-533d5d4b1cc4374decc704de8c86ad4cef6214fc.tar.xz dexon-solidity-533d5d4b1cc4374decc704de8c86ad4cef6214fc.tar.zst dexon-solidity-533d5d4b1cc4374decc704de8c86ad4cef6214fc.zip | |
Merge pull request #4379 from ethereum/constructorArgsTwice
Disallow constructor arguments given multiple times.
Diffstat (limited to 'libsolidity')
| -rw-r--r-- | libsolidity/analysis/TypeChecker.cpp | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp index b9e3f8d0..3bd0b4c1 100644 --- a/libsolidity/analysis/TypeChecker.cpp +++ b/libsolidity/analysis/TypeChecker.cpp @@ -335,8 +335,6 @@ void TypeChecker::annotateBaseConstructorArguments( ASTNode const* _argumentNode ) { - bool const v050 = _currentContract.sourceUnit().annotation().experimentalFeatures.count(ExperimentalFeature::V050); - solAssert(_baseConstructor, ""); solAssert(_argumentNode, ""); @@ -365,18 +363,11 @@ void TypeChecker::annotateBaseConstructorArguments( ssl.append("Second constructor call is here: ", previousNode->location()); } - if (v050) - m_errorReporter.declarationError( - *mainLocation, - ssl, - "Base constructor arguments given twice." - ); - else - m_errorReporter.warning( - *mainLocation, - "Base constructor arguments given twice.", - ssl - ); + m_errorReporter.declarationError( + *mainLocation, + ssl, + "Base constructor arguments given twice." + ); } } |