From f596c5c64dc1400a108f7a67d9bbbb81bfad70c7 Mon Sep 17 00:00:00 2001
From: Mylloon <kennel.anri@tutanota.com>
Date: Tue, 24 Oct 2023 22:56:19 +0200
Subject: [PATCH] only 1 conflict

---
 flap/src/hopix/hopixParser.mly | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

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