parsanol 1.3.71-aarch64-linux → 1.3.73-aarch64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7521a5d8e982e8a4790eb217b8c3a3f21190247b411b6862bacb4e4a3a919af3
-  data.tar.gz: 581f51a2fb7b68a7ff5a79c149338fccd63ff4e09398fa5e5a73f1479e895104
+  metadata.gz: d44785098f80ef9ed51a27badccb31294e3866fffe8e889ab97c67f6db8a5588
+  data.tar.gz: d69ac94f5284eab7b6e6c40bfd993b62f1bab34b92e3a08532d3d1bbe8fe5686
 SHA512:
-  metadata.gz: 398da535c6500293148c92a6616cfa9bbc7834893e8911fa38f515dad0f81dce3ab0bec8ff5281c5a1ec2f1ade77b4b8d9c23244e07606f82b10fd24b802a123
-  data.tar.gz: '0293cc80cd29a221f10bb739af8b7f41a2f33c85e23598ba1599edc67edb05a6606eb36ae119c3e929034f93a33bb0e2f31546855c5b987299a18378f31209ba'
+  metadata.gz: 4c8efa1d096a9d0320ec7326d8d498a1cfa96202d23faf4b8b1f808c38e87ef63c33d706a43b2e2b65c639edaa4f1ea1f5f6c229dcdb3ec6b5dd7771d87f81de
+  data.tar.gz: f8d6456b7db1a205397117360c39335c6d9cc565cc7ebacb32ef79811f453a1061f77b8ff2abf683232c0ffbc5527572c3aa1596d951ea1f2b7dbe19557b59cd

data/lib/parsanol/3.2/parsanol_native.so

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
 name: data/lib/parsanol/3.2/parsanol_native.so
-size: 39067688 bytes
-sha256: 1336a78f2ee05d8e4599a6ee7dc70263b6774bedb1234ae109c02013c76be06c
+size: 39109176 bytes
+sha256: b3467d47089b0c1b52ea453bd75478547a0bfeeaf8a7623ee66660190afcf6c9

data/lib/parsanol/3.3/parsanol_native.so

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
 name: data/lib/parsanol/3.3/parsanol_native.so
-size: 39306936 bytes
-sha256: 1981488f1c97656d97bd2c6b2b63bcfc0bc4ca98c27ab28743dfaf32150c4ffc
+size: 39344224 bytes
+sha256: afe35b8257f519860d7baf36decde544b3ad56680ea70cbbb3d9253dab9b817c

data/lib/parsanol/3.4/parsanol_native.so

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
 name: data/lib/parsanol/3.4/parsanol_native.so
-size: 39310816 bytes
-sha256: c4e57e00acce9397e2a7607e74b5bf679e572db69db4a32659990f59ded86028
+size: 39344064 bytes
+sha256: c831fc32e5395b1eeeb08b6a7896ef18e19a3669eef191e26049886f260d1829

data/lib/parsanol/4.0/parsanol_native.so

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
 name: data/lib/parsanol/4.0/parsanol_native.so
-size: 39320888 bytes
-sha256: 23eb16a3cc0a3204738f7b315571c530bdeaad70c7fee4c5e20846f4ea13064d
+size: 39354120 bytes
+sha256: decd9a091dc652a9d564723516770ccb1520577cc243e41b3d7a8a5812c2b13a

data/lib/parsanol/native/libparsanol.so

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
 name: data/lib/parsanol/native/libparsanol.so
-size: 34928224 bytes
-sha256: 30c136ad62e8cd47f56529bd1f61218985ade298ac6f0965b4a8ec43bcef8e38
+size: 34952888 bytes
+sha256: fa8b3f171de5974c942b0d7ae3900c818e42919e7ad54873a21d30b5e2413b66

data/lib/parsanol/native/serializer.rb

@@ -78,6 +78,13 @@ module Parsanol
                      serialize_custom_ref(atom)
                    when Parsanol::Atoms::Dynamic
                      serialize_dynamic(atom)
+                   when Parsanol::Atoms::Trivia
+                     # Wire-distinct from Ignore (rs#172): the Rust
+                     # engine suppresses trivia-position diagnostics by
+                     # atom kind. Engines predating the Trivia tag
+                     # reject skip-carrying artifacts loudly (unknown
+                     # variant), which is the declared gate.
+                     serialize_trivia(atom)
                    when Parsanol::Atoms::Ignored
                      serialize_ignored(atom)
                    else
@@ -276,6 +283,15 @@ module Parsanol
             "parse this grammar with mode: :ruby"
     end
 
+    def serialize_trivia(atom)
+      inner_id = serialize_atom(atom.wrapped_atom)
+      {
+        "Trivia" => {
+          "atom" => inner_id,
+        },
+      }
+    end
+
     def serialize_ignored(atom)
       inner_id = serialize_atom(atom.wrapped_atom)
       {

data/lib/parsanol/parser.rb

@@ -49,7 +49,38 @@ module Parsanol
       def root(rule_name)
         # Remove any existing root method before redefining
         undef_method :root if method_defined?(:root)
-        define_method(:root) { __send__(rule_name) }
+        define_method(:root) do
+          atom = __send__(rule_name)
+          skip_name = self.class.skip_rule_name
+          skip_name ? Parsanol::Skip.inject(self, atom, skip_name)[0] : atom
+        end
+      end
+
+      # Declares the grammar's skip rule (parsanol-ruby#134 DSL
+      # surface): an optional match of the named rule is injected
+      # before every terminal of the root's rule tree, and the entry
+      # takes leading and trailing skips. The referenced rule (and
+      # everything it references) builds without injection; it must be
+      # non-nullable. Order-independent with +root+.
+      #
+      # @example
+      #   class MyParser < Parsanol::Parser
+      #     rule(:spaces) { match(/[ \t]/).repeat(1) }
+      #     rule(:word) { match(/[a-z]/).repeat(1).as(:w) }
+      #     rule(:doc) { word >> str(",") >> word }
+      #     skip :spaces
+      #     root :doc
+      #   end
+      #
+      def skip(rule_name)
+        @skip_rule_name = rule_name
+        nil
+      end
+
+      # The declared skip rule name, or nil (class-level; subclasses
+      # inherit unless they declare their own).
+      def skip_rule_name
+        @skip_rule_name
       end
     end
 

data/lib/parsanol/skip.rb

@@ -0,0 +1,110 @@
+# frozen_string_literal: true
+
+module Parsanol
+  # Skip-rule trivia injection for Ruby-DSL grammars (the PARG surface
+  # compiles the same semantics into artifacts; see
+  # Parsanol::PARG::Compiler#inject_skip_trivia). A parser declares
+  # `skip :trivia`; the resolved rule's atom becomes the injected
+  # optional trivia wrapper before every terminal of every rule body,
+  # with the declaration's transitive closure exempt (the skip atom
+  # must not contain itself).
+  module Skip
+    # +skip_rule_name+ resolves against the parser instance's rule
+    # methods. Returns [injected_root, skip_atom] with the wrapper
+    # built and the lint applied, or raises GrammarError for a
+    # nullable skip.
+    def self.inject(parser_instance, root_atom, skip_rule_name)
+      skip_atom = parser_instance.__send__(skip_rule_name)
+      skip_atom = skip_atom.parslet while skip_atom.is_a?(Atoms::Entity)
+
+      if VM::Compiler.new.nullable?(skip_atom)
+        raise GrammarError,
+              "skip rule must be non-nullable: a skip that can match " \
+              "empty loops forever at injection points"
+      end
+
+      injector = Injector.new(skip_atom)
+      [injector.inject(root_atom, entry: true), skip_atom]
+    end
+
+    # The injection walk. Mirrors the PARG compiler's semantics:
+    # sequences interleave the wrapper before every child, alternatives
+    # and repetitions descend, named captures descend (spans stay
+    # clean — the wrapper is Trivia: Ignored + diagnostics
+    # transparency), bare terminals gain a leading wrapper, and the
+    # entry root takes leading and trailing wrappers.
+    class Injector
+      def initialize(skip_atom)
+        @skip_atom = skip_atom
+        @wrapper_ids = {}.compare_by_identity
+      end
+
+      def inject(atom, entry: false)
+        injected = walk(atom, {})
+        return injected unless entry
+
+        Atoms::Sequence.new(maybe, injected, maybe)
+      end
+
+      private
+
+      def maybe
+        @maybe ||= begin
+          wrapper = Atoms::Trivia.new(Atoms::Repetition.new(@skip_atom, 0, 1))
+          @wrapper_ids[wrapper] = true
+          wrapper
+        end
+      end
+
+      def wrapper?(atom)
+        @wrapper_ids.key?(atom)
+      end
+
+      def walk(atom, visited)
+        return atom if visited.key?(atom)
+        return atom if atom.equal?(@skip_atom)
+
+        visited = visited.merge(atom => true)
+        case atom
+        when Atoms::Sequence
+          out = []
+          atom.parslets.each do |child|
+            injected = walk(child, visited)
+            out << maybe unless wrapper?(injected) || injected.is_a?(Atoms::Trivia)
+            out << injected
+          end
+          out.length == 1 ? out.first : Atoms::Sequence.new(*out)
+        when Atoms::Alternative
+          Atoms::Alternative.new(*atom.alternatives.map { |a| walk(a, visited) })
+        when Atoms::Repetition
+          if wrapper?(atom)
+            atom
+          else
+            Atoms::Repetition.new(walk(atom.parslet, visited), atom.min, atom.max,
+                                  atom.result_tag)
+          end
+        when Atoms::Named
+          Atoms::Named.new(walk(atom.parslet, visited), atom.name)
+        when Atoms::Lookahead
+          Atoms::Lookahead.new(walk(atom.bound_parslet, visited), atom.positive)
+        when Atoms::Ignored
+          Atoms::Ignored.new(walk(atom.wrapped_atom, visited))
+        when Atoms::Entity
+          # Rule bodies own their injection when the grammar declares
+          # skip on every rule (PARG); in the DSL surface the root tree
+          # is walked once, so descend through resolved bodies with the
+          # identity visited-set guarding recursion.
+          begin
+            walk(atom.parslet, visited)
+          rescue StandardError
+            atom
+          end
+        when Atoms::Str, Atoms::Re
+          Atoms::Sequence.new(maybe, atom)
+        else
+          atom
+        end
+      end
+    end
+  end
+end

data/lib/parsanol/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Parsanol
-  VERSION = "1.3.71"
+  VERSION = "1.3.73"
 end

data/lib/parsanol.rb

@@ -290,6 +290,7 @@ module Parsanol
   autoload :Pattern, "parsanol/pattern"
   autoload :Transform, "parsanol/transform"
   autoload :VM, "parsanol/vm"
+  autoload :Skip, "parsanol/skip"
   autoload :Parser, "parsanol/parser"
   autoload :ErrorReporter, "parsanol/error_reporter"
   autoload :Scope, "parsanol/scope"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parsanol
 version: !ruby/object:Gem::Version
-  version: 1.3.71
+  version: 1.3.73
 platform: aarch64-linux
 authors:
 - Ribose Inc.
@@ -138,6 +138,7 @@ files:
 - lib/parsanol/rig/rspec.rb
 - lib/parsanol/rope.rb
 - lib/parsanol/scope.rb
+- lib/parsanol/skip.rb
 - lib/parsanol/slice.rb
 - lib/parsanol/source.rb
 - lib/parsanol/source/line_cache.rb