@felixtensor/tree-sitter-mlir 0.1.3 → 0.1.4

package/grammar.js

@@ -47,7 +47,17 @@ export default grammar({
         $.external_resources,
       ),
     external_resources: ($) =>
-      seq("{-#", repeat($._pretty_dialect_item_contents), "#-}"),
+      seq("{-#", repeat($._external_resource_content), "#-}"),
+    _external_resource_content: ($) =>
+      choice(
+        $.string_literal,
+        // File metadata is YAML-like, not a dialect pretty body. Keep it loose
+        // so resource keys such as dense_resource_test_2xi32 are not split by
+        // dimension-list/type rules.
+        token(prec(-1, /[^#"\/]+/)),
+        "#",
+        "/",
+      ),
 
     // =========================================================================
     // Common syntax (lang-ref)
@@ -278,6 +288,7 @@ export default grammar({
         prec(2, $.func_operation),
         prec(2, $.module_operation),
         prec(2, $._affine_for_operation),
+        $._pdl_interp_record_match_operation,
         $._generic_custom_operation_with_location_attr_dict,
         $._generic_custom_operation,
       ),
@@ -350,6 +361,25 @@ export default grammar({
         ),
       ),
 
+    _pdl_interp_record_match_operation: ($) =>
+      prec.dynamic(
+        -1,
+        prec.right(
+          seq(
+            field(
+              "name",
+              alias(
+                token(prec(20, "pdl_interp.record_match")),
+                $.custom_op_name,
+              ),
+            ),
+            repeat($._custom_body_element),
+            $._custom_body_location_list,
+            repeat($._custom_body_element),
+          ),
+        ),
+      ),
+
     // Tier 2: Generic custom operation — dialect.op_name + structural body
     // Negative dynamic precedence makes the parser prefer ending the body
     // and starting a new operation (with _op_result_list) over extending
@@ -434,10 +464,12 @@ export default grammar({
         $.region, // { ... } (regions with operations)
         $._custom_body_value_group, // {%v : type, ...}
         $._custom_body_ssa_dict, // {"attr" = %value, ...} / options with SSA values
+        $._custom_body_module_symbol_arg, // module(@sym) kernel attr
         $._custom_body_sparse_operand, // sparse(%idx : type)
         $._custom_body_paren, // ( ... )
         $._custom_body_bracket, // [ ... ]
         $._custom_body_angle_group, // < ... >
+        $.variadic, // custom assembly ellipsis marker
         $._literal, // 42, 3.14, "string", true, dense<...>
         "array", // property names may collide with array<...>
         "vector", // OpenACC keyword may collide with vector<...>
@@ -513,8 +545,12 @@ export default grammar({
     _custom_body_ssa_value_array: ($) =>
       seq("[", $.value_use, repeat(seq(",", $.value_use)), "]"),
     _custom_body_successor_marker: ($) => seq(">", $.successor),
+    _custom_body_module_symbol_arg: ($) =>
+      seq(token(prec(20, "module(")), $.symbol_ref_id, ")"),
     _custom_body_sparse_operand: ($) =>
       seq($._sparse_keyword, $._custom_body_paren),
+    _custom_body_location_list: ($) =>
+      seq(token("loc"), "(", "[", optional($._value_use_list), "]", ")"),
     _custom_body_angle_group: ($) =>
       seq("<", repeat($._nested_custom_body_element), ">"),
     // "Mapped-from" arrow used by OpenMP loop-transform ops, e.g.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@felixtensor/tree-sitter-mlir",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "MLIR grammar for tree-sitter",
   "type": "module",
   "repository": {
@@ -55,9 +55,10 @@
     "compile": "tree-sitter generate",
     "update-tests": "tree-sitter test --update",
     "test": "tree-sitter test",
+    "test:bench": "node --test test/*.test.mjs",
     "test:bindings": "node --test bindings/node/*_test.js",
-    "test:examples": "tree-sitter parse --quiet --stat examples/**/*.mlir",
-    "test:all": "npm run test && npm run test:examples",
+    "test:examples": "tree-sitter parse --quiet --stat \"examples/**/*.mlir\"",
+    "test:all": "npm run test && npm run test:bench && npm run test:examples",
     "bench": "node bench.mjs",
     "prebuildify": "prebuildify --napi --strip"
   },

package/src/grammar.json

@@ -41,7 +41,7 @@
           "type": "REPEAT",
           "content": {
             "type": "SYMBOL",
-            "name": "_pretty_dialect_item_contents"
+            "name": "_external_resource_content"
           }
         },
         {
@@ -50,6 +50,34 @@
         }
       ]
     },
+    "_external_resource_content": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "string_literal"
+        },
+        {
+          "type": "TOKEN",
+          "content": {
+            "type": "PREC",
+            "value": -1,
+            "content": {
+              "type": "PATTERN",
+              "value": "[^#\"\\/]+"
+            }
+          }
+        },
+        {
+          "type": "STRING",
+          "value": "#"
+        },
+        {
+          "type": "STRING",
+          "value": "/"
+        }
+      ]
+    },
     "_digit": {
       "type": "PATTERN",
       "value": "[0-9]"
@@ -1551,6 +1579,10 @@
             "name": "_affine_for_operation"
           }
         },
+        {
+          "type": "SYMBOL",
+          "name": "_pdl_interp_record_match_operation"
+        },
         {
           "type": "SYMBOL",
           "name": "_generic_custom_operation_with_location_attr_dict"
@@ -1882,6 +1914,57 @@
         ]
       }
     },
+    "_pdl_interp_record_match_operation": {
+      "type": "PREC_DYNAMIC",
+      "value": -1,
+      "content": {
+        "type": "PREC_RIGHT",
+        "value": 0,
+        "content": {
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "FIELD",
+              "name": "name",
+              "content": {
+                "type": "ALIAS",
+                "content": {
+                  "type": "TOKEN",
+                  "content": {
+                    "type": "PREC",
+                    "value": 20,
+                    "content": {
+                      "type": "STRING",
+                      "value": "pdl_interp.record_match"
+                    }
+                  }
+                },
+                "named": true,
+                "value": "custom_op_name"
+              }
+            },
+            {
+              "type": "REPEAT",
+              "content": {
+                "type": "SYMBOL",
+                "name": "_custom_body_element"
+              }
+            },
+            {
+              "type": "SYMBOL",
+              "name": "_custom_body_location_list"
+            },
+            {
+              "type": "REPEAT",
+              "content": {
+                "type": "SYMBOL",
+                "name": "_custom_body_element"
+              }
+            }
+          ]
+        }
+      }
+    },
     "_generic_custom_operation": {
       "type": "PREC_DYNAMIC",
       "value": -1,
@@ -2102,6 +2185,10 @@
           "type": "SYMBOL",
           "name": "_custom_body_ssa_dict"
         },
+        {
+          "type": "SYMBOL",
+          "name": "_custom_body_module_symbol_arg"
+        },
         {
           "type": "SYMBOL",
           "name": "_custom_body_sparse_operand"
@@ -2118,6 +2205,10 @@
           "type": "SYMBOL",
           "name": "_custom_body_angle_group"
         },
+        {
+          "type": "SYMBOL",
+          "name": "variadic"
+        },
         {
           "type": "SYMBOL",
           "name": "_literal"
@@ -2549,6 +2640,30 @@
         }
       ]
     },
+    "_custom_body_module_symbol_arg": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "TOKEN",
+          "content": {
+            "type": "PREC",
+            "value": 20,
+            "content": {
+              "type": "STRING",
+              "value": "module("
+            }
+          }
+        },
+        {
+          "type": "SYMBOL",
+          "name": "symbol_ref_id"
+        },
+        {
+          "type": "STRING",
+          "value": ")"
+        }
+      ]
+    },
     "_custom_body_sparse_operand": {
       "type": "SEQ",
       "members": [
@@ -2562,6 +2677,46 @@
         }
       ]
     },
+    "_custom_body_location_list": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "TOKEN",
+          "content": {
+            "type": "STRING",
+            "value": "loc"
+          }
+        },
+        {
+          "type": "STRING",
+          "value": "("
+        },
+        {
+          "type": "STRING",
+          "value": "["
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "_value_use_list"
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "STRING",
+          "value": "]"
+        },
+        {
+          "type": "STRING",
+          "value": ")"
+        }
+      ]
+    },
     "_custom_body_angle_group": {
       "type": "SEQ",
       "members": [

package/src/node-types.json

@@ -669,6 +669,10 @@
         {
           "type": "value_use",
           "named": true
+        },
+        {
+          "type": "variadic",
+          "named": true
         }
       ]
     }
@@ -855,65 +859,9 @@
       "multiple": true,
       "required": false,
       "types": [
-        {
-          "type": "array_literal",
-          "named": true
-        },
-        {
-          "type": "attribute",
-          "named": true
-        },
-        {
-          "type": "attribute_alias",
-          "named": true
-        },
-        {
-          "type": "bare_id",
-          "named": true
-        },
-        {
-          "type": "bool_literal",
-          "named": true
-        },
-        {
-          "type": "dialect_attribute",
-          "named": true
-        },
-        {
-          "type": "dialect_dim_list",
-          "named": true
-        },
-        {
-          "type": "float_literal",
-          "named": true
-        },
-        {
-          "type": "integer_literal",
-          "named": true
-        },
-        {
-          "type": "pretty_dialect_item_body",
-          "named": true
-        },
         {
           "type": "string_literal",
           "named": true
-        },
-        {
-          "type": "tensor_literal",
-          "named": true
-        },
-        {
-          "type": "type",
-          "named": true
-        },
-        {
-          "type": "uninitialized_literal",
-          "named": true
-        },
-        {
-          "type": "unit_literal",
-          "named": true
         }
       ]
     }
@@ -2238,6 +2186,10 @@
     "type": "module",
     "named": false
   },
+  {
+    "type": "module(",
+    "named": false
+  },
   {
     "type": "n_out_of_m",
     "named": false