fix for-in slice expression

ionide · Jun 1, 2024 · 0605512 · 0605512
1 parent 7d560d6
commit 0605512
Show file tree

Hide file tree

Showing 4 changed files with 94 additions and 14 deletions.
diff --git a/grammar.js b/grammar.js
@@ -28,7 +28,6 @@ const PREC = {
   ELSE_EXPR: 11,
   INTERFACE: 12,
   COMMA: 13,
-  DOTDOT: 14,
   PREFIX_EXPR: 15,
   SPECIAL_INFIX: 16,
   LARROW: 16,
@@ -43,7 +42,8 @@ const PREC = {
   PAREN_APP: 21,
   TYPED_EXPR: 22,
   PAREN_EXPR: 21,
-  DOTDOT_SLICE: 22,
+  DOTDOT: 22,
+  DOTDOT_SLICE: 23,
 };
 
 module.exports = grammar({
@@ -429,7 +429,6 @@ module.exports = grammar({
         $.match_expression,
         $.try_expression,
         $.literal_expression,
-        // $.call_expression,
         $.tuple_expression,
         $.application_expression,
         alias($.preproc_if_in_expression, $.preproc_if),
@@ -676,7 +675,7 @@ module.exports = grammar({
     array_expression: ($) => seq("[|", optional($._list_element), "|]"),
 
     range_expression: ($) =>
-      prec.left(
+      prec(
         PREC.DOTDOT,
         seq(
           $._expression,

diff --git a/src/grammar.json b/src/grammar.json
diff --git a/src/parser.c b/src/parser.c
diff --git a/test/corpus/expr.txt b/test/corpus/expr.txt
@@ -2975,3 +2975,84 @@ let f (x: #MyType) = ()
                   (identifier)))))))
       (const
         (unit)))))
+
+================================================================================
+for in slice expression
+================================================================================
+
+do
+  for x in 0..10 do
+    ()
+
+--------------------------------------------------------------------------------
+
+(file
+  (value_declaration
+    (do
+      (for_expression
+        (identifier_pattern
+          (long_identifier_or_op
+            (identifier)))
+        (range_expression
+          (const
+            (int))
+          (const
+            (int)))
+        (const
+          (unit))))))
+
+================================================================================
+for in slice-skip expression
+================================================================================
+
+do
+  for x in 0..2..10 do
+    ()
+
+--------------------------------------------------------------------------------
+
+(file
+  (value_declaration
+    (do
+      (for_expression
+        (identifier_pattern
+          (long_identifier_or_op
+            (identifier)))
+        (range_expression
+          (const
+            (int))
+          (const
+            (int))
+          (const
+            (int)))
+        (const
+          (unit))))))
+
+================================================================================
+for in slice expression complex
+================================================================================
+
+do
+  for x in n..x + 10 do
+    ()
+
+--------------------------------------------------------------------------------
+
+(file
+  (value_declaration
+    (do
+      (for_expression
+        (identifier_pattern
+          (long_identifier_or_op
+            (identifier)))
+        (range_expression
+          (long_identifier_or_op
+            (identifier))
+          (infix_expression
+            (long_identifier_or_op
+              (identifier))
+            (infix_op)
+            (const
+              (int))))
+        (const
+          (unit))))))