From 892d0bf8dceef00d1044dbe99b39919b2c3fcad1 Mon Sep 17 00:00:00 2001
From: Nicolas PENELOUX <nicolas.peneloux@free.fr>
Date: Mon, 23 Oct 2023 11:57:01 +0200
Subject: [PATCH] 390 conflicts -> 160

---
 flap/src/hopix/hopixParser.mly | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/flap/src/hopix/hopixParser.mly b/flap/src/hopix/hopixParser.mly
index c072d96..12bc3ed 100644
--- a/flap/src/hopix/hopixParser.mly
+++ b/flap/src/hopix/hopixParser.mly
@@ -22,18 +22,26 @@
 
 /* TODO: Résoudre tout les shift/reduce conflits */
 
+%right WHILE REF DO 
+
+%left FUN MATCH IF FOR
 %right ARROW 
 %right SEMICOLON 
 %left ASSIGN 
 %left LPAREN
+%left LET
+
+
+
+%left EXCLA COLON 
 
 /* priorités binop */
 
-%left OR 
-%left AND
+%left D_OR
+%left D_AND
 %left EQUAL_OP INF_EQUAL_OP INF_OP SUP_EQUAL_OP SUP_OP
 %left PLUS MINUS
-%left DIV STAR
+%left SLASH STAR
 
 
 %%