cerc-io/solidity
11
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #8224 from a3d4/refactor-sourcelocation

Browse Source 
Replaced SourceLocation::isEmpty() with isValid() and hasText().
This commit is contained in:
chriseth
2020-02-04 22:23:51 +01:00
committed by GitHub
parent d7bf6f7137 3416c029cf
commit 7cca036f4c
11 changed files with 35 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/libevmasm/Assembler.cpp
+2 -2
View File
@@ -51,11 +51,11 @@ BOOST_AUTO_TEST_SUITE(Assembler)
BOOST_AUTO_TEST_CASE(all_assembly_items)
{
Assembly _assembly;
auto root_asm = make_shared<CharStream>("", "root.asm");
auto root_asm = make_shared<CharStream>("lorem ipsum", "root.asm");
_assembly.setSourceLocation({1, 3, root_asm});
Assembly _subAsm;
auto sub_asm = make_shared<CharStream>("", "sub.asm");
auto sub_asm = make_shared<CharStream>("lorem ipsum", "sub.asm");
_subAsm.setSourceLocation({6, 8, sub_asm});
_subAsm.append(Instruction::INVALID);
shared_ptr<Assembly> _subAsmPtr = make_shared<Assembly>(_subAsm);
test/libevmasm/Optimiser.cpp
+1 -1
View File
@@ -72,7 +72,7 @@ namespace
for (AssemblyItem const& item: output)
{
BOOST_CHECK(item == Instruction::POP || !item.location().isEmpty());
BOOST_CHECK(item == Instruction::POP || item.location().isValid());
}
return output;
}
test/liblangutil/SourceLocation.cpp
+3 -3
View File
@@ -33,9 +33,9 @@ BOOST_AUTO_TEST_SUITE(SourceLocationTest)
BOOST_AUTO_TEST_CASE(test_fail)
{
auto const source = std::make_shared<CharStream>("", "source");
auto const sourceA = std::make_shared<CharStream>("", "sourceA");
auto const sourceB = std::make_shared<CharStream>("", "sourceB");
auto const source = std::make_shared<CharStream>("lorem ipsum", "source");
auto const sourceA = std::make_shared<CharStream>("lorem ipsum", "sourceA");
auto const sourceB = std::make_shared<CharStream>("lorem ipsum", "sourceB");
BOOST_CHECK(SourceLocation{} == SourceLocation{});
BOOST_CHECK((SourceLocation{0, 3, sourceA} != SourceLocation{0, 3, sourceB}));