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

List elements are now consistently separated by semicolons.

Browse Source
This commit is contained in:
Christian Rinderknecht 2019-03-26 17:25:42 +01:00
parent 4476a2faba
commit f9ffc7b8e7
No known key found for this signature in database
GPG Key ID: 9446816CFD267040
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AST.ml
View File

@ -673,7 +673,7 @@ and pattern =
| PTuple of (pattern, comma) nsepseq par reg | PTuple of (pattern, comma) nsepseq par reg
and list_pattern = and list_pattern =
Sugar of (pattern, comma) sepseq brackets reg Sugar of (pattern, semi) sepseq brackets reg
| Raw of (pattern * cons * pattern) par reg | Raw of (pattern * cons * pattern) par reg
(* Projecting regions *) (* Projecting regions *)

2
AST.mli
View File

@ -657,7 +657,7 @@ and pattern =
| PTuple of (pattern, comma) nsepseq par reg | PTuple of (pattern, comma) nsepseq par reg
and list_pattern = and list_pattern =
Sugar of (pattern, comma) sepseq brackets reg Sugar of (pattern, semi) sepseq brackets reg
| Raw of (pattern * cons * pattern) par reg | Raw of (pattern * cons * pattern) par reg
(* Projecting regions *) (* Projecting regions *)

13
Parser.mly
View File

@ -528,6 +528,8 @@ map_patch:
in {region; value} in {region; value}
} }
(* Note: [list_injection] and [set_injection] could be merged. *)
set_injection: set_injection:
Set series(expr,End) { Set series(expr,End) {
let first, (others, terminator, closing) = $2 in let first, (others, terminator, closing) = $2 in
@ -930,8 +932,7 @@ core_expr:
| C_True { ELogic (BoolExpr (True $1)) } | C_True { ELogic (BoolExpr (True $1)) }
| C_Unit { EUnit $1 } | C_Unit { EUnit $1 }
| tuple_expr { ETuple $1 } | tuple_expr { ETuple $1 }
| list_expr { EList (List $1) } | list_expr { EList $1 }
| nil { EList (Nil $1) }
| none_expr { EConstr (NoneExpr $1) } | none_expr { EConstr (NoneExpr $1) }
| fun_call { ECall $1 } | fun_call { ECall $1 }
| map_expr { EMap $1 } | map_expr { EMap $1 }
@ -1015,6 +1016,12 @@ arguments:
tuple_inj { $1 } tuple_inj { $1 }
list_expr: list_expr:
list_injection { List $1 }
| nil { Nil $1 }
(* Note: [list_injection] and [set_injection] could be merged. *)
list_injection:
List series(expr,End) { List series(expr,End) {
let first, (others, terminator, closing) = $2 in let first, (others, terminator, closing) = $2 in
let region = cover $1 closing let region = cover $1 closing
@ -1095,7 +1102,7 @@ core_pattern:
in PSome {region; value = $1,$2}} in PSome {region; value = $1,$2}}
list_patt: list_patt:
brackets(sepseq(core_pattern,COMMA)) { Sugar $1 } brackets(sepseq(core_pattern,SEMI)) { Sugar $1 }
| par(cons_pattern) { Raw $1 } | par(cons_pattern) { Raw $1 }
cons_pattern: cons_pattern: