Paris7/compilation
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Activity

only 1 conflict

Browse source
This commit is contained in:
Mylloon 2023-10-24 22:56:19 +02:00
parent 74ab37ec6b
commit f596c5c64d
Signed by: Anri
GPG key ID: A82D63DFF8D1317F
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
flap/src/hopix/hopixParser.mly
View file

@ -304,7 +304,7 @@ simple_expression:
Variable(i, tl) Variable(i, tl)
} }
/* Annotation de type /* Annotation de type
* ( expr : type ) */ * ( expr : type ) */
| LPAREN e=located(expression) COLON t=located(ty) RPAREN { | LPAREN e=located(expression) COLON t=located(ty) RPAREN {
TypeAnnotation(e, t) TypeAnnotation(e, t)
@ -342,16 +342,12 @@ expr_list:
| LPAREN el=separated_nonempty_list(COMMA, located(expression)) RPAREN { | LPAREN el=separated_nonempty_list(COMMA, located(expression)) RPAREN {
el el
} }
mid_expression: mid_expression:
|e=simple_expression{ |e=simple_expression{
e e
} }
/* Parenthésage */
| LPAREN e=expression RPAREN {
e
}
/* Field record */ /* Field record */
| e=located(mid_expression) DOT l=located(label_identifier) tl=option(type_list) { | e=located(mid_expression) DOT l=located(label_identifier) tl=option(type_list) {
@ -452,12 +448,12 @@ expression:
For(var, e1, e2, e3) For(var, e1, e2, e3)
} }
/* Allocation /* Allocation
* ref expr */ * ref expr */
| REF e=located(mid_expression) { | REF e=located(mid_expression) {
Ref(e) Ref(e)
} }
/******************************** BASIC TYPES *********************************/ /******************************** BASIC TYPES *********************************/