aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorYoichi Hirai <i@yoichihirai.com>2016-11-07 21:12:30 +0800
committerYoichi Hirai <i@yoichihirai.com>2016-11-08 18:11:08 +0800
commit2e929666845300217f3725f67e48cd04a567a6f2 (patch)
treea719a58947206f3530b6b74cebb1dc8c8c98fc10 /test
parentb78d4d67f51d6d5b65fff595ddbf06f13fa85bc2 (diff)
downloaddexon-solidity-2e929666845300217f3725f67e48cd04a567a6f2.tar.gz
dexon-solidity-2e929666845300217f3725f67e48cd04a567a6f2.tar.zst
dexon-solidity-2e929666845300217f3725f67e48cd04a567a6f2.zip
libevmasm: fix comparison of SourceLocations
Diffstat (limited to 'test')
-rw-r--r--test/libsolidity/Assembly.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/test/libsolidity/Assembly.cpp b/test/libsolidity/Assembly.cpp
index 8d7a3540..eddba5e1 100644
--- a/test/libsolidity/Assembly.cpp
+++ b/test/libsolidity/Assembly.cpp
@@ -91,8 +91,10 @@ void checkAssemblyLocations(AssemblyItems const& _items, vector<SourceLocation>
BOOST_CHECK_MESSAGE(
_items[i].location() == _locations[i],
"Location mismatch for assembly item " + to_string(i) + ". Found: " +
+ (_items[i].location().sourceName ? *_items[i].location().sourceName + ":" : "(null source name)") +
to_string(_items[i].location().start) + "-" +
to_string(_items[i].location().end) + ", expected: " +
+ (_locations[i].sourceName ? *_locations[i].sourceName + ":" : "(null source name)") +
to_string(_locations[i].start) + "-" +
to_string(_locations[i].end));
}
@@ -111,7 +113,7 @@ BOOST_AUTO_TEST_CASE(location_test)
}
}
)";
- shared_ptr<string const> n = make_shared<string>("source");
+ shared_ptr<string const> n = make_shared<string>("");
AssemblyItems items = compileContract(sourceCode);
vector<SourceLocation> locations =
vector<SourceLocation>(18, SourceLocation(2, 75, n)) +