tree-sitter-rake 0.4.0-beta → 0.5.0-beta

package/grammar.js

@@ -95,7 +95,7 @@ export default grammar({
       repeat(seq($.let_statement, $._newline)),
       repeat1($.tine_declaration),
       repeat1($.through_statement),
-      $.return_sweep_statement,
+      $.sweep_statement,
       $._dedent,
     ),
 
@@ -411,8 +411,7 @@ export default grammar({
       $.boolean_literal,
     ),
 
-    return_sweep_statement: $ => seq(
-      'return',
+    sweep_statement: $ => seq(
       'sweep',
       ':',
       $._newline,
@@ -430,12 +429,31 @@ export default grammar({
     ),
 
     expression: $ => choice(
+      $.slow_block,
       $.conditional_expression,
       $.binary_expression,
       $.unary_expression,
       $._postfix_expression,
     ),
 
+    slow_block: $ => seq(
+      'slow', '{',
+      choice(
+        optional($._slow_contents),
+        $._newline,
+        seq($._newline, $._indent, optional($._slow_contents), $._dedent),
+      ),
+      '}',
+    ),
+
+    _slow_contents: $ => choice(seq(
+      repeat1(choice(
+        seq($._simple_statement, choice($._newline, seq(';', repeat($._newline)))),
+        $._compound_statement,
+      )),
+      optional($._simple_statement),
+    ), $._simple_statement),
+
     _postfix_expression: $ => choice(
       $.field_expression,
       $.index_expression,

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "tree-sitter-rake",
-  "version": "0.4.0-beta",
+  "version": "0.5.0-beta",
   "description": "Tree-sitter grammar for Rake, a vector-first SIMD language",
-  "main": "bindings/node",
-  "types": "bindings/node",
+  "main": "bindings/node/index.js",
+  "types": "bindings/node/index.d.ts",
   "type": "module",
   "files": [
     "binding.gyp",
@@ -14,7 +14,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/rakelang/tree-sitter-rake.git"
+    "url": "git+https://github.com/rakelang/tree-sitter-rake.git"
   },
   "keywords": [
     "tree-sitter",

package/src/grammar.json

@@ -422,7 +422,7 @@
         },
         {
           "type": "SYMBOL",
-          "name": "return_sweep_statement"
+          "name": "sweep_statement"
         },
         {
           "type": "SYMBOL",
@@ -2350,13 +2350,9 @@
         }
       ]
     },
-    "return_sweep_statement": {
+    "sweep_statement": {
       "type": "SEQ",
       "members": [
-        {
-          "type": "STRING",
-          "value": "return"
-        },
         {
           "type": "STRING",
           "value": "sweep"
@@ -2431,6 +2427,10 @@
     "expression": {
       "type": "CHOICE",
       "members": [
+        {
+          "type": "SYMBOL",
+          "name": "slow_block"
+        },
         {
           "type": "SYMBOL",
           "name": "conditional_expression"
@@ -2449,6 +2449,145 @@
         }
       ]
     },
+    "slow_block": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "slow"
+        },
+        {
+          "type": "STRING",
+          "value": "{"
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "SYMBOL",
+                  "name": "_slow_contents"
+                },
+                {
+                  "type": "BLANK"
+                }
+              ]
+            },
+            {
+              "type": "SYMBOL",
+              "name": "_newline"
+            },
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "SYMBOL",
+                  "name": "_newline"
+                },
+                {
+                  "type": "SYMBOL",
+                  "name": "_indent"
+                },
+                {
+                  "type": "CHOICE",
+                  "members": [
+                    {
+                      "type": "SYMBOL",
+                      "name": "_slow_contents"
+                    },
+                    {
+                      "type": "BLANK"
+                    }
+                  ]
+                },
+                {
+                  "type": "SYMBOL",
+                  "name": "_dedent"
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "type": "STRING",
+          "value": "}"
+        }
+      ]
+    },
+    "_slow_contents": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "REPEAT1",
+              "content": {
+                "type": "CHOICE",
+                "members": [
+                  {
+                    "type": "SEQ",
+                    "members": [
+                      {
+                        "type": "SYMBOL",
+                        "name": "_simple_statement"
+                      },
+                      {
+                        "type": "CHOICE",
+                        "members": [
+                          {
+                            "type": "SYMBOL",
+                            "name": "_newline"
+                          },
+                          {
+                            "type": "SEQ",
+                            "members": [
+                              {
+                                "type": "STRING",
+                                "value": ";"
+                              },
+                              {
+                                "type": "REPEAT",
+                                "content": {
+                                  "type": "SYMBOL",
+                                  "name": "_newline"
+                                }
+                              }
+                            ]
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "type": "SYMBOL",
+                    "name": "_compound_statement"
+                  }
+                ]
+              }
+            },
+            {
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "SYMBOL",
+                  "name": "_simple_statement"
+                },
+                {
+                  "type": "BLANK"
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "type": "SYMBOL",
+          "name": "_simple_statement"
+        }
+      ]
+    },
     "_postfix_expression": {
       "type": "CHOICE",
       "members": [

package/src/node-types.json

@@ -546,6 +546,10 @@
           "type": "shuffle_expression",
           "named": true
         },
+        {
+          "type": "slow_block",
+          "named": true
+        },
         {
           "type": "static_move_expression",
           "named": true
@@ -1373,7 +1377,7 @@
           "named": true
         },
         {
-          "type": "return_sweep_statement",
+          "type": "sweep_statement",
           "named": true
         },
         {
@@ -1601,21 +1605,6 @@
       }
     }
   },
-  {
-    "type": "return_sweep_statement",
-    "named": true,
-    "fields": {},
-    "children": {
-      "multiple": true,
-      "required": true,
-      "types": [
-        {
-          "type": "sweep_arm",
-          "named": true
-        }
-      ]
-    }
-  },
   {
     "type": "run_definition",
     "named": true,
@@ -1855,6 +1844,77 @@
       }
     }
   },
+  {
+    "type": "slow_block",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": true,
+      "required": false,
+      "types": [
+        {
+          "type": "assignment_statement",
+          "named": true
+        },
+        {
+          "type": "break_statement",
+          "named": true
+        },
+        {
+          "type": "continue_statement",
+          "named": true
+        },
+        {
+          "type": "expression_statement",
+          "named": true
+        },
+        {
+          "type": "for_statement",
+          "named": true
+        },
+        {
+          "type": "fused_binding",
+          "named": true
+        },
+        {
+          "type": "if_statement",
+          "named": true
+        },
+        {
+          "type": "let_statement",
+          "named": true
+        },
+        {
+          "type": "mutable_binding",
+          "named": true
+        },
+        {
+          "type": "repeat_statement",
+          "named": true
+        },
+        {
+          "type": "return_statement",
+          "named": true
+        },
+        {
+          "type": "traversal_statement",
+          "named": true
+        },
+        {
+          "type": "uniform_binding",
+          "named": true
+        },
+        {
+          "type": "while_statement",
+          "named": true
+        },
+        {
+          "type": "yield_statement",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "slow_definition",
     "named": true,
@@ -2168,6 +2228,21 @@
       }
     }
   },
+  {
+    "type": "sweep_statement",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": true,
+      "required": true,
+      "types": [
+        {
+          "type": "sweep_arm",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "through_statement",
     "named": true,