aboutsummaryrefslogtreecommitdiffstats
path: root/solidityExpressionCompiler.cpp
diff options
context:
space:
mode:
authorChristian <c@ethdev.com>2014-11-01 00:47:43 +0800
committerChristian <c@ethdev.com>2014-11-03 23:11:40 +0800
commitdab09c595a46a1ab72e9b56578cd203095a61e92 (patch)
tree8f947bf7f5fa97e1cd7f0784533d5ed70728ee87 /solidityExpressionCompiler.cpp
parent6951657c5926b4b84578119cdd334252a65d53b8 (diff)
downloaddexon-solidity-dab09c595a46a1ab72e9b56578cd203095a61e92.tar.gz
dexon-solidity-dab09c595a46a1ab72e9b56578cd203095a61e92.tar.zst
dexon-solidity-dab09c595a46a1ab72e9b56578cd203095a61e92.zip
Some tests and bugfixes for the compiler.
Diffstat (limited to 'solidityExpressionCompiler.cpp')
-rw-r--r--solidityExpressionCompiler.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/solidityExpressionCompiler.cpp b/solidityExpressionCompiler.cpp
index 83a7b2bb..043a6949 100644
--- a/solidityExpressionCompiler.cpp
+++ b/solidityExpressionCompiler.cpp
@@ -177,8 +177,9 @@ 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), 0x14,
+ byte(eth::Instruction::PUSH1), 0x15,
byte(eth::Instruction::JUMPI), // short-circuit if it is true
+ byte(eth::Instruction::POP),
byte(eth::Instruction::PUSH1), 0x2,
byte(eth::Instruction::PUSH1), 0x9,
byte(eth::Instruction::EQ),