balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make failing deep set removal test pass

Browse Source
This commit is contained in:
John David Pressman 2019-10-14 16:04:48 -07:00 committed by Tom Jack
parent 0b8c0dad3f
commit 6f5e88c93c
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/passes/2-simplify/pascaligo.ml
View File

@ -119,16 +119,6 @@ module Errors = struct
] in ] in
error ~data title message error ~data title message
let unsupported_deep_set_rm path =
let title () = "set removals" in
let message () =
Format.asprintf "removal of members from embedded sets is not supported yet" in
let data = [
("path_loc",
fun () -> Format.asprintf "%a" Location.pp_lift @@ path.Region.region)
] in
error ~data title message
let unsupported_non_var_pattern p = let unsupported_non_var_pattern p =
let title () = "pattern is not a variable" in let title () = "pattern is not a variable" in
let message () = let message () =
@ -831,7 +821,7 @@ and simpl_single_instruction : Raw.single_instr -> (_ -> expression result) resu
| Name v -> ok (v.value , e_variable v.value , []) | Name v -> ok (v.value , e_variable v.value , [])
| Path p -> | Path p ->
let (name,p') = simpl_path v.map in let (name,p') = simpl_path v.map in
let%bind accessor = simpl_projection p in let%bind accessor = simpl_projection p in
ok @@ (name , accessor , p') ok @@ (name , accessor , p')
in in
let%bind key' = simpl_expression key in let%bind key' = simpl_expression key in
@ -840,12 +830,16 @@ and simpl_single_instruction : Raw.single_instr -> (_ -> expression result) resu
) )
| SetRemove r -> ( | SetRemove r -> (
let (set_rm, loc) = r_split r in let (set_rm, loc) = r_split r in
let%bind set = match set_rm.set with let%bind (varname, set, path) = match set_rm.set with
| Name v -> ok v.value | Name v -> ok (v.value, e_variable v.value, [])
| Path path -> fail @@ unsupported_deep_set_rm path in | Path path ->
let(name, p') = simpl_path set_rm.set in
let%bind accessor = simpl_projection path in
ok @@ (name, accessor, p')
in
let%bind removed' = simpl_expression set_rm.element in let%bind removed' = simpl_expression set_rm.element in
let expr = e_constant ~loc "SET_REMOVE" [removed' ; e_variable set] in let expr = e_constant ~loc "SET_REMOVE" [removed' ; set] in
return_statement @@ e_assign ~loc set [] expr return_statement @@ e_assign ~loc varname path expr
) )
and simpl_path : Raw.path -> string * Ast_simplified.access_path = fun p -> and simpl_path : Raw.path -> string * Ast_simplified.access_path = fun p ->

9
src/test/integration_tests.ml
View File

@ -245,6 +245,15 @@ let set_arithmetic () : unit result =
expect_eq program "remove_syntax" expect_eq program "remove_syntax"
(e_set [e_string "foo" ; e_string "bar" ; e_string "foobar"]) (e_set [e_string "foo" ; e_string "bar" ; e_string "foobar"])
(e_set [e_string "foo" ; e_string "bar"]) in (e_set [e_string "foo" ; e_string "bar"]) in
let%bind () =
expect_eq program "remove_deep"
(e_pair
(e_set [e_string "foo" ; e_string "bar" ; e_string "foobar"])
(e_nat 42))
(e_pair
(e_set [e_string "foo" ; e_string "bar"])
(e_nat 42))
in
let%bind () = let%bind () =
expect_eq program "patch_op" expect_eq program "patch_op"
(e_set [e_string "foo" ; e_string "bar"]) (e_set [e_string "foo" ; e_string "bar"])