@felixtensor/tree-sitter-mlir 0.1.1 → 0.1.2

package/grammar.js

@@ -50,6 +50,8 @@ export default grammar({
     _digit: $ => /[0-9]/,
     integer_literal: $ => choice($._decimal_literal, $._hexadecimal_literal),
     _decimal_literal: $ => token(seq(optional(/[-+]/), repeat1(/[0-9]/))),
+    _unsigned_decimal_literal: $ => token(repeat1(/[0-9]/)),
+    _unsigned_integer_literal: $ => choice($._unsigned_decimal_literal, $._hexadecimal_literal),
     _hexadecimal_literal: $ => token(seq('0x', repeat1(/[0-9a-fA-F]/))),
     float_literal: $ => token(seq(
       optional(/[-+]/), repeat1(/[0-9]/), '.', repeat(/[0-9]/),
@@ -182,6 +184,15 @@ export default grammar({
     func_operation: $ => prec.right(seq(
       field('name', choice(token(prec(20, 'func.func')), token(prec(20, 'llvm.func')))),
       field('visibility', optional(choice('private', 'public'))),
+      // Optional leading specifier keywords between the function name and its
+      // symbol. Covers MLIR symbol visibility (`nested`) and the LLVM dialect's
+      // llvm.func linkage / calling-convention / unnamed_addr / visibility
+      // keywords (internal, external, linkonce, fastcc, amdgpu_kernelcc,
+      // local_unnamed_addr, hidden, ...). MLIR's CConv enum alone has ~50
+      // keywords, so rather than enumerate a brittle list we accept bare_id-
+      // shaped specifiers here; the trailing `@symbol` (symbol_ref_id) is an
+      // unambiguous terminator.
+      repeat(field('specifier', alias($.bare_id, $.function_specifier))),
       field('sym_name', $.symbol_ref_id),
       field('arguments', $.func_arg_list),
       field('return', optional($.func_return)),
@@ -340,7 +351,7 @@ export default grammar({
       $.type,
       prec(2, $.attribute),
       $._literal,
-      'dense', 'sparse', 'array', 'vector',
+      'dense', 'sparse', 'array', 'vector', 'tensor', 'opaque',
       $.bare_id,
       ',', ':', '=', '->', '(', ')', '[', ']', '{', '}', '*', '?',
       '@', '#',
@@ -361,9 +372,13 @@ export default grammar({
       repeat1(seq($.dimension_separator, $._dialect_dim_primitive)))),
     _dialect_dim_primitive: $ => choice(
       prec(1, $.type),
+      prec(1, $._pretty_dialect_body_type),
       alias($.integer_literal, $.dimension_size),
       '?',
       '*'),
+    _pretty_dialect_body_type: $ => seq(
+      choice($.bare_id, 'array'),
+      $.pretty_dialect_item_body),
 
     // Builtin types
     builtin_type: $ => choice(
@@ -424,11 +439,12 @@ export default grammar({
     attribute_entry: $ => choice(
       seq(choice($.bare_id, $.string_literal), optional(seq('=', $.attribute_value))),
       // Array-valued entry (e.g. {["op.name"]} in transform dialect)
-      seq('[', optional($._attribute_value_nobracket),
-        repeat(seq(',', $._attribute_value_nobracket)), ']'),
+      $._attribute_array,
     ),
-    attribute_value: $ => choice(seq('[', optional($._attribute_value_nobracket),
-      repeat(seq(',', $._attribute_value_nobracket)), ']'), $._attribute_value_nobracket),
+    attribute_value: $ => choice($._attribute_array, $._attribute_value_nobracket),
+    _attribute_array: $ => seq('[', optional($._attribute_array_element),
+      repeat(seq(',', $._attribute_array_element)), ']'),
+    _attribute_array_element: $ => choice($._attribute_array, $._attribute_value_nobracket),
     _attribute_value_nobracket: $ => choice($.attribute_alias, $.dialect_attribute,
       $.builtin_attribute, $.dictionary_attribute, $._literal_and_type, $.type,
       $.function_type, $._affine_map_like, $.symbol_ref_id, $.trailing_location,
@@ -449,9 +465,13 @@ export default grammar({
       prec(1, $.affine_map),
       prec(1, $.affine_set),
       $.dense_resource_literal,
+      $.distinct_attribute,
     ),
     dense_resource_literal: $ => seq(token('dense_resource'), '<',
       choice($.bare_id, $.string_literal), '>'),
+    distinct_attribute: $ => seq(token('distinct'), '[',
+      alias($._unsigned_integer_literal, $.integer_literal), ']',
+      '<', optional($.attribute_value), '>'),
     strided_layout: $ => seq(token('strided'), '<', '[', optional($._stride_list_comma), ']',
       optional(seq(',', token('offset'), ':', $._stride_primitive)), '>'),
     _stride_list_comma: $ => seq($._stride_primitive, repeat(seq(',', $._stride_primitive))),
@@ -489,7 +509,7 @@ export default grammar({
     func_arg_list: $ => seq('(', optional(choice($.variadic,
       $._value_id_and_type_attr_list)), ')'),
     _value_id_and_type_attr_list: $ => seq($._value_id_and_type_attr,
-      repeat(seq(',', $._value_id_and_type_attr)), optional(seq(',', $.variadic))),
+      repeat(seq(',', choice($._value_id_and_type_attr, $.variadic)))),
     _value_id_and_type_attr: $ => seq($._function_arg, optional($.attribute),
       optional($.trailing_location)),
     _function_arg: $ => choice(seq($.value_use, ':', choice($.type, $.function_type)), $.value_use, $.type, $.function_type),

package/package.json

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

package/src/grammar.json

@@ -103,6 +103,29 @@
         ]
       }
     },
+    "_unsigned_decimal_literal": {
+      "type": "TOKEN",
+      "content": {
+        "type": "REPEAT1",
+        "content": {
+          "type": "PATTERN",
+          "value": "[0-9]"
+        }
+      }
+    },
+    "_unsigned_integer_literal": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "_unsigned_decimal_literal"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "_hexadecimal_literal"
+        }
+      ]
+    },
     "_hexadecimal_literal": {
       "type": "TOKEN",
       "content": {
@@ -1608,6 +1631,22 @@
               ]
             }
           },
+          {
+            "type": "REPEAT",
+            "content": {
+              "type": "FIELD",
+              "name": "specifier",
+              "content": {
+                "type": "ALIAS",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "bare_id"
+                },
+                "named": true,
+                "value": "function_specifier"
+              }
+            }
+          },
           {
             "type": "FIELD",
             "name": "sym_name",
@@ -2872,6 +2911,14 @@
             "type": "STRING",
             "value": "vector"
           },
+          {
+            "type": "STRING",
+            "value": "tensor"
+          },
+          {
+            "type": "STRING",
+            "value": "opaque"
+          },
           {
             "type": "SYMBOL",
             "name": "bare_id"
@@ -3109,6 +3156,14 @@
             "name": "type"
           }
         },
+        {
+          "type": "PREC",
+          "value": 1,
+          "content": {
+            "type": "SYMBOL",
+            "name": "_pretty_dialect_body_type"
+          }
+        },
         {
           "type": "ALIAS",
           "content": {
@@ -3128,6 +3183,28 @@
         }
       ]
     },
+    "_pretty_dialect_body_type": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "bare_id"
+            },
+            {
+              "type": "STRING",
+              "value": "array"
+            }
+          ]
+        },
+        {
+          "type": "SYMBOL",
+          "name": "pretty_dialect_item_body"
+        }
+      ]
+    },
     "builtin_type": {
       "type": "CHOICE",
       "members": [
@@ -3839,45 +3916,8 @@
           ]
         },
         {
-          "type": "SEQ",
-          "members": [
-            {
-              "type": "STRING",
-              "value": "["
-            },
-            {
-              "type": "CHOICE",
-              "members": [
-                {
-                  "type": "SYMBOL",
-                  "name": "_attribute_value_nobracket"
-                },
-                {
-                  "type": "BLANK"
-                }
-              ]
-            },
-            {
-              "type": "REPEAT",
-              "content": {
-                "type": "SEQ",
-                "members": [
-                  {
-                    "type": "STRING",
-                    "value": ","
-                  },
-                  {
-                    "type": "SYMBOL",
-                    "name": "_attribute_value_nobracket"
-                  }
-                ]
-              }
-            },
-            {
-              "type": "STRING",
-              "value": "]"
-            }
-          ]
+          "type": "SYMBOL",
+          "name": "_attribute_array"
         }
       ]
     },
@@ -3885,46 +3925,63 @@
       "type": "CHOICE",
       "members": [
         {
-          "type": "SEQ",
+          "type": "SYMBOL",
+          "name": "_attribute_array"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "_attribute_value_nobracket"
+        }
+      ]
+    },
+    "_attribute_array": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "["
+        },
+        {
+          "type": "CHOICE",
           "members": [
             {
-              "type": "STRING",
-              "value": "["
-            },
-            {
-              "type": "CHOICE",
-              "members": [
-                {
-                  "type": "SYMBOL",
-                  "name": "_attribute_value_nobracket"
-                },
-                {
-                  "type": "BLANK"
-                }
-              ]
-            },
-            {
-              "type": "REPEAT",
-              "content": {
-                "type": "SEQ",
-                "members": [
-                  {
-                    "type": "STRING",
-                    "value": ","
-                  },
-                  {
-                    "type": "SYMBOL",
-                    "name": "_attribute_value_nobracket"
-                  }
-                ]
-              }
+              "type": "SYMBOL",
+              "name": "_attribute_array_element"
             },
             {
-              "type": "STRING",
-              "value": "]"
+              "type": "BLANK"
             }
           ]
         },
+        {
+          "type": "REPEAT",
+          "content": {
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "STRING",
+                "value": ","
+              },
+              {
+                "type": "SYMBOL",
+                "name": "_attribute_array_element"
+              }
+            ]
+          }
+        },
+        {
+          "type": "STRING",
+          "value": "]"
+        }
+      ]
+    },
+    "_attribute_array_element": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "_attribute_array"
+        },
         {
           "type": "SYMBOL",
           "name": "_attribute_value_nobracket"
@@ -4109,6 +4166,10 @@
         {
           "type": "SYMBOL",
           "name": "dense_resource_literal"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "distinct_attribute"
         }
       ]
     },
@@ -4145,6 +4206,55 @@
         }
       ]
     },
+    "distinct_attribute": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "TOKEN",
+          "content": {
+            "type": "STRING",
+            "value": "distinct"
+          }
+        },
+        {
+          "type": "STRING",
+          "value": "["
+        },
+        {
+          "type": "ALIAS",
+          "content": {
+            "type": "SYMBOL",
+            "name": "_unsigned_integer_literal"
+          },
+          "named": true,
+          "value": "integer_literal"
+        },
+        {
+          "type": "STRING",
+          "value": "]"
+        },
+        {
+          "type": "STRING",
+          "value": "<"
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "attribute_value"
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "STRING",
+          "value": ">"
+        }
+      ]
+    },
     "strided_layout": {
       "type": "SEQ",
       "members": [
@@ -4805,32 +4915,20 @@
                 "value": ","
               },
               {
-                "type": "SYMBOL",
-                "name": "_value_id_and_type_attr"
+                "type": "CHOICE",
+                "members": [
+                  {
+                    "type": "SYMBOL",
+                    "name": "_value_id_and_type_attr"
+                  },
+                  {
+                    "type": "SYMBOL",
+                    "name": "variadic"
+                  }
+                ]
               }
             ]
           }
-        },
-        {
-          "type": "CHOICE",
-          "members": [
-            {
-              "type": "SEQ",
-              "members": [
-                {
-                  "type": "STRING",
-                  "value": ","
-                },
-                {
-                  "type": "SYMBOL",
-                  "name": "variadic"
-                }
-              ]
-            },
-            {
-              "type": "BLANK"
-            }
-          ]
         }
       ]
     },

package/src/node-types.json

@@ -378,6 +378,10 @@
           "type": "dense_resource_literal",
           "named": true
         },
+        {
+          "type": "distinct_attribute",
+          "named": true
+        },
         {
           "type": "strided_layout",
           "named": true
@@ -711,6 +715,10 @@
       "multiple": true,
       "required": true,
       "types": [
+        {
+          "type": "bare_id",
+          "named": true
+        },
         {
           "type": "dimension_separator",
           "named": true
@@ -719,6 +727,10 @@
           "type": "dimension_size",
           "named": true
         },
+        {
+          "type": "pretty_dialect_item_body",
+          "named": true
+        },
         {
           "type": "type",
           "named": true
@@ -793,6 +805,25 @@
     "named": true,
     "fields": {}
   },
+  {
+    "type": "distinct_attribute",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": true,
+      "required": true,
+      "types": [
+        {
+          "type": "attribute_value",
+          "named": true
+        },
+        {
+          "type": "integer_literal",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "entry_block",
     "named": true,
@@ -976,6 +1007,16 @@
           }
         ]
       },
+      "specifier": {
+        "multiple": true,
+        "required": false,
+        "types": [
+          {
+            "type": "function_specifier",
+            "named": true
+          }
+        ]
+      },
       "sym_name": {
         "multiple": false,
         "required": true,
@@ -2117,6 +2158,10 @@
     "type": "dimension_separator",
     "named": true
   },
+  {
+    "type": "distinct",
+    "named": false
+  },
   {
     "type": "escape_sequence",
     "named": true
@@ -2137,6 +2182,10 @@
     "type": "func.func",
     "named": false
   },
+  {
+    "type": "function_specifier",
+    "named": true
+  },
   {
     "type": "fused",
     "named": false