diff options
| author | chriseth <chris@ethereum.org> | 2017-01-27 21:10:22 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-27 21:10:22 +0800 |
| commit | b2c35fb41a65dc996189b890f292103d9318b53e (patch) | |
| tree | cd2a2fd222994c64d5ad946dfb8210848e2fc5e6 /test | |
| parent | 636e480156130ec44c5b85890ebe0c3792a75061 (diff) | |
| parent | bff8fc23e6cc602511b52aaa665e63b948eba068 (diff) | |
| download | dexon-solidity-b2c35fb41a65dc996189b890f292103d9318b53e.tar dexon-solidity-b2c35fb41a65dc996189b890f292103d9318b53e.tar.gz dexon-solidity-b2c35fb41a65dc996189b890f292103d9318b53e.tar.bz2 dexon-solidity-b2c35fb41a65dc996189b890f292103d9318b53e.tar.lz dexon-solidity-b2c35fb41a65dc996189b890f292103d9318b53e.tar.xz dexon-solidity-b2c35fb41a65dc996189b890f292103d9318b53e.tar.zst dexon-solidity-b2c35fb41a65dc996189b890f292103d9318b53e.zip | |
Merge pull request #1598 from wuestholz/develop
Change translation of implicit throws
Diffstat (limited to 'test')
| -rw-r--r-- | test/libsolidity/Assembly.cpp | 4 | ||||
| -rw-r--r-- | test/libsolidity/SolidityExpressionCompiler.cpp | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/test/libsolidity/Assembly.cpp b/test/libsolidity/Assembly.cpp index 155dd5c9..497bfc77 100644 --- a/test/libsolidity/Assembly.cpp +++ b/test/libsolidity/Assembly.cpp @@ -116,8 +116,8 @@ BOOST_AUTO_TEST_CASE(location_test) shared_ptr<string const> n = make_shared<string>(""); AssemblyItems items = compileContract(sourceCode); vector<SourceLocation> locations = - vector<SourceLocation>(18, SourceLocation(2, 75, n)) + - vector<SourceLocation>(27, SourceLocation(20, 72, n)) + + vector<SourceLocation>(17, SourceLocation(2, 75, n)) + + vector<SourceLocation>(30, SourceLocation(20, 72, n)) + vector<SourceLocation>{SourceLocation(42, 51, n), SourceLocation(65, 67, n)} + vector<SourceLocation>(2, SourceLocation(58, 67, n)) + vector<SourceLocation>(3, SourceLocation(20, 72, n)); diff --git a/test/libsolidity/SolidityExpressionCompiler.cpp b/test/libsolidity/SolidityExpressionCompiler.cpp index 0c5a09c3..a769776e 100644 --- a/test/libsolidity/SolidityExpressionCompiler.cpp +++ b/test/libsolidity/SolidityExpressionCompiler.cpp @@ -337,13 +337,19 @@ BOOST_AUTO_TEST_CASE(arithmetics) byte(Instruction::ADD), byte(Instruction::DUP2), byte(Instruction::ISZERO), - byte(Instruction::PUSH1), 0x0, + byte(Instruction::ISZERO), + byte(Instruction::PUSH1), 0x1d, byte(Instruction::JUMPI), + byte(Instruction::INVALID), + byte(Instruction::JUMPDEST), byte(Instruction::MOD), byte(Instruction::DUP2), byte(Instruction::ISZERO), - byte(Instruction::PUSH1), 0x0, + byte(Instruction::ISZERO), + byte(Instruction::PUSH1), 0x26, byte(Instruction::JUMPI), + byte(Instruction::INVALID), + byte(Instruction::JUMPDEST), byte(Instruction::DIV), byte(Instruction::MUL)}); BOOST_CHECK_EQUAL_COLLECTIONS(code.begin(), code.end(), expectation.begin(), expectation.end()); |