tree-sitter-sed 0.7.0 → 0.9.0

package/common/regex.js

@@ -1,4 +1,4 @@
-const { issueField, namedExternal } = require("./dsl");
+const { issueField, issueNode, namedExternal } = require("./dsl");
 
 function subexpressionBody($, expression) {
   return choice(
@@ -10,6 +10,10 @@ function subexpressionBody($, expression) {
 }
 
 function intervalExpression($, openingName, closingName) {
+  const closing = field(
+    "closing",
+    namedExternal($, $._regex_interval_close, closingName),
+  );
   return seq(
     field("opening", namedExternal($, $._regex_interval_open, openingName)),
     choice(
@@ -29,19 +33,8 @@ function intervalExpression($, openingName, closingName) {
           ),
         ),
         choice(
-          field(
-            "closing",
-            namedExternal($, $._regex_interval_close, closingName),
-          ),
-          seq(
-            issueField($, "malformed_interval"),
-            optional(
-              field(
-                "closing",
-                namedExternal($, $._regex_interval_close, closingName),
-              ),
-            ),
-          ),
+          closing,
+          seq(issueField($, "malformed_interval"), optional(closing)),
           issueField($, "incomplete_interval"),
         ),
       ),
@@ -50,12 +43,7 @@ function intervalExpression($, openingName, closingName) {
           issueField($, "malformed_interval"),
           issueField($, "incomplete_interval"),
         ),
-        optional(
-          field(
-            "closing",
-            namedExternal($, $._regex_interval_close, closingName),
-          ),
-        ),
+        optional(closing),
       ),
     ),
   );
@@ -75,7 +63,15 @@ function compoundBracketExpression(
     marker,
     choice(
       seq(
-        field(contentField, content),
+        repeat1(
+          choice(
+            field(contentField, content),
+            issueField($, "invalid_regular_expression_character"),
+            ...(marker === ":"
+              ? [issueField($, "invalid_character_class_name")]
+              : []),
+          ),
+        ),
         choice(
           closing,
           seq(issueField($, "malformed_bracket_term"), optional(closing)),
@@ -93,17 +89,41 @@ function compoundBracketExpression(
   );
 }
 
+function bracketListBody($) {
+  return choice(
+    field("elements", $.bracket_list),
+    issueField($, "missing_bracket_list"),
+    issueField($, "incomplete_missing_bracket_list"),
+  );
+}
+
+function subexpressionClose($, tokenName) {
+  return choice(
+    namedExternal($, $._regex_group_close, tokenName),
+    issueField($, "unclosed_subexpression"),
+    issueField($, "incomplete_unclosed_subexpression"),
+  );
+}
+
+function bracketExpression($, ambiguous) {
+  return seq(
+    field("opening", namedExternal($, $._regex_bracket_open, "open_bracket")),
+    field("list", choice($.matching_list, $.nonmatching_list)),
+    ...(ambiguous ? [$._ambiguous_bracket_expression_marker] : []),
+    field("closing", $.close_bracket),
+  );
+}
+
 function bracketRules() {
   return {
-    bracket_expression: ($) =>
-      seq(
-        field(
-          "opening",
-          namedExternal($, $._regex_bracket_open, "open_bracket"),
-        ),
-        field("list", choice($.matching_list, $.nonmatching_list)),
-        optional(issueField($, "ambiguous_bracket_expression")),
-        field("closing", $.close_bracket),
+    bracket_expression: ($) => bracketExpression($, false),
+
+    _ambiguous_bracket_expression: ($) => bracketExpression($, true),
+
+    _bracket_expression: ($) =>
+      choice(
+        $.bracket_expression,
+        issueField($, "ambiguous_bracket_expression"),
       ),
 
     close_bracket: ($) =>
@@ -113,12 +133,7 @@ function bracketRules() {
         issueField($, "incomplete_unclosed_bracket_expression"),
       ),
 
-    matching_list: ($) =>
-      choice(
-        field("elements", $.bracket_list),
-        issueField($, "missing_bracket_list"),
-        issueField($, "incomplete_missing_bracket_list"),
-      ),
+    matching_list: bracketListBody,
 
     nonmatching_list: ($) =>
       seq(
@@ -130,11 +145,7 @@ function bracketRules() {
             "nonmatching_list_operator",
           ),
         ),
-        choice(
-          field("elements", $.bracket_list),
-          issueField($, "missing_bracket_list"),
-          issueField($, "incomplete_missing_bracket_list"),
-        ),
+        bracketListBody($),
       ),
 
     bracket_list: ($) =>
@@ -204,8 +215,7 @@ function bracketRules() {
 
     _character_class_start_range: ($) =>
       seq(
-        field("start", $.character_class),
-        issueField($, "character_class_range_start"),
+        field("start", issueNode($, "character_class_range_start")),
         field(
           "operator",
           namedExternal($, $._regex_bracket_hyphen, "range_operator"),
@@ -214,8 +224,7 @@ function bracketRules() {
 
     _equivalence_class_start_range: ($) =>
       seq(
-        field("start", $.equivalence_class),
-        issueField($, "equivalence_class_range_start"),
+        field("start", issueNode($, "equivalence_class_range_start")),
         field(
           "operator",
           namedExternal($, $._regex_bracket_hyphen, "range_operator"),
@@ -223,16 +232,10 @@ function bracketRules() {
       ),
 
     _character_class_end_range: ($) =>
-      seq(
-        issueField($, "character_class_range_end"),
-        field("term", $.character_class),
-      ),
+      field("term", issueNode($, "character_class_range_end")),
 
     _equivalence_class_end_range: ($) =>
-      seq(
-        issueField($, "equivalence_class_range_end"),
-        field("term", $.equivalence_class),
-      ),
+      field("term", issueNode($, "equivalence_class_range_end")),
 
     start_range: ($) =>
       seq(
@@ -246,7 +249,10 @@ function bracketRules() {
     end_range: ($) => choice($.collating_element, $.collating_symbol),
 
     collating_element: ($) =>
-      namedExternal($, $._regex_bracket_literal, "collating_element_token"),
+      choice(
+        namedExternal($, $._regex_bracket_literal, "collating_element_token"),
+        issueField($, "invalid_regular_expression_character"),
+      ),
 
     collating_symbol: ($) =>
       compoundBracketExpression(
@@ -289,39 +295,32 @@ function bracketRules() {
 
 function commonRegularExpressionRules() {
   return {
-    dup_count: ($) => namedExternal($, $._regex_dup_count, "dup_count_token"),
+    dup_count: ($) => $._regex_dup_count,
 
-    ordinary_character: ($) =>
-      namedExternal($, $._regex_literal, "ordinary_character_token"),
+    ordinary_character: ($) => $._regex_literal,
 
     quoted_character: ($) =>
       choice(
         namedExternal($, $._regex_quoted_escape, "quoted_character_token"),
+        seq(
+          $._escape_prefix,
+          issueField($, "invalid_regular_expression_character"),
+        ),
         $.escaped_delimiter,
         issueField($, "ordinary_character_escape"),
         issueField($, "incomplete_regular_expression_escape"),
         issueField($, "forbidden_regular_expression_newline"),
       ),
 
-    escaped_delimiter: ($) =>
-      field(
-        "token",
-        namedExternal($, $._regex_escaped_delimiter, "escaped_delimiter_token"),
-      ),
-
-    ambiguous_delimiter_escape: ($) =>
-      issueField($, "special_delimiter_escape"),
+    escaped_delimiter: ($) => $._regex_escaped_delimiter,
 
-    sed_newline_escape: ($) =>
-      namedExternal($, $._regex_newline_escape, "sed_newline_escape_token"),
+    sed_newline_escape: ($) => $._regex_newline_escape,
 
-    period: ($) => namedExternal($, $._regex_period, "period_token"),
+    period: ($) => $._regex_period,
 
-    left_anchor: ($) =>
-      namedExternal($, $._regex_beginning_anchor, "left_anchor_token"),
+    left_anchor: ($) => $._regex_beginning_anchor,
 
-    right_anchor: ($) =>
-      namedExternal($, $._regex_end_anchor, "right_anchor_token"),
+    right_anchor: ($) => $._regex_end_anchor,
 
     ...bracketRules(),
   };
@@ -334,47 +333,8 @@ function breDuplicationSymbol($) {
   );
 }
 
-function misplacedBreDuplSymbol($, reason) {
-  return choice(
-    seq(issueField($, reason), field("operator", $.bre_dupl_symbol)),
-    issueField($, "malformed_interval"),
-    issueField($, "incomplete_interval"),
-  );
-}
-
 function breRules() {
   return {
-    bre_extension_escape: ($) =>
-      choice(
-        seq(
-          field(
-            "token",
-            namedExternal($, $._regex_bre_vertical_line_escape, "back_bar"),
-          ),
-          issueField($, "bre_vertical_line_escape"),
-        ),
-        seq(
-          field(
-            "token",
-            namedExternal($, $._regex_bre_question_mark_escape, "back_qm"),
-          ),
-          issueField($, "bre_question_mark_escape"),
-        ),
-        seq(
-          field(
-            "token",
-            namedExternal($, $._regex_bre_plus_escape, "back_plus"),
-          ),
-          issueField($, "bre_plus_escape"),
-        ),
-      ),
-
-    bre_subexpression_anchor: ($) =>
-      choice(
-        issueField($, "bre_subexpression_right_anchor"),
-        issueField($, "bre_subexpression_left_anchor"),
-      ),
-
     basic_reg_exp: ($) => $.bre_branch,
 
     bre_branch: ($) =>
@@ -435,10 +395,10 @@ function breRules() {
           -1,
           seq(
             field("operand", $.simple_bre),
-            field("operator", $.adjacent_bre_dupl_symbol),
+            field("operator", issueNode($, "adjacent_duplication_symbol")),
           ),
         ),
-        field("operator", $.leading_bre_dupl_symbol),
+        field("operator", issueNode($, "leading_duplication_symbol")),
       ),
 
     nondupl_bre: ($) =>
@@ -458,37 +418,30 @@ function breRules() {
       ),
 
     back_close_parenthesis: ($) =>
-      choice(
-        namedExternal($, $._regex_group_close, "back_close_parenthesis_token"),
-        issueField($, "unclosed_subexpression"),
-        issueField($, "incomplete_unclosed_subexpression"),
-      ),
+      subexpressionClose($, "back_close_parenthesis_token"),
 
-    backreference: ($) =>
-      namedExternal($, $._regex_backreference, "backreference_token"),
+    backreference: ($) => $._regex_backreference,
 
     one_char_or_coll_elem_bre: ($) =>
       choice(
+        issueField($, "invalid_regular_expression_character"),
         $.ordinary_character,
         $.quoted_character,
         $.sed_newline_escape,
         $.period,
-        $.bracket_expression,
-        $.ambiguous_delimiter_escape,
-        $.bre_extension_escape,
-        $.bre_subexpression_anchor,
+        $._bracket_expression,
+        issueField($, "special_delimiter_escape"),
+        issueField($, "bre_vertical_line_escape"),
+        issueField($, "bre_question_mark_escape"),
+        issueField($, "bre_plus_escape"),
+        issueField($, "bre_subexpression_right_anchor"),
+        issueField($, "bre_subexpression_left_anchor"),
       ),
 
     bre_dupl_symbol: ($) => breDuplicationSymbol($),
 
     _bre_interval: ($) =>
       intervalExpression($, "back_open_brace", "back_close_brace"),
-
-    leading_bre_dupl_symbol: ($) =>
-      misplacedBreDuplSymbol($, "leading_duplication_symbol"),
-
-    adjacent_bre_dupl_symbol: ($) =>
-      misplacedBreDuplSymbol($, "adjacent_duplication_symbol"),
   };
 }
 
@@ -503,42 +456,20 @@ function ereDuplicationSymbol($) {
 
 function ereRules() {
   return {
-    extended_reg_exp: ($) =>
-      choice(
+    extended_reg_exp: ($) => {
+      const emptyBranch = alias($._empty_ere_branch, $.ere_branch);
+      return choice(
         $.ere_branch,
         prec.left(
           1,
           seq(
-            field("left", $.extended_reg_exp),
-            field("operator", $.ere_alternation_operator),
-            field("right", $.ere_branch),
-          ),
-        ),
-        prec.left(
-          1,
-          seq(
-            field("left", alias($._empty_ere_branch, $.ere_branch)),
-            field("operator", $.ere_alternation_operator),
-            field("right", $.ere_branch),
-          ),
-        ),
-        prec.left(
-          1,
-          seq(
-            field("left", $.extended_reg_exp),
-            field("operator", $.ere_alternation_operator),
-            field("right", alias($._empty_ere_branch, $.ere_branch)),
-          ),
-        ),
-        prec.left(
-          1,
-          seq(
-            field("left", alias($._empty_ere_branch, $.ere_branch)),
+            field("left", choice($.extended_reg_exp, emptyBranch)),
             field("operator", $.ere_alternation_operator),
-            field("right", alias($._empty_ere_branch, $.ere_branch)),
+            field("right", choice($.ere_branch, emptyBranch)),
           ),
         ),
-      ),
+      );
+    },
 
     _empty_ere_branch: ($) =>
       choice(
@@ -546,12 +477,7 @@ function ereRules() {
         issueField($, "incomplete_alternative"),
       ),
 
-    ere_alternation_operator: ($) =>
-      namedExternal(
-        $,
-        $._regex_alternation_operator,
-        "ere_alternation_operator_token",
-      ),
+    ere_alternation_operator: ($) => $._regex_alternation_operator,
 
     ere_branch: ($) =>
       choice(
@@ -578,70 +504,40 @@ function ereRules() {
           1,
           seq(
             field("operand", $.ere_expression),
-            field("operator", $.ere_dupl_symbol),
+            field(
+              "operator",
+              choice(
+                $.ere_dupl_symbol,
+                issueNode($, "adjacent_duplication_symbol"),
+              ),
+            ),
           ),
         ),
-        field("operator", $.leading_ere_dupl_symbol),
+        field("operator", issueNode($, "leading_duplication_symbol")),
       ),
 
-    close_parenthesis: ($) =>
-      choice(
-        namedExternal($, $._regex_group_close, "close_parenthesis_token"),
-        issueField($, "unclosed_subexpression"),
-        issueField($, "incomplete_unclosed_subexpression"),
-      ),
+    close_parenthesis: ($) => subexpressionClose($, "close_parenthesis_token"),
 
     one_char_or_coll_elem_ere: ($) =>
       choice(
+        issueField($, "invalid_regular_expression_character"),
         $.ordinary_character,
         $.quoted_character,
         $.sed_newline_escape,
         $.period,
-        $.bracket_expression,
-        $.ambiguous_delimiter_escape,
+        $._bracket_expression,
+        issueField($, "special_delimiter_escape"),
       ),
 
     ere_dupl_symbol: ($) =>
       seq(
-        choice(
-          ereDuplicationSymbol($),
-          seq(
-            issueField($, "adjacent_duplication_symbol"),
-            ereDuplicationSymbol($),
-          ),
-          issueField($, "malformed_interval"),
-          issueField($, "incomplete_interval"),
-        ),
+        ereDuplicationSymbol($),
         optional(field("modifier", $.repetition_modifier)),
       ),
 
     _ere_interval: ($) => intervalExpression($, "open_brace", "close_brace"),
 
     repetition_modifier: ($) => $._regex_repetition_modifier,
-
-    _leading_ere_dupl_symbol: ($) =>
-      seq(
-        ereDuplicationSymbol($),
-        optional(field("modifier", $.repetition_modifier)),
-      ),
-
-    leading_ere_dupl_symbol: ($) =>
-      choice(
-        seq(
-          issueField($, "leading_duplication_symbol"),
-          field(
-            "operator",
-            alias($._leading_ere_dupl_symbol, $.ere_dupl_symbol),
-          ),
-        ),
-        seq(
-          choice(
-            issueField($, "malformed_interval"),
-            issueField($, "incomplete_interval"),
-          ),
-          optional(field("modifier", $.repetition_modifier)),
-        ),
-      ),
   };
 }