@felixtensor/tree-sitter-mlir 0.1.0 → 0.1.1

package/README.md

@@ -3,6 +3,7 @@
 [![CI](https://github.com/felixtensor/tree-sitter-mlir/actions/workflows/ci.yml/badge.svg)](https://github.com/felixtensor/tree-sitter-mlir/actions/workflows/ci.yml)
 [![crates.io](https://img.shields.io/crates/v/tree-sitter-mlir.svg?logo=rust)](https://crates.io/crates/tree-sitter-mlir)
 [![PyPI](https://img.shields.io/pypi/v/tree-sitter-mlir.svg?logo=pypi&logoColor=white)](https://pypi.org/project/tree-sitter-mlir/)
+[![npm](https://img.shields.io/npm/v/@felixtensor/tree-sitter-mlir.svg?logo=npm)](https://www.npmjs.com/package/@felixtensor/tree-sitter-mlir)
 
 [MLIR](https://mlir.llvm.org) grammar for [tree-sitter](https://github.com/tree-sitter/tree-sitter).
 

package/grammar.js

@@ -250,18 +250,22 @@ export default grammar({
       prec(2, $.type),              // !type, i32, memref<...>, etc.
       $.attribute,                  // #attr, {dict}, affine_map<...>
       $.region,                     // { ... } (regions with operations)
+      $._custom_body_value_group,   // {%v : type, ...}
       $._custom_body_paren,         // ( ... )
       $._custom_body_bracket,       // [ ... ]
       $._custom_body_angle_group,   // < ... >
       $._literal,                   // 42, 3.14, "string", true, dense<...>
       'array',                      // property names may collide with array<...>
+      'vector',                     // OpenACC keyword may collide with vector<...>
       'ceildiv', 'floordiv', 'mod', // inline affine keywords
       $.bare_id,                    // keywords: to, from, step, ins, outs, etc.
-      ',', '=', ':', '->', '*', '+', '-', '/', '&', '|', '~',
+      ',', '=', ':', '->', '*', '?', $.dimension_separator, '+', '-', '/', '&', '|', '~',
     ),
 
     _custom_body_paren: $ => seq('(', repeat($._nested_custom_body_element), ')'),
     _custom_body_bracket: $ => seq('[', repeat($._nested_custom_body_element), ']'),
+    _custom_body_value_group: $ => seq('{', $.value_use, ':', $.type,
+      repeat(seq(',', $.value_use, ':', $.type)), '}'),
     _custom_body_angle_group: $ => seq('<', repeat($._nested_custom_body_element), '>'),
     // Only nested groups accept `trailing_location` as a body element.
     // At the top level it is omitted on purpose so the operation rule
@@ -271,11 +275,11 @@ export default grammar({
 
     // =========================================================================
     // Blocks
-    //   block       ::= block-label operation+
+    //   block       ::= block-label operation*
     //   block-label ::= block-id block-arg-list? `:`
     //   caret-id    ::= `^` suffix-id
     // =========================================================================
-    block: $ => seq($.block_label, repeat1($.operation)),
+    block: $ => seq($.block_label, repeat($.operation)),
     block_label: $ => seq($._block_id, optional($.block_arg_list), ':'),
     _block_id: $ => $.caret_id,
     caret_id: $ => seq('^', $._suffix_id),
@@ -336,9 +340,9 @@ export default grammar({
       $.type,
       prec(2, $.attribute),
       $._literal,
-      'dense', 'sparse', 'array',
+      'dense', 'sparse', 'array', 'vector',
       $.bare_id,
-      ',', ':', '=', '->', '(', ')', '[', ']', '{', '}', '*',
+      ',', ':', '=', '->', '(', ')', '[', ']', '{', '}', '*', '?',
       '@', '#',
       token(prec(-1, /[^<>]/))
     )),
@@ -400,7 +404,7 @@ export default grammar({
       optional(seq(',', $.tensor_encoding)), '>'),
     tensor_encoding: $ => $.attribute_value,
 
-    vector_type: $ => seq(token('vector'), '<', repeat($.vector_dim_list), $._prim_type, '>'),
+    vector_type: $ => prec(1, seq(token('vector'), '<', repeat($.vector_dim_list), $._prim_type, '>')),
     vector_dim_list: $ => prec.left(choice(seq($._static_dim_list, 'x',
       optional(seq('[', $._static_dim_list, ']', 'x'))), seq('[', $._static_dim_list, ']', 'x'))),
     _static_dim_list: $ => seq($.dimension_size, repeat(seq('x', $.dimension_size))),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@felixtensor/tree-sitter-mlir",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "MLIR grammar for tree-sitter",
   "type": "module",
   "repository": {

package/src/grammar.json

@@ -2005,6 +2005,10 @@
           "type": "SYMBOL",
           "name": "region"
         },
+        {
+          "type": "SYMBOL",
+          "name": "_custom_body_value_group"
+        },
         {
           "type": "SYMBOL",
           "name": "_custom_body_paren"
@@ -2025,6 +2029,10 @@
           "type": "STRING",
           "value": "array"
         },
+        {
+          "type": "STRING",
+          "value": "vector"
+        },
         {
           "type": "STRING",
           "value": "ceildiv"
@@ -2061,6 +2069,14 @@
           "type": "STRING",
           "value": "*"
         },
+        {
+          "type": "STRING",
+          "value": "?"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "dimension_separator"
+        },
         {
           "type": "STRING",
           "value": "+"
@@ -2127,6 +2143,55 @@
         }
       ]
     },
+    "_custom_body_value_group": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "{"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "value_use"
+        },
+        {
+          "type": "STRING",
+          "value": ":"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "type"
+        },
+        {
+          "type": "REPEAT",
+          "content": {
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "STRING",
+                "value": ","
+              },
+              {
+                "type": "SYMBOL",
+                "name": "value_use"
+              },
+              {
+                "type": "STRING",
+                "value": ":"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "type"
+              }
+            ]
+          }
+        },
+        {
+          "type": "STRING",
+          "value": "}"
+        }
+      ]
+    },
     "_custom_body_angle_group": {
       "type": "SEQ",
       "members": [
@@ -2168,7 +2233,7 @@
           "name": "block_label"
         },
         {
-          "type": "REPEAT1",
+          "type": "REPEAT",
           "content": {
             "type": "SYMBOL",
             "name": "operation"
@@ -2803,6 +2868,10 @@
             "type": "STRING",
             "value": "array"
           },
+          {
+            "type": "STRING",
+            "value": "vector"
+          },
           {
             "type": "SYMBOL",
             "name": "bare_id"
@@ -2851,6 +2920,10 @@
             "type": "STRING",
             "value": "*"
           },
+          {
+            "type": "STRING",
+            "value": "?"
+          },
           {
             "type": "STRING",
             "value": "@"
@@ -3503,35 +3576,39 @@
       "name": "attribute_value"
     },
     "vector_type": {
-      "type": "SEQ",
-      "members": [
-        {
-          "type": "TOKEN",
-          "content": {
+      "type": "PREC",
+      "value": 1,
+      "content": {
+        "type": "SEQ",
+        "members": [
+          {
+            "type": "TOKEN",
+            "content": {
+              "type": "STRING",
+              "value": "vector"
+            }
+          },
+          {
             "type": "STRING",
-            "value": "vector"
-          }
-        },
-        {
-          "type": "STRING",
-          "value": "<"
-        },
-        {
-          "type": "REPEAT",
-          "content": {
+            "value": "<"
+          },
+          {
+            "type": "REPEAT",
+            "content": {
+              "type": "SYMBOL",
+              "name": "vector_dim_list"
+            }
+          },
+          {
             "type": "SYMBOL",
-            "name": "vector_dim_list"
+            "name": "_prim_type"
+          },
+          {
+            "type": "STRING",
+            "value": ">"
           }
-        },
-        {
-          "type": "SYMBOL",
-          "name": "_prim_type"
-        },
-        {
-          "type": "STRING",
-          "value": ">"
-        }
-      ]
+        ]
+      }
     },
     "vector_dim_list": {
       "type": "PREC_LEFT",

package/src/node-types.json

@@ -598,6 +598,10 @@
           "type": "bool_literal",
           "named": true
         },
+        {
+          "type": "dimension_separator",
+          "named": true
+        },
         {
           "type": "float_literal",
           "named": true