tree-sitter-delphi13 1.4.0 → 1.4.2

package/grammar.js

@@ -430,6 +430,10 @@ module.exports = grammar({
 		// Phase 3b iter 11: declFieldNoSemi uses a narrower type set; conflicts
 		// with the full `type` rule's choices.
 		[$.type, $.declFieldNoSemi],
+		// 2026-11-03 GRAMMAR-LASTFIELD: the no-semi array form shares its prefix with
+		// declArray; the GLR splits on the token after the element (`;` vs `end`).
+		[$.type, $._arrayElemNoSemi],
+		[$.declArray, $._declArrayNoSemi],
 		// Iter 2026-07-06: an anonymous enum `(a, b, c)` in an array index slot is
 		// ambiguous with a parenthesized expression `_ref` (both start `(`). GLR
 		// resolves by what follows: `(a,b,c)]` in index position -> declEnum.
@@ -1684,18 +1688,40 @@ module.exports = grammar({
 				// Bare `string`/`ShortString` has no such tail, so it is
 				// unambiguous here.
 				$.kString,
-				// NOTE: `array[...] of T` as a last-field-no-`;` is intentionally
-				// NOT here. Adding declArray fixes SHX/MongoDBCli/ShlObj (+3) but
-				// regresses OoMisc/Z19b5 (-2/3): `array[0..4] of String[1];` (a
-				// short-string element, WITH a trailing `;`) becomes ambiguous with
-				// the no-semi array form and mis-parses. The GLR can't split them
-				// (the `[N]` overlap is lexical). Needs a constrained array element
-				// (exclude declString) to do safely — deferred; not worth the
-				// parser-table cost for ~1 net file. See TODO.
+				// 2026-11-03 (v1.4.1, GRAMMAR-LASTFIELD): `array[...] of T` as the
+				// last field with no `;` (FireDAC.Phys.MongoDBCli `padding: array
+				// [0 .. 83] of Byte end`, Winapi.ShlObj `szInsert: packed
+				// array[0..MAX_PATH-1] of WCHAR end`). The full declArray is NOT
+				// used: its element `type` includes declString, whose `[N]` made
+				// `array[0..4] of String[1];` (OoMisc/Z19b5, WITH a trailing `;`)
+				// ambiguous with the no-semi form. _declArrayNoSemi is the
+				// constrained form: its element excludes every string type, so a
+				// string element only ever parses through declField. Aliased to
+				// declArray (element aliased to type) so the tree has the same
+				// shape as the `;` form.
+				alias($._declArrayNoSemi, $.declArray),
 				prec(-1, $.pp_block),
 			)),
 			field('defaultValue', optional($.defaultValue)),
 		),
+		// Constrained `array [..] of T` for declFieldNoSemi only (see there).
+		// Same index forms as declArray; the element excludes declString and
+		// kString so `of String[N]` can never end a no-semi field.
+		_declArrayNoSemi: $ => seq(
+			optional($.kPacked),
+			$.kArray,
+			optional(seq('[', delimited(choice($.range, $.declEnum, $._expr)), ']')),
+			$.kOf,
+			choice(alias($._arrayElemNoSemi, $.type), $.subrangeType),
+		),
+		_arrayElemNoSemi: $ => choice(
+			$.typeref,
+			$.declMetaClass,
+			$.declEnum,
+			$.declSet,
+			$.declProcRef,
+			$.declClass,
+		),
 
 		declField:       $ =>  seq(
 			...enable_if(rtti, optional($.rttiAttributes)),

package/package.json

@@ -1,58 +1,58 @@
-{
-  "name": "tree-sitter-delphi13",
-  "version": "1.4.0",
-  "description": "Tree-sitter grammar focused on Delphi 13 (RAD Studio 37.0)",
-  "main": "bindings/node",
-  "types": "bindings/node",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/Alexl-git/tree-sitter-delphi13.git"
-  },
-  "keywords": [
-    "parser",
-    "tree-sitter",
-    "delphi",
-    "delphi13",
-    "pascal"
-  ],
-  "homepage": "https://github.com/Alexl-git/tree-sitter-delphi13",
-  "bugs": {
-    "url": "https://github.com/Alexl-git/tree-sitter-delphi13/issues"
-  },
-  "author": "Alexander Liberov",
-  "license": "MIT",
-  "devDependencies": {
-    "prebuildify": "^6.0.1",
-    "web-tree-sitter": "^0.24.7",
-    "tree-sitter-cli": "^0.24.5"
-  },
-  "scripts": {
-    "build": "tree-sitter generate && node-gyp build",
-    "build-wasm": "tree-sitter build --wasm -o tree-sitter-delphi13.wasm .",
-    "test": "tree-sitter test && tree-sitter parse examples/* --quiet --time",
-    "install": "node-gyp-build",
-    "validate-queries": "node tools/validate-queries.js",
-    "prebuildify": "prebuildify --napi --strip"
-  },
-  "files": [
-    "grammar.js",
-    "binding.gyp",
-    "tree-sitter.json",
-    "prebuilds/**",
-    "bindings/node/*",
-    "queries/*",
-    "src/**",
-    "tree-sitter-delphi13.wasm"
-  ],
-  "dependencies": {
-    "node-gyp-build": "^4.8.4"
-  },
-  "peerDependencies": {
-    "tree-sitter": "^0.22.0"
-  },
-  "peerDependenciesMeta": {
-    "tree_sitter": {
-      "optional": true
-    }
-  }
-}
+{
+  "name": "tree-sitter-delphi13",
+  "version": "1.4.2",
+  "description": "Tree-sitter grammar focused on Delphi 13 (RAD Studio 37.0)",
+  "main": "bindings/node",
+  "types": "bindings/node",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/Alexl-git/tree-sitter-delphi13.git"
+  },
+  "keywords": [
+    "parser",
+    "tree-sitter",
+    "delphi",
+    "delphi13",
+    "pascal"
+  ],
+  "homepage": "https://github.com/Alexl-git/tree-sitter-delphi13",
+  "bugs": {
+    "url": "https://github.com/Alexl-git/tree-sitter-delphi13/issues"
+  },
+  "author": "Alexander Liberov",
+  "license": "MIT",
+  "devDependencies": {
+    "prebuildify": "^6.0.1",
+    "web-tree-sitter": "^0.24.7",
+    "tree-sitter-cli": "^0.24.5"
+  },
+  "scripts": {
+    "build": "tree-sitter generate && node-gyp build",
+    "build-wasm": "tree-sitter build --wasm -o tree-sitter-delphi13.wasm .",
+    "test": "tree-sitter test && tree-sitter parse examples/* --quiet --time",
+    "install": "node-gyp-build",
+    "validate-queries": "node tools/validate-queries.js",
+    "prebuildify": "prebuildify --napi --strip"
+  },
+  "files": [
+    "grammar.js",
+    "binding.gyp",
+    "tree-sitter.json",
+    "prebuilds/**",
+    "bindings/node/*",
+    "queries/*",
+    "src/**",
+    "tree-sitter-delphi13.wasm"
+  ],
+  "dependencies": {
+    "node-gyp-build": "^4.8.4"
+  },
+  "peerDependencies": {
+    "tree-sitter": "^0.22.0"
+  },
+  "peerDependenciesMeta": {
+    "tree_sitter": {
+      "optional": true
+    }
+  }
+}

package/src/grammar.json

@@ -9670,6 +9670,15 @@
                 "type": "SYMBOL",
                 "name": "kString"
               },
+              {
+                "type": "ALIAS",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "_declArrayNoSemi"
+                },
+                "named": true,
+                "value": "declArray"
+              },
               {
                 "type": "PREC",
                 "value": -1,
@@ -9699,6 +9708,170 @@
         }
       ]
     },
+    "_declArrayNoSemi": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "kPacked"
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "SYMBOL",
+          "name": "kArray"
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "STRING",
+                  "value": "["
+                },
+                {
+                  "type": "CHOICE",
+                  "members": [
+                    {
+                      "type": "SEQ",
+                      "members": [
+                        {
+                          "type": "CHOICE",
+                          "members": [
+                            {
+                              "type": "REPEAT1",
+                              "content": {
+                                "type": "PREC",
+                                "value": 0,
+                                "content": {
+                                  "type": "SEQ",
+                                  "members": [
+                                    {
+                                      "type": "CHOICE",
+                                      "members": [
+                                        {
+                                          "type": "SYMBOL",
+                                          "name": "range"
+                                        },
+                                        {
+                                          "type": "SYMBOL",
+                                          "name": "declEnum"
+                                        },
+                                        {
+                                          "type": "SYMBOL",
+                                          "name": "_expr"
+                                        }
+                                      ]
+                                    },
+                                    {
+                                      "type": "STRING",
+                                      "value": ","
+                                    }
+                                  ]
+                                }
+                              }
+                            },
+                            {
+                              "type": "BLANK"
+                            }
+                          ]
+                        },
+                        {
+                          "type": "CHOICE",
+                          "members": [
+                            {
+                              "type": "SYMBOL",
+                              "name": "range"
+                            },
+                            {
+                              "type": "SYMBOL",
+                              "name": "declEnum"
+                            },
+                            {
+                              "type": "SYMBOL",
+                              "name": "_expr"
+                            }
+                          ]
+                        }
+                      ]
+                    },
+                    {
+                      "type": "BLANK"
+                    }
+                  ]
+                },
+                {
+                  "type": "STRING",
+                  "value": "]"
+                }
+              ]
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "SYMBOL",
+          "name": "kOf"
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "ALIAS",
+              "content": {
+                "type": "SYMBOL",
+                "name": "_arrayElemNoSemi"
+              },
+              "named": true,
+              "value": "type"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "subrangeType"
+            }
+          ]
+        }
+      ]
+    },
+    "_arrayElemNoSemi": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "typeref"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "declMetaClass"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "declEnum"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "declSet"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "declProcRef"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "declClass"
+        }
+      ]
+    },
     "declField": {
       "type": "SEQ",
       "members": [
@@ -13220,6 +13393,14 @@
       "type",
       "declFieldNoSemi"
     ],
+    [
+      "type",
+      "_arrayElemNoSemi"
+    ],
+    [
+      "declArray",
+      "_declArrayNoSemi"
+    ],
     [
       "_ref",
       "declEnumValue"

package/src/node-types.json

@@ -2019,6 +2019,10 @@
         "multiple": false,
         "required": true,
         "types": [
+          {
+            "type": "declArray",
+            "named": true
+          },
           {
             "type": "declClass",
             "named": true