tree-sitter-sed 0.4.0 → 0.5.0

package/CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.13)
 
 project(
   tree-sitter-sed
-  VERSION 0.4.0
+  VERSION 0.5.0
   DESCRIPTION "Tree-sitter grammars for POSIX sed."
   HOMEPAGE_URL "https://github.com/konomanoasa/tree-sitter-sed"
   LANGUAGES C

package/Makefile

@@ -1,6 +1,6 @@
 LANGUAGE_NAME := tree-sitter-sed
 HOMEPAGE_URL := https://github.com/konomanoasa/tree-sitter-sed
-VERSION := 0.4.0
+VERSION := 0.5.0
 DESCRIPTION := Tree-sitter grammars for POSIX sed.
 
 PREFIX ?= /usr/local

package/common/grammar.js

@@ -551,29 +551,17 @@ function operandRules(mode) {
   }
 
   return {
-    _substitute_function_without_write: ($) =>
+    _substitute_function: ($) =>
       choice(
         seq(
           $._complete_substitute_function,
           optional(
-            field(
-              "flags",
-              alias($._substitution_flags_without_write, $.substitution_flags),
-            ),
+            field("flags", alias($._substitution_flags, $.substitution_flags)),
           ),
         ),
         $._incomplete_substitute_function,
       ),
 
-    _substitute_function_with_write: ($) =>
-      seq(
-        $._complete_substitute_function,
-        field(
-          "flags",
-          alias($._substitution_flags_with_write, $.substitution_flags),
-        ),
-      ),
-
     _complete_substitute_function: ($) =>
       seq(
         functionVerb($, "s"),
@@ -659,6 +647,12 @@ function operandRules(mode) {
     escaped_newline: ($) =>
       namedExternal($, $._replacement_escaped_newline, "escaped_newline_token"),
 
+    _substitution_flags: ($) =>
+      choice(
+        $._substitution_flags_without_write,
+        seq(optional($._substitution_flags_without_write), $.write_flag),
+      ),
+
     _substitution_flags_without_write: ($) =>
       choice(
         substitutionFlagChoice($),
@@ -667,9 +661,6 @@ function operandRules(mode) {
         ),
       ),
 
-    _substitution_flags_with_write: ($) =>
-      seq(optional($._substitution_flags_without_write), $.write_flag),
-
     occurrence_flag: () => /[[:digit:]]+/,
 
     global_flag: () => "g",
@@ -684,8 +675,7 @@ function operandRules(mode) {
         choice(
           seq(
             $._flag_after_write_marker,
-            issueField($, "flag_after_write_flag"),
-            repeat(postWriteSubstitutionFlagChoice($)),
+            repeat1(postWriteSubstitutionFlagChoice($)),
             $._blanks,
             choice(
               field("wfile", alias($._substitution_wfile, $.wfile)),
@@ -955,39 +945,19 @@ function editingCommandRules() {
 
     _line_terminated_editing_command: ($) =>
       seq(
-        choice(
-          $._line_terminated_regular_editing_command_body,
-          $._line_terminated_substitute_editing_command_body,
-        ),
+        addressedForms($, lineTerminated, "line_terminated"),
         optional(issueField($, "unexpected_command_text")),
       ),
 
     _recovered_line_terminated_editing_command: ($) =>
-      choice(
-        prec.right(
-          seq(
-            $._line_terminated_regular_editing_command_body,
-            optional(issueField($, "unexpected_command_text")),
-            issueField($, "forbidden_command_separator"),
-            optional($._blanks),
-          ),
-        ),
-        prec.right(
-          seq(
-            $._line_terminated_substitute_editing_command_body,
-            optional(issueField($, "unexpected_command_text")),
-            issueField($, "command_after_write_flag"),
-            optional($._blanks),
-          ),
+      prec.right(
+        seq(
+          $._line_terminated_editing_command,
+          issueField($, "forbidden_command_separator"),
+          optional($._blanks),
         ),
       ),
 
-    _line_terminated_regular_editing_command_body: ($) =>
-      addressedForms($, lineTerminated, "line_terminated"),
-
-    _line_terminated_substitute_editing_command_body: ($) =>
-      addressedFunction($, $._line_terminated_substitute_function),
-
     _recovered_editing_command: ($) =>
       choice(
         addressedFunction($, $._unknown_function),
@@ -1034,10 +1004,7 @@ function editingCommandRules() {
     _missing_function: ($) => missingAtEndOrBoundary($, "missing_function"),
 
     _chainable_substitute_function: ($) =>
-      alias($._substitute_function_without_write, $.substitute_function),
-
-    _line_terminated_substitute_function: ($) =>
-      alias($._substitute_function_with_write, $.substitute_function),
+      alias($._substitute_function, $.substitute_function),
 
     negation: ($) =>
       seq(
@@ -1250,16 +1217,6 @@ function issueDefinitions(mode) {
       outcome: "undefined_syntax",
       rule: ($) => $._translate_nonportable_escape,
     },
-    {
-      reason: "command_after_write_flag",
-      outcome: "undefined_syntax",
-      rule: () => token.immediate(";"),
-    },
-    {
-      reason: "flag_after_write_flag",
-      outcome: "undefined_syntax",
-      rule: ($) => postWriteSubstitutionFlagChoice($),
-    },
     {
       reason: "equivalence_class_range_start",
       outcome: "unspecified_syntax",

package/common/regex.js

@@ -340,6 +340,14 @@ 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: ($) =>
@@ -483,24 +491,10 @@ function breRules() {
       intervalExpression($, "back_open_brace", "back_close_brace"),
 
     leading_bre_dupl_symbol: ($) =>
-      choice(
-        seq(
-          issueField($, "leading_duplication_symbol"),
-          field("operator", $.bre_dupl_symbol),
-        ),
-        issueField($, "malformed_interval"),
-        issueField($, "incomplete_interval"),
-      ),
+      misplacedBreDuplSymbol($, "leading_duplication_symbol"),
 
     adjacent_bre_dupl_symbol: ($) =>
-      choice(
-        seq(
-          issueField($, "adjacent_duplication_symbol"),
-          field("operator", $.bre_dupl_symbol),
-        ),
-        issueField($, "malformed_interval"),
-        issueField($, "incomplete_interval"),
-      ),
+      misplacedBreDuplSymbol($, "adjacent_duplication_symbol"),
   };
 }
 

package/common/scanner.h

@@ -2851,16 +2851,26 @@ static bool scan_command_token(
   }
 
   if (at_command_boundary(lexer)) {
-    const TSSymbol first_marker = lexer->eof(lexer)
-      ? MISSING_FUNCTION_MARKER
-      : NONCONFORMING_MISSING_FUNCTION_MARKER;
+    static const TSSymbol boundary_markers[][2] = {
+      {MISSING_FUNCTION_MARKER, NONCONFORMING_MISSING_FUNCTION_MARKER},
+      {MISSING_LABEL_MARKER, NONCONFORMING_MISSING_LABEL_MARKER},
+      {MISSING_RFILE_MARKER, NONCONFORMING_MISSING_RFILE_MARKER},
+      {MISSING_WFILE_MARKER, NONCONFORMING_MISSING_WFILE_MARKER},
+    };
+    const unsigned variant = lexer->eof(lexer) ? 0 : 1;
     for (
-      TSSymbol offset = 0;
-      offset <= MISSING_WFILE_MARKER - MISSING_FUNCTION_MARKER;
-      offset++
+      unsigned index = 0;
+      index < sizeof(boundary_markers) / sizeof(boundary_markers[0]);
+      index++
     ) {
-      const TSSymbol marker = first_marker + offset;
-      if (emit_missing_marker(lexer, valid_symbols, marker, symbol)) {
+      if (
+        emit_missing_marker(
+          lexer,
+          valid_symbols,
+          boundary_markers[index][variant],
+          symbol
+        )
+      ) {
         return true;
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tree-sitter-sed",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "Tree-sitter grammars for POSIX sed.",
   "license": "MIT",
   "repository": "git+https://github.com/konomanoasa/tree-sitter-sed.git",