aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchriseth <chris@ethereum.org>2016-10-28 17:44:46 +0800
committerGitHub <noreply@github.com>2016-10-28 17:44:46 +0800
commite85390cc60cb8305b9cda9241d90017dd460dd73 (patch)
tree7637fab2e80594c1af0e074d86e8890517150307
parent2367ce560494206f248976ed78933b359522e356 (diff)
parent274c76fc5ee92118271d59bdfd80bf144d03c103 (diff)
downloaddexon-solidity-e85390cc60cb8305b9cda9241d90017dd460dd73.tar.gz
dexon-solidity-e85390cc60cb8305b9cda9241d90017dd460dd73.tar.zst
dexon-solidity-e85390cc60cb8305b9cda9241d90017dd460dd73.zip
Merge pull request #1302 from ethereum/lll-panic
LLL: introduce panic keyword
-rw-r--r--liblll/CodeFragment.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/liblll/CodeFragment.cpp b/liblll/CodeFragment.cpp
index e76f4974..0f8f2606 100644
--- a/liblll/CodeFragment.cpp
+++ b/liblll/CodeFragment.cpp
@@ -580,6 +580,10 @@ void CodeFragment::constructOperation(sp::utree const& _t, CompilerState& _s)
m_asm.append(i.m_asm);
m_asm.popTo(1);
}
+ else if (us == "PANIC")
+ {
+ m_asm.appendJump(m_asm.errorTag());
+ }
else if (us.find_first_of("1234567890") != 0 && us.find_first_not_of("QWERTYUIOPASDFGHJKLZXCVBNM1234567890_") == string::npos)
m_asm.append((u256)varAddress(s));
else