Merge branch 'feature/pascaligo-set-deep-rm' into 'dev'

[LIGO-139] Add deep set removal to PascaLIGO

See merge request ligolang/ligo!136

src/passes/2-simplify/pascaligo.ml

@@ -118,16 +118,6 @@ module Errors = struct
     ] in
     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 title () = "pattern is not a variable" in
     let message () =
@@ -830,7 +820,7 @@ and simpl_single_instruction : Raw.single_instr -> (_ -> expression result) resu
         | Name v -> ok (v.value , e_variable v.value , [])
         | Path p ->
           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')
       in
       let%bind key' = simpl_expression key in
@@ -839,12 +829,16 @@ and simpl_single_instruction : Raw.single_instr -> (_ -> expression result) resu
     )
   | SetRemove r -> (
       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 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 ->

src/test/contracts/set_arithmetic.ligo

@@ -17,6 +17,9 @@ function remove_op (const 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
 
+function remove_deep (var s : set(string) * nat) : set(string) * nat is
+  begin remove "foobar" from set s.0; end with s
+
 function patch_op (var s: set(string)) : set(string) is
   begin patch s with set ["foobar"]; end with s
 

src/test/integration_tests.ml

@@ -245,6 +245,15 @@ let set_arithmetic () : unit result =
     expect_eq program "remove_syntax"
       (e_set [e_string "foo" ; e_string "bar" ; e_string "foobar"])
       (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 () =
     expect_eq program "patch_op"
       (e_set [e_string "foo" ; e_string "bar"])