tree-sitter-delphi13-pure 1.4.2 → 1.4.4

package/grammar.js

@@ -123,12 +123,14 @@ function statements(trailing) {
 
 		[rn('nestedIf'),    $ => prec(1,$.if)],
 
-		[rn('ifElse'),      $ => prec.right(1, seq(
+		// Dynamic precedence +1, as exprIf's is -1: where both read the same
+		// text, the statement wins (see exprIf).
+		[rn('ifElse'),      $ => prec.dynamic(1, prec.right(1, seq(
 			$.kIf, field('condition', $._expr), $.kThen,
 			field('then', optional(choice(tr($,'_statement'), $.if))),
 			$.kElse,
 			field('else', lastStatement($))
-		))],
+		)))],
 
 		[rn('while'),       $ => seq(
 			$.kWhile, field('condition', $._expr), $.kDo,
@@ -442,6 +444,9 @@ module.exports = grammar({
 			[$._declProc ], [ $._declOperator], [$.declConst], [$.declVar],
 			[$.declType], [$.declProp]
 		),
+		// `external L name 'x'` without `;` before `[`: an attribute on the next
+		// declaration, or an index on the string. One token too few; GLR decides.
+		[$._literal, $.procExternal],
 		// RTTI attributes clash with fpc declaration hints syntax since both
 		// are surrounded by brackets.
 		...enable_if(rtti,
@@ -665,11 +670,17 @@ module.exports = grammar({
 		// the if-then-else STATEMENT (rn('ifElse')) — this one returns a value.
 		// Right-associative + lower precedence than binary operators so that
 		// `a + if c then x else y` groups as `a + (if c then x else y)`.
-		exprIf:          $ => prec.right(0, seq(
+		// Dynamic precedence -1: where an if STATEMENT reads the same text, it
+		// wins. Both branches may pass for expressions, as in `if Q then Foo
+		// else raise;` (a bare `raise` an identifier) or `if Q then Foo else
+		// N := 1;` (the whole if an assignment's target); dcc reads both as
+		// statements. Only an expression fits on the right of `:=` or in an
+		// argument, so those are unchanged.
+		exprIf:          $ => prec.dynamic(-1, prec.right(0, seq(
 			$.kIf, field('condition', $._expr),
 			$.kThen, field('then', $._expr),
 			$.kElse, field('else', $._expr),
-		)),
+		))),
 
 		_ref:            $ => choice(
 			...enable_if(templates && fpc,
@@ -1867,21 +1878,31 @@ module.exports = grammar({
 			'[', optional(seq($.identifier, ':')), delimited($._ref), ']'
 		)),
 
+		// The closing `;` may be omitted after `name '<string>'`: dcc accepts it and Borland
+		// shipped it (Delphi 5 shlobj.pas, five `function X; external shell32 name 'X'` lines
+		// before the next routine or `end.`). Deliberately only that form: an optional `;`
+		// after every clause puts ALL declaration starts in the follow set of `_expr` here
+		// and grows the parser by 16% states (measured). A `[` after the string forks (see conflicts).
 		procExternal:    $ => seq(
 			$.kExternal,
 			optional($._expr),
-			optional(seq(choice($.kName, $.kIndex), $._expr)),
-			...enable_if(delphi, optional($.kDelayed)),
-			// Phase 3b iter 17: native library dependency hint
-			//   function f; cdecl; external LIB name 'foo' dependency 'c++_static','c++abi';
-			// (Embarcadero FlatBox2D Android/iOS linker pattern.)
-			// Phase 3b iter 35: `dependency` clause may use identifier-name
-			// constants too: `dependency LibCPP, LibCPP_ABI` (FireDAC.Phys.IBCli).
-			optional(seq(
-				$.kDependency,
-				delimited1(choice($._literalString, $.identifier)),
-			)),
-			';'
+			choice(
+				seq(
+					optional(seq(choice($.kName, $.kIndex), $._expr)),
+					...enable_if(delphi, optional($.kDelayed)),
+					// Phase 3b iter 17: native library dependency hint
+					//   function f; cdecl; external LIB name 'foo' dependency 'c++_static','c++abi';
+					// (Embarcadero FlatBox2D Android/iOS linker pattern.)
+					// Phase 3b iter 35: `dependency` clause may use identifier-name
+					// constants too: `dependency LibCPP, LibCPP_ABI` (FireDAC.Phys.IBCli).
+					optional(seq(
+						$.kDependency,
+						delimited1(choice($._literalString, $.identifier)),
+					)),
+					';'
+				),
+				seq($.kName, $.literalString)
+			)
 		),
 
 		// INITIALIZERS --------------------------------------------------------

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tree-sitter-delphi13-pure",
-  "version": "1.4.2",
+  "version": "1.4.4",
   "description": "Pure Delphi 13 tree-sitter sub-grammar — drops {$IFDEF}/pp_* tokens entirely and expects preprocessor-resolved source as input. Pairs with delphi13-preprocessor to reach 99%+ pass on real Delphi 13 corpora.",
   "main": "bindings/node",
   "types": "bindings/node",