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

Simplified more expressions

Browse Source
This commit is contained in:
Georges Dupéron 2019-03-11 02:30:26 +01:00
parent 56ede7c8a7
commit 2621d84c1c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
AST2.ml
View File

@ -60,7 +60,7 @@ module O = struct
and operator = and operator =
Or | And | Lt | Leq | Gt | Geq | Equal | Neq | Cat | Cons | Add | Sub | Mult | Div | Mod Or | And | Lt | Leq | Gt | Geq | Equal | Neq | Cat | Cons | Add | Sub | Mult | Div | Mod
| Neg | Not | Neg | Not
| Tuple | Set | Tuple | Set | List
| Function of string | Function of string
and constant = and constant =
@ -210,7 +210,7 @@ and s_expr : I.expr -> O.expr =
| True c_True -> let () = ignore (c_True) in Constant (True) | True c_True -> let () = ignore (c_True) in Constant (True)
| Unit c_Unit -> let () = ignore (c_Unit) in Constant (Unit) | Unit c_Unit -> let () = ignore (c_Unit) in Constant (Unit)
| Tuple {value=(l,tuple,r); region} -> let () = ignore (l,r,region) in App { operator = Tuple; arguments = map s_expr (s_nsepseq tuple)} | Tuple {value=(l,tuple,r); region} -> let () = ignore (l,r,region) in App { operator = Tuple; arguments = map s_expr (s_nsepseq tuple)}
| List {value=(lbrkt,lst,rbrkt); region} -> let () = ignore (lbrkt,rbrkt,region) in let _todo = lst in raise (TODO "simplify (expr,comma) list") | List list -> s_list list
| EmptyList empty_list -> s_empty_list empty_list | EmptyList empty_list -> s_empty_list empty_list
| Set set -> s_set set | Set set -> s_set set
| EmptySet empty_set -> s_empty_set empty_set | EmptySet empty_set -> s_empty_set empty_set
@ -221,6 +221,10 @@ and s_expr : I.expr -> O.expr =
| MapLookUp {value=map_lookup; region} -> let _todo = map_lookup in let () = ignore (region) in raise (TODO "simplify MapLookUp") | MapLookUp {value=map_lookup; region} -> let _todo = map_lookup in let () = ignore (region) in raise (TODO "simplify MapLookUp")
| ParExpr {value=(lpar,expr,rpar); region} -> let () = ignore (lpar,rpar,region) in s_expr expr | ParExpr {value=(lpar,expr,rpar); region} -> let () = ignore (lpar,rpar,region) in s_expr expr
and s_list I.{value=(l, list, r); region} : O.expr =
let () = ignore (l, r, region) in
App { operator = List; arguments = map s_expr (s_nsepseq list) }
and s_set I.{value=(l, set, r); region} : O.expr = and s_set I.{value=(l, set, r); region} : O.expr =
let () = ignore (l, r, region) in let () = ignore (l, r, region) in
App { operator = Set; arguments = map s_expr (s_nsepseq set) } App { operator = Set; arguments = map s_expr (s_nsepseq set) }