Implemented unwrap-panic.

Author: artob

lib/Clar2EVM/compile.ml

@@ -323,10 +323,17 @@ and compile_expression env = function
     end
 
   | UnwrapPanic input ->
-    let input = compile_expression env input in
-    input @ compile_branch [EVM.DUP 1; EVM.ISZERO]
-      (EVM.pop @ EVM.revert0)
-      [EVM.SLOAD]
+    begin match type_of_expression input with
+    | Optional _ ->
+      let cond_value = compile_expression env input in
+      let none_block = EVM.revert0 in
+      compile_branch cond_value [] none_block
+    | Response _ ->
+      let cond_value = compile_expression env input in
+      let err_block = EVM.pop1 @ EVM.revert0 in
+      compile_branch cond_value [] err_block
+    | t -> unsupported_function "unwrap-panic" t
+    end
 
   | VarGet var ->
     let var_slot = lookup_variable_slot env var in

test/functions.t

@@ -517,9 +517,30 @@ unwrap-panic:
   $ clarc -t opcode -f only-function=test <<EOF
   > (define-read-only (test) (unwrap-panic none))
   > EOF
-  PUSH1 0x00 DUP1 ISZERO ISZERO PC PUSH1 0x0f ADD JUMPI POP PUSH1 0x00 DUP1
-  REVERT PC PUSH1 0x07 ADD JUMP JUMPDEST SLOAD JUMPDEST PUSH1 0x00 MSTORE
-  PUSH1 0x20 PUSH1 0x00 RETURN STOP
+  PUSH1 0x00 ISZERO PC PUSH1 0x0a ADD JUMPI PC PUSH1 0x0a ADD JUMP JUMPDEST
+  PUSH1 0x00 DUP1 REVERT JUMPDEST PUSH1 0x00 MSTORE PUSH1 0x20 PUSH1 0x00
+  RETURN STOP
+
+  $ clarc -t opcode -f only-function=test <<EOF
+  > (define-read-only (test) (unwrap-panic (some 7)))
+  > EOF
+  PUSH1 0x07 PUSH1 0x01 ISZERO PC PUSH1 0x0a ADD JUMPI PC PUSH1 0x0a ADD JUMP
+  JUMPDEST PUSH1 0x00 DUP1 REVERT JUMPDEST PUSH1 0x00 MSTORE PUSH1 0x20
+  PUSH1 0x00 RETURN STOP
+
+  $ clarc -t opcode -f only-function=test <<EOF
+  > (define-read-only (test) (unwrap-panic (err 7)))
+  > EOF
+  PUSH1 0x07 PUSH1 0x00 ISZERO PC PUSH1 0x0a ADD JUMPI PC PUSH1 0x0b ADD JUMP
+  JUMPDEST POP PUSH1 0x00 DUP1 REVERT JUMPDEST PUSH1 0x00 MSTORE PUSH1 0x20
+  PUSH1 0x00 RETURN STOP
+
+  $ clarc -t opcode -f only-function=test <<EOF
+  > (define-read-only (test) (unwrap-panic (ok 7)))
+  > EOF
+  PUSH1 0x07 PUSH1 0x01 ISZERO PC PUSH1 0x0a ADD JUMPI PC PUSH1 0x0b ADD JUMP
+  JUMPDEST POP PUSH1 0x00 DUP1 REVERT JUMPDEST PUSH1 0x00 MSTORE PUSH1 0x20
+  PUSH1 0x00 RETURN STOP
 
 unwrap!: