tree-sitter-sed 0.8.0 → 0.9.0

package/common/grammar.js

@@ -28,6 +28,22 @@ function fileOperandForms($, name, operand) {
   ];
 }
 
+function lineOperand($, first, rest) {
+  return prec.right(
+    seq(
+      choice(first, issueField($, "nul_character")),
+      repeat(choice(rest, issueField($, "nul_character"))),
+    ),
+  );
+}
+
+function commentText($) {
+  return choice(
+    namedExternal($, $._comment_text, "comment_text"),
+    issueField($, "nul_character"),
+  );
+}
+
 function missingCommandSeparator($) {
   return choice(
     issueNode($, "missing_command_separator"),
@@ -213,11 +229,6 @@ function delimiterRules() {
   return rules;
 }
 
-function choiceForRules($, names) {
-  const rules = names.map((name) => $[name]);
-  return rules.length === 1 ? rules[0] : choice(...rules);
-}
-
 function commandListRules() {
   return {
     script: ($) => optional(alias($._script_command_list, $.command_list)),
@@ -256,7 +267,7 @@ function commandListRules() {
             "default_output_suppression",
           ),
         ),
-        optional(namedExternal($, $._comment_text, "comment_text")),
+        repeat(commentText($)),
       ),
 
     _command_list: ($) =>
@@ -518,7 +529,6 @@ function addressRules(mode) {
 
     address: addressChoice,
 
-    // Keep maximum-specific GLR paths distinct until the function verb.
     _max0_address: addressChoice,
 
     _max1_address: addressChoice,
@@ -599,10 +609,11 @@ function operandRules(mode) {
       repeat1(
         choice(
           $.replacement_literal,
+          issueField($, "nul_character"),
           $.matched_text_reference,
           $.replacement_backreference,
           $.replacement_escaped_delimiter,
-          $.ambiguous_replacement_delimiter_escape,
+          issueField($, "replacement_ampersand_delimiter_escape"),
           $.replacement_escape,
           $.escaped_newline,
           issueField($, "unspecified_replacement_escape"),
@@ -610,45 +621,17 @@ function operandRules(mode) {
         ),
       ),
 
-    replacement_literal: ($) =>
-      namedExternal($, $._replacement_literal, "replacement_literal_token"),
+    replacement_literal: ($) => $._replacement_literal,
 
-    matched_text_reference: ($) =>
-      namedExternal(
-        $,
-        $._replacement_match_reference,
-        "matched_text_reference_token",
-      ),
+    matched_text_reference: ($) => $._replacement_match_reference,
 
-    replacement_backreference: ($) =>
-      namedExternal(
-        $,
-        $._replacement_backreference,
-        "replacement_backreference_token",
-      ),
-
-    replacement_escaped_delimiter: ($) =>
-      field(
-        "token",
-        namedExternal(
-          $,
-          $._replacement_escaped_delimiter,
-          "escaped_delimiter_token",
-        ),
-      ),
+    replacement_backreference: ($) => $._replacement_backreference,
 
-    ambiguous_replacement_delimiter_escape: ($) =>
-      issueField($, "replacement_ampersand_delimiter_escape"),
+    replacement_escaped_delimiter: ($) => $._replacement_escaped_delimiter,
 
-    replacement_escape: ($) =>
-      namedExternal(
-        $,
-        $._replacement_escape_sequence,
-        "replacement_escape_token",
-      ),
+    replacement_escape: ($) => $._replacement_escape_sequence,
 
-    escaped_newline: ($) =>
-      namedExternal($, $._replacement_escaped_newline, "escaped_newline_token"),
+    escaped_newline: ($) => $._replacement_escaped_newline,
 
     _substitution_flags: ($) =>
       choice(
@@ -704,6 +687,7 @@ function operandRules(mode) {
       repeat1(
         choice(
           $.translation_literal,
+          issueField($, "nul_character"),
           $.translation_escape,
           $.translation_escaped_delimiter,
           issueField($, "undefined_translation_escape"),
@@ -711,18 +695,11 @@ function operandRules(mode) {
         ),
       ),
 
-    translation_literal: ($) =>
-      namedExternal($, $._translate_literal, "translation_literal_token"),
+    translation_literal: ($) => $._translate_literal,
 
-    translation_escape: ($) =>
-      namedExternal($, $._translate_escape, "translation_escape_token"),
+    translation_escape: ($) => $._translate_escape,
 
-    translation_escaped_delimiter: ($) =>
-      namedExternal(
-        $,
-        $._translate_escaped_delimiter,
-        "escaped_delimiter_token",
-      ),
+    translation_escaped_delimiter: ($) => $._translate_escaped_delimiter,
   };
 }
 
@@ -737,6 +714,7 @@ function functionRules() {
         repeat1(
           choice(
             $.text_literal,
+            issueField($, "nul_character"),
             $.text_backslash_escape,
             $.text_escaped_newline,
             issueField($, "unspecified_text_escape"),
@@ -750,14 +728,11 @@ function functionRules() {
 
     _text_end: ($) => choice($._text_line_end, $._text_eof),
 
-    text_literal: ($) =>
-      namedExternal($, $._text_literal, "text_literal_token"),
+    text_literal: ($) => $._text_literal,
 
-    text_backslash_escape: ($) =>
-      namedExternal($, $._text_backslash_escape, "text_backslash_escape_token"),
+    text_backslash_escape: ($) => $._text_backslash_escape,
 
-    text_escaped_newline: ($) =>
-      namedExternal($, $._text_escaped_newline, "text_escaped_newline_token"),
+    text_escaped_newline: ($) => $._text_escaped_newline,
 
     text_introducer: ($) =>
       namedExternal($, $._text_command_start, "text_introducer_token"),
@@ -765,22 +740,32 @@ function functionRules() {
     _incomplete_text_introducer: ($) =>
       issueField($, "incomplete_text_introducer"),
 
-    rfile: ($) => namedExternal($, $._file_argument, "rfile_token"),
+    rfile: ($) => lineOperand($, $._file_argument, $._line_word),
 
-    wfile: ($) => namedExternal($, $._file_argument, "wfile_token"),
+    wfile: ($) => lineOperand($, $._file_argument, $._line_word),
 
     _substitution_wfile: ($) =>
-      namedExternal($, $._substitution_wfile_argument, "wfile_token"),
+      lineOperand(
+        $,
+        $._substitution_wfile_argument,
+        $._substitution_wfile_continuation,
+      ),
 
-    label: ($) => namedExternal($, $._line_word, "label_token"),
+    label: ($) =>
+      prec.right(repeat1(choice($._line_word, issueField($, "nul_character")))),
 
-    comment: ($) => namedExternal($, $._comment_text, "comment_text"),
+    comment: ($) => prec.right(repeat1(commentText($))),
 
-    closing_brace: ($) =>
-      choice(
-        namedExternal($, $._right_brace, "closing_brace_token"),
-        issueField($, "missing_closing_brace"),
+    comment_function: ($) =>
+      prec.right(
+        seq(functionVerb($, "#"), optional(field("comment", $.comment))),
       ),
+
+    closing_brace: ($) =>
+      choice($._present_closing_brace, issueField($, "missing_closing_brace")),
+
+    _present_closing_brace: ($) =>
+      namedExternal($, $._right_brace, "closing_brace_token"),
   };
 
   function fileForm(form) {
@@ -827,7 +812,6 @@ function functionRules() {
     ],
     rfile: fileForm("rfile"),
     wfile: fileForm("wfile"),
-    comment: ($) => [optional(field("comment", $.comment))],
   };
 
   for (const { rule, spelling } of noArgumentDefinitions) {
@@ -852,8 +836,8 @@ function editingCommandRules() {
     2: ($) => $.address_clause,
   };
 
-  // One wrapper rule per (chainable or line-terminated) kind and address
-  // maximum keeps the maximum-specific GLR paths distinct until the verb.
+  // Keep address, issue, and function rules separate by address maximum so
+  // GLR paths cannot merge before the function verb.
   const wrappers = [];
   for (const [kind, isLineTerminated] of [
     ["chainable", false],
@@ -977,7 +961,7 @@ function editingCommandRules() {
   };
 
   for (const { name, names } of wrappers) {
-    rules[name] = ($) => choiceForRules($, names);
+    rules[name] = ($) => choice(...names.map((name) => $[name]));
   }
 
   return rules;
@@ -1049,15 +1033,31 @@ function issueDefinitions(mode) {
       outcome: "undefined_syntax",
       rule: ($) => $._regex_malformed_bracket_term,
     },
+    {
+      id: "invalid_character_class_name",
+      reason: "malformed_bracket_term",
+      outcome: "undefined_syntax",
+      rule: ($) => namedExternal($, $._regex_invalid_class_name, "class_name"),
+    },
+    {
+      reason: "nul_character",
+      outcome: "nonconforming_syntax",
+      rule: ($) => $._nul_character,
+    },
+    {
+      reason: "invalid_regular_expression_character",
+      outcome: "invalid_syntax",
+      rule: ($) => $._invalid_character,
+    },
     {
       reason: "character_class_range_start",
       outcome: "undefined_syntax",
-      rule: ($) => $._nonportable_range_start_marker,
+      rule: ($) => seq($.character_class, $._nonportable_range_start_marker),
     },
     {
       reason: "character_class_range_end",
       outcome: "undefined_syntax",
-      rule: ($) => $._nonportable_range_end_marker,
+      rule: ($) => seq($._nonportable_range_end_marker, $.character_class),
     },
     {
       reason: "shared_range_endpoint",
@@ -1081,7 +1081,6 @@ function issueDefinitions(mode) {
       outcome: "undefined_syntax",
       rule: missing("omitted_first_address"),
     },
-    // The marker is shared, but maximum-specific reductions must not merge.
     ...[0, 1].map((maximum) => ({
       id: `omitted_first_address_unit${maximum}`,
       reason: "omitted_address",
@@ -1130,17 +1129,39 @@ function issueDefinitions(mode) {
     {
       reason: "malformed_interval",
       outcome: "undefined_syntax",
-      rule: ($) => $._regex_invalid_interval,
+      rule: ($) =>
+        prec.right(
+          repeat1(
+            choice(
+              $._regex_invalid_interval,
+              issueField($, "invalid_regular_expression_character"),
+            ),
+          ),
+        ),
     },
     {
       reason: "leading_duplication_symbol",
       outcome: "undefined_syntax",
-      rule: ($) => $._regex_leading_duplication_marker,
+      rule: ($) =>
+        seq(
+          $._regex_leading_duplication_marker,
+          field(
+            "operator",
+            mode === "bre" ? $.bre_dupl_symbol : $.ere_dupl_symbol,
+          ),
+        ),
     },
     {
       reason: "adjacent_duplication_symbol",
       outcome: "undefined_syntax",
-      rule: ($) => $._regex_adjacent_duplication_marker,
+      rule: ($) =>
+        seq(
+          $._regex_adjacent_duplication_marker,
+          field(
+            "operator",
+            mode === "bre" ? $.bre_dupl_symbol : $.ere_dupl_symbol,
+          ),
+        ),
     },
     ...(mode === "ere"
       ? [
@@ -1164,22 +1185,26 @@ function issueDefinitions(mode) {
     {
       reason: "undefined_translation_escape",
       outcome: "undefined_syntax",
-      rule: ($) => $._translate_nonportable_escape,
+      rule: ($) =>
+        choice(
+          $._translate_nonportable_escape,
+          seq($._escape_prefix, issueField($, "nul_character")),
+        ),
     },
     {
       reason: "equivalence_class_range_start",
       outcome: "unspecified_syntax",
-      rule: ($) => $._nonportable_range_start_marker,
+      rule: ($) => seq($.equivalence_class, $._nonportable_range_start_marker),
     },
     {
       reason: "equivalence_class_range_end",
       outcome: "unspecified_syntax",
-      rule: ($) => $._nonportable_range_end_marker,
+      rule: ($) => seq($._nonportable_range_end_marker, $.equivalence_class),
     },
     {
       reason: "ambiguous_bracket_expression",
       outcome: "unspecified_syntax",
-      rule: ($) => $._ambiguous_bracket_expression_marker,
+      rule: ($) => alias($._ambiguous_bracket_expression, $.bracket_expression),
     },
     {
       reason: "blanks_after_negation",
@@ -1189,7 +1214,11 @@ function issueDefinitions(mode) {
     {
       reason: "unspecified_replacement_escape",
       outcome: "unspecified_syntax",
-      rule: ($) => $._replacement_nonportable_escape,
+      rule: ($) =>
+        choice(
+          $._replacement_nonportable_escape,
+          seq($._escape_prefix, issueField($, "nul_character")),
+        ),
     },
     {
       reason: "special_delimiter_escape",
@@ -1204,33 +1233,49 @@ function issueDefinitions(mode) {
     {
       reason: "unspecified_text_escape",
       outcome: "unspecified_syntax",
-      rule: ($) => $._text_unspecified_escape,
+      rule: ($) =>
+        choice(
+          $._text_unspecified_escape,
+          seq($._escape_prefix, issueField($, "nul_character")),
+        ),
     },
     ...(mode === "bre"
       ? [
           {
             reason: "bre_vertical_line_escape",
             outcome: "implementation_defined_syntax",
-            rule: ($) => $._bre_vertical_line_escape_marker,
+            rule: ($) =>
+              field(
+                "token",
+                namedExternal($, $._regex_bre_vertical_line_escape, "back_bar"),
+              ),
           },
           {
             reason: "bre_question_mark_escape",
             outcome: "implementation_defined_syntax",
-            rule: ($) => $._bre_question_mark_escape_marker,
+            rule: ($) =>
+              field(
+                "token",
+                namedExternal($, $._regex_bre_question_mark_escape, "back_qm"),
+              ),
           },
           {
             reason: "bre_plus_escape",
             outcome: "implementation_defined_syntax",
-            rule: ($) => $._bre_plus_escape_marker,
+            rule: ($) =>
+              field(
+                "token",
+                namedExternal($, $._regex_bre_plus_escape, "back_plus"),
+              ),
           },
           {
             reason: "bre_subexpression_left_anchor",
-            outcome: "invalid_syntax",
+            outcome: "nonconforming_syntax",
             rule: ($) => $._regex_bre_subexpression_caret,
           },
           {
             reason: "bre_subexpression_right_anchor",
-            outcome: "invalid_syntax",
+            outcome: "nonconforming_syntax",
             rule: ($) => $._regex_bre_subexpression_dollar,
           },
         ]
@@ -1270,7 +1315,8 @@ function issueDefinitions(mode) {
     {
       reason: "unknown_function",
       outcome: "nonconforming_syntax",
-      rule: () => token(prec(-2, unknownFunctionCharacter)),
+      rule: ($) =>
+        choice(token(prec(-2, unknownFunctionCharacter)), $._invalid_character),
     },
     {
       id: "reserved_unknown_function",
@@ -1281,10 +1327,17 @@ function issueDefinitions(mode) {
     {
       reason: "unexpected_command_text",
       outcome: "nonconforming_syntax",
-      rule: () =>
-        choice(
-          token.immediate(prec(-10, /[[:blank:]]+/)),
-          token.immediate(prec(-10, /[[:blank:]]*[^[:blank:];}\n][^;}\n]*/)),
+      rule: ($) =>
+        repeat1(
+          choice(
+            token.immediate(prec(-10, /[[:blank:]]+/)),
+            token.immediate(
+              // biome-ignore lint/suspicious/noControlCharactersInRegex: NUL must remain a separate syntax issue.
+              prec(-10, /[[:blank:]]*[^[:blank:];}\n\x00][^;}\n\x00]*/),
+            ),
+            issueField($, "nul_character"),
+            $._invalid_character,
+          ),
         ),
     },
     {
@@ -1310,7 +1363,7 @@ function issueDefinitions(mode) {
     {
       reason: "unmatched_closing_brace",
       outcome: "nonconforming_syntax",
-      rule: ($) => $._right_brace,
+      rule: ($) => alias($._present_closing_brace, $.closing_brace),
     },
     {
       reason: "missing_command_separator",
@@ -1337,7 +1390,11 @@ function issueDefinitions(mode) {
     {
       reason: "invalid_delimiter",
       outcome: "nonconforming_syntax",
-      rule: ($) => field("token", alias("\\", $.delimiter_token)),
+      rule: ($) =>
+        field(
+          "token",
+          alias(choice("\\", $._invalid_character), $.delimiter_token),
+        ),
     },
     {
       reason: "unterminated_regular_expression",
@@ -1516,10 +1573,13 @@ function externalTokens($, mode) {
     $._translate_middle,
     $._translate_end,
     $._regex_literal,
+    $._invalid_character,
+    $._nul_character,
     $._regex_beginning_anchor,
     $._regex_end_anchor,
     $._regex_period,
     $._regex_quoted_escape,
+    $._escape_prefix,
     $._regex_newline_escape,
     $._regex_escaped_delimiter,
     $._regex_special_escaped_delimiter,
@@ -1534,9 +1594,6 @@ function externalTokens($, mode) {
           $._regex_bre_plus_escape,
           $._regex_bre_subexpression_caret,
           $._regex_bre_subexpression_dollar,
-          $._bre_vertical_line_escape_marker,
-          $._bre_question_mark_escape_marker,
-          $._bre_plus_escape_marker,
           $._regex_unmatched_interval_close,
         ]
       : []),
@@ -1568,6 +1625,7 @@ function externalTokens($, mode) {
     $._regex_bracket_trailing_hyphen,
     $._regex_open_colon,
     $._regex_class_name,
+    $._regex_invalid_class_name,
     $._regex_colon_close,
     $._regex_open_dot,
     $._regex_coll_elem_single,
@@ -1616,6 +1674,7 @@ function externalTokens($, mode) {
     $._comment_text,
     $._file_argument,
     $._substitution_wfile_argument,
+    $._substitution_wfile_continuation,
     $._line_word,
     $._argument_separator,
     $._right_brace,