diff options
| author | Christian <c@ethdev.com> | 2014-11-03 23:29:55 +0800 |
|---|---|---|
| committer | Christian <c@ethdev.com> | 2014-11-03 23:30:11 +0800 |
| commit | bfb2ae9f3c6fd4c66fef5acef9c09e2ca49159e4 (patch) | |
| tree | e1a2ed823ff27a531b902dcae9e24ca0cf4e2779 | |
| parent | 8a9da8648d7eeeab5dc7951d76b5c8595badef5e (diff) | |
| download | dexon-solidity-bfb2ae9f3c6fd4c66fef5acef9c09e2ca49159e4.tar.gz dexon-solidity-bfb2ae9f3c6fd4c66fef5acef9c09e2ca49159e4.tar.zst dexon-solidity-bfb2ae9f3c6fd4c66fef5acef9c09e2ca49159e4.zip | |
Test adjustments.
| -rw-r--r-- | solidityCompiler.cpp | 7 | ||||
| -rw-r--r-- | solidityExpressionCompiler.cpp | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/solidityCompiler.cpp b/solidityCompiler.cpp index 84aac666..17de9af5 100644 --- a/solidityCompiler.cpp +++ b/solidityCompiler.cpp @@ -1,4 +1,3 @@ - /* This file is part of cpp-ethereum. @@ -101,7 +100,7 @@ BOOST_AUTO_TEST_CASE(different_argument_numbers) "}\n"; bytes code = compileContract(sourceCode); - unsigned shift = 76; + unsigned shift = 75; unsigned boilerplateSize = 88; bytes expectation({byte(Instruction::JUMPDEST), byte(Instruction::PUSH1), 0x0, // initialize return variable d @@ -154,7 +153,7 @@ BOOST_AUTO_TEST_CASE(ifStatement) "}\n"; bytes code = compileContract(sourceCode); - unsigned shift = 39; + unsigned shift = 38; unsigned boilerplateSize = 51; bytes expectation({byte(Instruction::JUMPDEST), byte(Instruction::PUSH1), 0x0, @@ -196,7 +195,7 @@ BOOST_AUTO_TEST_CASE(loops) "}\n"; bytes code = compileContract(sourceCode); - unsigned shift = 39; + unsigned shift = 38; unsigned boilerplateSize = 51; bytes expectation({byte(Instruction::JUMPDEST), byte(Instruction::JUMPDEST), diff --git a/solidityExpressionCompiler.cpp b/solidityExpressionCompiler.cpp index 043a6949..561cc3bd 100644 --- a/solidityExpressionCompiler.cpp +++ b/solidityExpressionCompiler.cpp @@ -177,7 +177,7 @@ BOOST_AUTO_TEST_CASE(short_circuiting) byte(eth::Instruction::GT), byte(eth::Instruction::ISZERO), // after this we have 10 + 8 >= 4 byte(eth::Instruction::DUP1), - byte(eth::Instruction::PUSH1), 0x15, + byte(eth::Instruction::PUSH1), 0x14, byte(eth::Instruction::JUMPI), // short-circuit if it is true byte(eth::Instruction::POP), byte(eth::Instruction::PUSH1), 0x2, @@ -320,13 +320,13 @@ BOOST_AUTO_TEST_CASE(function_call) {{"test", "f", "a"}, {"test", "f", "b"}}); // Stack: a, b - bytes expectation({byte(eth::Instruction::PUSH1), 0x0b, + bytes expectation({byte(eth::Instruction::PUSH1), 0x0a, byte(eth::Instruction::DUP3), byte(eth::Instruction::PUSH1), 0x01, byte(eth::Instruction::ADD), // Stack here: a b <ret label> (a+1) byte(eth::Instruction::DUP3), - byte(eth::Instruction::PUSH1), 0x15, + byte(eth::Instruction::PUSH1), 0x14, byte(eth::Instruction::JUMP), byte(eth::Instruction::JUMPDEST), // Stack here: a b g(a+1, b) |