Merge branch 'feature/pascaligo-set-patch' into 'dev'

[LIGO-127] Add set patch functionality to PascaLIGO

See merge request ligolang/ligo!127
This commit is contained in:
Christian Rinderknecht 2019-10-12 20:35:14 +00:00
commit d7baebdb2f
3 changed files with 45 additions and 24 deletions

View File

@ -130,28 +130,6 @@ module Errors = struct
] in ] in
error ~data title message error ~data title message
let unsupported_set_patches patch =
let title () = "set patches" in
let message () =
Format.asprintf "set patches (a.k.a. functional updates) are \
not supported yet" in
let data = [
("patch_loc",
fun () -> Format.asprintf "%a" Location.pp_lift @@ patch.Region.region)
] in
error ~data title message
(* let unsupported_set_removal remove =
let title () = "set removals" in
let message () =
Format.asprintf "removal of elements in a set is not \
supported yet" in
let data = [
("removal_loc",
fun () -> Format.asprintf "%a" Location.pp_lift @@ remove.Region.region)
] in
error ~data title message *)
let unsupported_deep_set_rm path = let unsupported_deep_set_rm path =
let title () = "set removals" in let title () = "set removals" in
let message () = let message () =
@ -819,8 +797,24 @@ and simpl_single_instruction : Raw.single_instr -> (_ -> expression result) resu
) )
| MapPatch patch -> | MapPatch patch ->
fail @@ unsupported_map_patches patch fail @@ unsupported_map_patches patch
| SetPatch patch -> | SetPatch patch -> (
fail @@ unsupported_set_patches patch let (setp, loc) = r_split patch in
let (name , access_path) = simpl_path setp.path in
let%bind inj =
bind_list @@
List.map simpl_expression @@
pseq_to_list setp.set_inj.value.elements in
let expr =
match inj with
| [] -> e_skip ~loc ()
| _ :: _ ->
let assigns = List.fold_left
(fun s hd -> e_constant "SET_ADD" [hd ; s])
(e_accessor ~loc (e_variable name) access_path) inj in
e_assign ~loc name access_path assigns in
return_statement @@ expr
)
| MapRemove r -> ( | MapRemove r -> (
let (v , loc) = r_split r in let (v , loc) = r_split r in
let key = v.key in let key = v.key in

View File

@ -17,6 +17,17 @@ function remove_op (const s : set(string)) : set(string) is
function remove_syntax (var s : set(string)) : set(string) is function remove_syntax (var s : set(string)) : set(string) is
begin remove "foobar" from set s; end with s begin remove "foobar" from set s; end with s
function patch_op (var s: set(string)) : set(string) is
begin patch s with set ["foobar"]; end with s
function patch_op_deep (var s: set(string)*nat) : set(string)*nat is
begin patch s.0 with set ["foobar"]; end with s
function patch_op_empty (var s: set(string)) : set(string) is
begin patch s with set []; end with s
function mem_op (const s : set(string)) : bool is function mem_op (const s : set(string)) : bool is
begin skip end with set_mem("foobar" , s) begin skip end with set_mem("foobar" , s)

View File

@ -245,6 +245,22 @@ 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 "patch_op"
(e_set [e_string "foo" ; e_string "bar"])
(e_set [e_string "foo" ; e_string "bar"; e_string "foobar"]) in
let%bind () =
expect_eq program "patch_op_deep"
(e_pair
(e_set [e_string "foo" ; e_string "bar"])
(e_nat 42))
(e_pair
(e_set [e_string "foo" ; e_string "bar" ; e_string "foobar"])
(e_nat 42)) in
let%bind () =
expect_eq program "patch_op_empty"
(e_set [e_string "foo" ; e_string "bar"])
(e_set [e_string "foo" ; e_string "bar"]) in
let%bind () = let%bind () =
expect_eq program "mem_op" expect_eq program "mem_op"
(e_set [e_string "foo" ; e_string "bar" ; e_string "foobar"]) (e_set [e_string "foo" ; e_string "bar" ; e_string "foobar"])