diff options
| author | chriseth <chris@ethereum.org> | 2016-11-09 17:49:30 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-09 17:49:30 +0800 |
| commit | c82acfd3ebfcc5a79817be6a7c9684727fb407ac (patch) | |
| tree | 781dd403852464c5fd9424e94b4f450c44ef7447 /libevmasm | |
| parent | 6f2bc0d20150204c33d3ec8747e92a43ad54ab46 (diff) | |
| parent | 2e929666845300217f3725f67e48cd04a567a6f2 (diff) | |
| download | dexon-solidity-c82acfd3ebfcc5a79817be6a7c9684727fb407ac.tar dexon-solidity-c82acfd3ebfcc5a79817be6a7c9684727fb407ac.tar.gz dexon-solidity-c82acfd3ebfcc5a79817be6a7c9684727fb407ac.tar.bz2 dexon-solidity-c82acfd3ebfcc5a79817be6a7c9684727fb407ac.tar.lz dexon-solidity-c82acfd3ebfcc5a79817be6a7c9684727fb407ac.tar.xz dexon-solidity-c82acfd3ebfcc5a79817be6a7c9684727fb407ac.tar.zst dexon-solidity-c82acfd3ebfcc5a79817be6a7c9684727fb407ac.zip | |
Merge pull request #1333 from ethereum/compare_location_files
Compare source files in source locations
Diffstat (limited to 'libevmasm')
| -rw-r--r-- | libevmasm/SourceLocation.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/libevmasm/SourceLocation.h b/libevmasm/SourceLocation.h index 05304d14..b8f073bb 100644 --- a/libevmasm/SourceLocation.h +++ b/libevmasm/SourceLocation.h @@ -55,7 +55,11 @@ struct SourceLocation return *this; } - bool operator==(SourceLocation const& _other) const { return start == _other.start && end == _other.end;} + bool operator==(SourceLocation const& _other) const + { + return start == _other.start && end == _other.end && + ((!sourceName && !_other.sourceName) || (sourceName && _other.sourceName && *sourceName == *_other.sourceName)); + } bool operator!=(SourceLocation const& _other) const { return !operator==(_other); } inline bool operator<(SourceLocation const& _other) const; inline bool contains(SourceLocation const& _other) const; @@ -79,20 +83,21 @@ inline std::ostream& operator<<(std::ostream& _out, SourceLocation const& _locat bool SourceLocation::operator<(SourceLocation const& _other) const { if (!sourceName || !_other.sourceName) - return int(!!sourceName) < int(!!_other.sourceName); - return make_tuple(*sourceName, start, end) < make_tuple(*_other.sourceName, _other.start, _other.end); + return std::make_tuple(int(!!sourceName), start, end) < std::make_tuple(int(!!_other.sourceName), _other.start, _other.end); + else + return std::make_tuple(*sourceName, start, end) < std::make_tuple(*_other.sourceName, _other.start, _other.end); } bool SourceLocation::contains(SourceLocation const& _other) const { - if (isEmpty() || _other.isEmpty() || !sourceName || !_other.sourceName || *sourceName != *_other.sourceName) + if (isEmpty() || _other.isEmpty() || ((!sourceName || !_other.sourceName || *sourceName != *_other.sourceName) && (sourceName || _other.sourceName))) return false; return start <= _other.start && _other.end <= end; } bool SourceLocation::intersects(SourceLocation const& _other) const { - if (isEmpty() || _other.isEmpty() || !sourceName || !_other.sourceName || *sourceName != *_other.sourceName) + if (isEmpty() || _other.isEmpty() || ((!sourceName || !_other.sourceName || *sourceName != *_other.sourceName) && (sourceName || _other.sourceName))) return false; return _other.start < end && start < _other.end; } |