diff options
| author | Paweł Bylica <chfast@gmail.com> | 2015-06-11 15:42:40 +0800 |
|---|---|---|
| committer | Paweł Bylica <chfast@gmail.com> | 2015-06-11 15:42:40 +0800 |
| commit | 0deb3ea9c9d62fa038999d1d5f2edec8683a8a21 (patch) | |
| tree | 7a42e342385faae8c6417a82da2e456f5a8a29fe /libsolidity/Assembly.cpp | |
| parent | 7272785f9288b591ed9a4ca59c0b69c65a1f95c9 (diff) | |
| parent | a7a137816cc5cc684f4c7aeb72be26a881aff4f0 (diff) | |
| download | dexon-solidity-0deb3ea9c9d62fa038999d1d5f2edec8683a8a21.tar dexon-solidity-0deb3ea9c9d62fa038999d1d5f2edec8683a8a21.tar.gz dexon-solidity-0deb3ea9c9d62fa038999d1d5f2edec8683a8a21.tar.bz2 dexon-solidity-0deb3ea9c9d62fa038999d1d5f2edec8683a8a21.tar.lz dexon-solidity-0deb3ea9c9d62fa038999d1d5f2edec8683a8a21.tar.xz dexon-solidity-0deb3ea9c9d62fa038999d1d5f2edec8683a8a21.tar.zst dexon-solidity-0deb3ea9c9d62fa038999d1d5f2edec8683a8a21.zip | |
Merge remote-tracking branch 'upstream/develop' into evmjit-develop
Conflicts:
evmjit/libevmjit/Cache.cpp
Diffstat (limited to 'libsolidity/Assembly.cpp')
| -rw-r--r-- | libsolidity/Assembly.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libsolidity/Assembly.cpp b/libsolidity/Assembly.cpp index ccc4bf81..fd4bbcf6 100644 --- a/libsolidity/Assembly.cpp +++ b/libsolidity/Assembly.cpp @@ -105,8 +105,8 @@ BOOST_AUTO_TEST_CASE(location_test) shared_ptr<string const> n = make_shared<string>("source"); AssemblyItems items = compileContract(sourceCode); vector<SourceLocation> locations = - vector<SourceLocation>(11, SourceLocation(2, 75, n)) + - vector<SourceLocation>(12, SourceLocation(20, 72, n)) + + vector<SourceLocation>(17, SourceLocation(2, 75, n)) + + vector<SourceLocation>(14, SourceLocation(20, 72, n)) + vector<SourceLocation>{SourceLocation(42, 51, n), SourceLocation(65, 67, n)} + vector<SourceLocation>(4, SourceLocation(58, 67, n)) + vector<SourceLocation>(3, SourceLocation(20, 72, n)); |