diff options
| author | chriseth <chris@ethereum.org> | 2017-07-26 23:30:27 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-26 23:30:27 +0800 |
| commit | 925569bfa32c6eb1c024e0d860f550119235cd81 (patch) | |
| tree | a117d88a1d8ba89941e19b5caf4e1696365787d2 /libsolidity/interface | |
| parent | 092c2815e5cb1cdc3ecd30325a67e55e92fe2f49 (diff) | |
| parent | e0dc74b895727525f261a9abe190872a58e8999e (diff) | |
| download | dexon-solidity-925569bfa32c6eb1c024e0d860f550119235cd81.tar dexon-solidity-925569bfa32c6eb1c024e0d860f550119235cd81.tar.gz dexon-solidity-925569bfa32c6eb1c024e0d860f550119235cd81.tar.bz2 dexon-solidity-925569bfa32c6eb1c024e0d860f550119235cd81.tar.lz dexon-solidity-925569bfa32c6eb1c024e0d860f550119235cd81.tar.xz dexon-solidity-925569bfa32c6eb1c024e0d860f550119235cd81.tar.zst dexon-solidity-925569bfa32c6eb1c024e0d860f550119235cd81.zip | |
Merge pull request #1637 from ethereum/warn-shadowing-globals
Warn if shadowing built-ins
Diffstat (limited to 'libsolidity/interface')
| -rw-r--r-- | libsolidity/interface/ErrorReporter.cpp | 14 | ||||
| -rw-r--r-- | libsolidity/interface/ErrorReporter.h | 22 |
2 files changed, 24 insertions, 12 deletions
diff --git a/libsolidity/interface/ErrorReporter.cpp b/libsolidity/interface/ErrorReporter.cpp index 6e2667a5..f9ef4ceb 100644 --- a/libsolidity/interface/ErrorReporter.cpp +++ b/libsolidity/interface/ErrorReporter.cpp @@ -42,11 +42,23 @@ void ErrorReporter::warning(string const& _description) error(Error::Type::Warning, SourceLocation(), _description); } -void ErrorReporter::warning(SourceLocation const& _location, string const& _description) +void ErrorReporter::warning( + SourceLocation const& _location, + string const& _description +) { error(Error::Type::Warning, _location, _description); } +void ErrorReporter::warning( + SourceLocation const& _location, + string const& _description, + SecondarySourceLocation const& _secondaryLocation +) +{ + error(Error::Type::Warning, _location, _secondaryLocation, _description); +} + void ErrorReporter::error(Error::Type _type, SourceLocation const& _location, string const& _description) { auto err = make_shared<Error>(_type); diff --git a/libsolidity/interface/ErrorReporter.h b/libsolidity/interface/ErrorReporter.h index e5605d24..8b066a3e 100644 --- a/libsolidity/interface/ErrorReporter.h +++ b/libsolidity/interface/ErrorReporter.h @@ -41,30 +41,30 @@ public: ErrorReporter& operator=(ErrorReporter const& _errorReporter); - void warning(std::string const& _description = std::string()); + void warning(std::string const& _description); + + void warning(SourceLocation const& _location, std::string const& _description); void warning( - SourceLocation const& _location = SourceLocation(), - std::string const& _description = std::string() + SourceLocation const& _location, + std::string const& _description, + SecondarySourceLocation const& _secondaryLocation ); void error( Error::Type _type, - SourceLocation const& _location = SourceLocation(), - std::string const& _description = std::string() - ); - - void declarationError( SourceLocation const& _location, - SecondarySourceLocation const& _secondaryLocation = SecondarySourceLocation(), - std::string const& _description = std::string() + std::string const& _description ); void declarationError( SourceLocation const& _location, - std::string const& _description = std::string() + SecondarySourceLocation const& _secondaryLocation, + std::string const& _description ); + void declarationError(SourceLocation const& _location, std::string const& _description); + void fatalDeclarationError(SourceLocation const& _location, std::string const& _description); void parserError(SourceLocation const& _location, std::string const& _description); |