conflicts

flap/src/hopix/hopixParser.mly

@@ -23,18 +23,18 @@
 %left let1
 
 
-%left FUN
+/* %left FUN */
 %left STRING
-%left INT CID CHAR WHILE
+%left INT CID CHAR /* WHILE */
 %left ID
-%right REF DO
-%left LET MATCH IF FOR
+/* %right REF DO */
+/* %left LET MATCH IF FOR */
 %right ARROW
 %right SEMICOLON
 %left DOT
 %left ASSIGN
 %left LBRACE
-%left BACKSLASH
+/* %left BACKSLASH */
 
 %left EXCLA COLON
 
@@ -47,6 +47,7 @@
 
 %left local_def1
 %left ref1
+/* %left ref1 */
 %left fun1
 %left app1
 
@@ -327,7 +328,7 @@ simple_expression:
   }
 /* Lecture de variable
  * !expr */
-| EXCLA e=located(simple_expression){
+| EXCLA e=located(simple_expression) {
     Read(e)
   }
 
@@ -451,7 +452,7 @@ expression:
     For(var, e1, e2, e3)
   }
 
-/* allocation 
+/* Allocation 
 * ref expr */
 | REF e=located(mid_expression) {
     Ref(e)