parsanol 1.3.82 → 1.3.83

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c56435897ed6f65bc101a9df1cdb0c0510917824295fa003893cdf7e447a32a4
-  data.tar.gz: 8308c7b4bc8179fbf7867ab1769c53b1f6759ce6ad8cd7ca2dc9362e8c5a3c58
+  metadata.gz: 3667a0a79c8a6c710e44bd1c337fe5f378751b288e549f0fd06729c8e75661c5
+  data.tar.gz: d8c8878b8134f21a117437d3ffbd7a021d472d2d73dadf5227884f1b5e7caee8
 SHA512:
-  metadata.gz: 7ad6958bee6a30a11ce020e95a1b084bd26155f7293c2c127c2ff264850da1df22bbde4eb1f321f8e442448492d5612adc25fc3ccd19fe8a65b3e9ea7a2f9731
-  data.tar.gz: 4e353b492c5113f197822c528bf37622b54bc6eae4d2a4bb73f171cbce7edadd00c96ed55928eda73a9d2746d68e14fb4fd212ec2c768bca30a733123a32c1c8
+  metadata.gz: c4440f0939c2a1cf950841762d423c1308650610ebcfc55c6567f49ff13fbe4e339c296b9d2969a8d6ced4b55a7ad80bfc29bc6d7028d8ca2e232571bc83c1cf
+  data.tar.gz: b8bdb2be3e3ccca384aac6a5d66d1a7727ead18fc83667d236aac0f870dbbc4bf6c745083e32828ef34cd06be291dab3f555c84b878759b7739e523b81b6193f

data/lib/parsanol/skip.rb

@@ -107,12 +107,15 @@ module Parsanol
         @markers = markers
         @whitespace_kind = whitespace_kind
         @wrapper_ids = {}.compare_by_identity
-        @memo = {}.compare_by_identity
-        @in_progress = {}.compare_by_identity
+        # Results keyed per injection context: the same shared atom
+        # can be reached both inside and outside repetition interiors,
+        # and the refinement injects differently there.
+        @memo = { true => {}.compare_by_identity, false => {}.compare_by_identity }
+        @in_progress = { true => {}.compare_by_identity, false => {}.compare_by_identity }
       end
 
       def inject(atom, entry: false)
-        injected = walk(atom)
+        injected = walk(atom, false)
         return injected unless entry
 
         Atoms::Sequence.new(maybe, injected, maybe)
@@ -139,55 +142,66 @@ module Parsanol
         @wrapper_ids.key?(atom)
       end
 
-      def walk(atom)
-        cached = @memo[atom]
+      # +rep_interior+: the d54a29e refinement (PARG's owner-set
+      # semantics, now aligned for the DSL): no injection inside
+      # repetition interiors except through rule references — their
+      # bodies are fresh injection scopes. Wrapping char-level
+      # terminals inside a repetition consumes trivia within the
+      # ENCLOSING capture's scope and mis-attaches recorded units when
+      # the iteration fails.
+      def walk(atom, rep_interior)
+        cached = @memo[rep_interior][atom]
         return cached if cached
-        return atom if @in_progress.key?(atom)
+        return atom if @in_progress[rep_interior].key?(atom)
         return atom if atom.equal?(@skip_atom)
 
-        @in_progress[atom] = true
+        @in_progress[rep_interior][atom] = true
         injected =
           case atom
           when Atoms::Sequence
             out = []
             atom.parslets.each do |child|
-              injected = walk(child)
-              out << maybe unless wrapper?(injected) || injected.is_a?(Atoms::Trivia)
-              out << injected
+              walked = walk(child, rep_interior)
+              unless rep_interior || wrapper?(walked) || walked.is_a?(Atoms::Trivia)
+                out << maybe
+              end
+              out << walked
             end
             out.length == 1 ? out.first : Atoms::Sequence.new(*out)
           when Atoms::Alternative
-            Atoms::Alternative.new(*atom.alternatives.map { |a| walk(a) })
+            Atoms::Alternative.new(*atom.alternatives.map { |a| walk(a, rep_interior) })
           when Atoms::Repetition
             if wrapper?(atom)
               atom
             else
-              Atoms::Repetition.new(walk(atom.parslet), atom.min, atom.max,
+              Atoms::Repetition.new(walk(atom.parslet, true), atom.min, atom.max,
                                     atom.result_tag)
             end
           when Atoms::Named
-            Atoms::Named.new(walk(atom.parslet), atom.name)
+            Atoms::Named.new(walk(atom.parslet, rep_interior), atom.name)
           when Atoms::Lookahead
-            Atoms::Lookahead.new(walk(atom.bound_parslet), atom.positive)
+            Atoms::Lookahead.new(walk(atom.bound_parslet, rep_interior), atom.positive)
           when Atoms::Ignored
-            Atoms::Ignored.new(walk(atom.wrapped_atom))
+            Atoms::Ignored.new(walk(atom.wrapped_atom, rep_interior))
           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.
+            # is walked once, so descend through resolved bodies with
+            # the in-progress set guarding recursion. A rule body is a
+            # fresh injection scope even inside a repetition interior —
+            # the d54a29e exception is for rule-reference children.
             begin
-              walk(atom.parslet)
+              walk(atom.parslet, false)
             rescue StandardError
               atom
             end
           when Atoms::Str, Atoms::Re
-            Atoms::Sequence.new(maybe, atom)
+            rep_interior ? atom : Atoms::Sequence.new(maybe, atom)
           else
             atom
           end
-        @in_progress.delete(atom)
-        @memo[atom] = injected
+        @in_progress[rep_interior].delete(atom)
+        @memo[rep_interior][atom] = injected
         injected
       end
     end

data/lib/parsanol/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parsanol
 version: !ruby/object:Gem::Version
-  version: 1.3.82
+  version: 1.3.83
 platform: ruby
 authors:
 - Ribose Inc.