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

conflicts

Browse source
This commit is contained in:
Nicolas PENELOUX 2023-10-24 22:52:54 +02:00
commit 74ab37ec6b
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -23,18 +23,18 @@
%left let1 %left let1
%left FUN /* %left FUN */
%left STRING %left STRING
%left INT CID CHAR WHILE %left INT CID CHAR /* WHILE */
%left ID %left ID
%right REF DO /* %right REF DO */
%left LET MATCH IF FOR /* %left LET MATCH IF FOR */
%right ARROW %right ARROW
%right SEMICOLON %right SEMICOLON
%left DOT %left DOT
%left ASSIGN %left ASSIGN
%left LBRACE %left LBRACE
%left BACKSLASH /* %left BACKSLASH */
%left EXCLA COLON %left EXCLA COLON
@ -47,6 +47,7 @@
%left local_def1 %left local_def1
%left ref1 %left ref1
/* %left ref1 */
%left fun1 %left fun1
%left app1 %left app1
@ -451,7 +452,7 @@ 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)