jeltz/heptagon
1
0
Fork 0
Code Issues Pull requests Releases Activity

More permissive syntax (trailing commas/semicols)

Browse source 
Allowing trailing commas and in parameters declarations
This commit is contained in:
Gwenal Delaval 2013-08-02 14:09:18 +02:00
parent bb2c3c4060
commit 6e791e3199
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
compiler/heptagon/parsing/hept_parser.mly
View file

@ -142,7 +142,7 @@ optsnlist(S,x) :
/* Separated list with delimiter, even for empty list*/ /* Separated list with delimiter, even for empty list*/
adelim_slist(S, L, R, x) : adelim_slist(S, L, R, x) :
| L R {[]} | L R {[]}
| L l=snlist(S, x) R {l} | L l=optsnlist(S, x) R {l}
%inline tuple(x) : LPAREN h=x COMMA t=snlist(COMMA,x) RPAREN { h::t } %inline tuple(x) : LPAREN h=x COMMA t=snlist(COMMA,x) RPAREN { h::t }
%inline soption(P,x): %inline soption(P,x):
@ -230,7 +230,8 @@ params:
; ;
nonmt_params: nonmt_params:
| param { $1 } | param { $1 }
| param SEMICOL { $1 }
| param SEMICOL nonmt_params { $1 @ $3 } | param SEMICOL nonmt_params { $1 @ $3 }
; ;
@ -247,6 +248,7 @@ out_params:
nonmt_out_params: nonmt_out_params:
| var_last { $1 } | var_last { $1 }
| var_last SEMICOL { $1 }
| var_last SEMICOL nonmt_out_params { $1 @ $3 } | var_last SEMICOL nonmt_out_params { $1 @ $3 }
; ;
@ -475,10 +477,15 @@ pat:
; ;
nonmtexps: nonmtexps:
| exp {[$1]} | exp opt_comma {[$1]}
| exp COMMA nonmtexps {$1 :: $3} | exp COMMA nonmtexps {$1 :: $3}
; ;
opt_comma:
| {}
| COMMA {}
;
exps: exps:
| /* empty */ {[]} | /* empty */ {[]}
| nonmtexps {$1} | nonmtexps {$1}