parsanol 1.3.85-aarch64-linux → 1.3.86-aarch64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2fb094f721fc4cae062cf0516e8a210ac26bb9346ca4bd5ff39397218899372
-  data.tar.gz: 16d4ec0c27c22efe0dd59ad081425bc2bd1dd7a6c3bb58411460e3feb5362bc4
+  metadata.gz: 7f606f2109b455b5172f2276e4153de88a4337df99e988ecc0457e31a454ac06
+  data.tar.gz: bd2fd2fea6eeac7df53ee9dece30979005d3b6a75eea1c65c4eefd5144c21339
 SHA512:
-  metadata.gz: c72ae01c19db7e97fb61a5c787d4629d0ef439df72dfbbd021afbec09b0f70c8eb3e6010df1b84060cd18fe9247753157373f0576fc57476f4a982542f91c3b0
-  data.tar.gz: '09cb081d4143380cc4fc11530fa31328ead71172f30714ec5f7e240c8055c2d9d7057d817d54ee09b4e7ce9019c38fb3730bda821f59b720f6b6e1bb44b640b8'
+  metadata.gz: 32ebdc3762b1e9295bfc706be3e1d3350ac9f43d25c7bd8810140a797a81f25a5ae513a229f01240b716fce6c5b00625b500090891560bef0fd42c2eb36ed219
+  data.tar.gz: 61afd97e9b96b975ed99f37df1ca479356361f5d1373bdb4e4b589fd0074de4532c98f3407f18dfa763a473c107909d40e36227caa2c6ea9d7b694b73aa789f0

data/lib/parsanol/parg/compiler.rb

@@ -235,7 +235,10 @@ module Parsanol
           kids = atom.parslets.map { |child| inject_skip_trivia(child) }
           out = []
           kids.each do |child|
-            out << skip_maybe_atom unless skip_wrapper?(child)
+            # parsanol-ruby#192: no injected skip directly before a
+            # lookahead — its contract is the raw next character.
+            out << skip_maybe_atom unless skip_wrapper?(child) ||
+              child.is_a?(Atoms::Lookahead)
             out << child
           end
           out.length == 1 ? out.first : Atoms::Sequence.new(*out)
@@ -271,7 +274,11 @@ module Parsanol
           # `atomic` rules deliberately stop doing.
           Atoms::Named.new(inject_skip_trivia(atom.parslet), atom.name)
         when Atoms::Lookahead
-          Atoms::Lookahead.new(inject_skip_trivia(atom.bound_parslet), atom.positive)
+          # parsanol-ruby#192: a lookahead's contract is the RAW text
+          # ahead — injected separators inside would make keyword
+          # boundary checks examine the wrong character. Interiors
+          # stay injection-exempt, not even rule references re-scope.
+          atom
         when Atoms::Str, Atoms::Re
           # bare terminal as a whole rule body: leading trivia position
           Atoms::Sequence.new(skip_maybe_atom, atom)

data/lib/parsanol/skip.rb

@@ -109,9 +109,13 @@ module Parsanol
         @wrapper_ids = {}.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 }
+        # and the refinement injects differently there. The :exempt
+        # context (lookahead interiors, ruby#192) suppresses injection
+        # everywhere, rule references included.
+        @memo = { true => {}.compare_by_identity, false => {}.compare_by_identity,
+                  exempt: {}.compare_by_identity }
+        @in_progress = { true => {}.compare_by_identity, false => {}.compare_by_identity,
+                         exempt: {}.compare_by_identity }
       end
 
       def inject(atom, entry: false)
@@ -149,27 +153,33 @@ module Parsanol
       # 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]
+      def walk(atom, mode)
+        cached = @memo[mode][atom]
         return cached if cached
-        return atom if @in_progress[rep_interior].key?(atom)
+        return atom if @in_progress[mode].key?(atom)
         return atom if atom.equal?(@skip_atom)
 
-        @in_progress[rep_interior][atom] = true
+        @in_progress[mode][atom] = true
         injected =
           case atom
           when Atoms::Sequence
             out = []
             atom.parslets.each do |child|
-              walked = walk(child, rep_interior)
-              unless rep_interior || wrapper?(walked) || walked.is_a?(Atoms::Trivia)
+              walked = walk(child, mode)
+              # parsanol-ruby#192: no wrapper directly before a
+              # lookahead — a lookahead's contract is the raw next
+              # character, and an injected separator between a
+              # keyword and its boundary check makes the check
+              # examine the wrong character.
+              unless mode || wrapper?(walked) || walked.is_a?(Atoms::Trivia) ||
+                  walked.is_a?(Atoms::Lookahead)
                 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, rep_interior) })
+            Atoms::Alternative.new(*atom.alternatives.map { |a| walk(a, mode) })
           when Atoms::Repetition
             if wrapper?(atom)
               atom
@@ -178,11 +188,16 @@ module Parsanol
                                     atom.result_tag)
             end
           when Atoms::Named
-            Atoms::Named.new(walk(atom.parslet, rep_interior), atom.name)
+            Atoms::Named.new(walk(atom.parslet, mode), atom.name)
           when Atoms::Lookahead
-            Atoms::Lookahead.new(walk(atom.bound_parslet, rep_interior), atom.positive)
+            # parsanol-ruby#192: a lookahead's contract is the RAW
+            # text ahead — no injection inside, rule references
+            # included (an injected separator between a keyword and
+            # its boundary check makes the check examine the wrong
+            # character).
+            Atoms::Lookahead.new(walk(atom.bound_parslet, :exempt), atom.positive)
           when Atoms::Ignored
-            Atoms::Ignored.new(walk(atom.wrapped_atom, rep_interior))
+            Atoms::Ignored.new(walk(atom.wrapped_atom, mode))
           when Atoms::Entity
             # Rule bodies own their injection when the grammar declares
             # skip on every rule (PARG); in the DSL surface the root tree
@@ -191,17 +206,17 @@ module Parsanol
             # fresh injection scope even inside a repetition interior —
             # the d54a29e exception is for rule-reference children.
             begin
-              walk(atom.parslet, false)
+              walk(atom.parslet, mode == :exempt ? :exempt : false)
             rescue StandardError
               atom
             end
           when Atoms::Str, Atoms::Re
-            rep_interior ? atom : Atoms::Sequence.new(maybe, atom)
+            mode ? atom : Atoms::Sequence.new(maybe, atom)
           else
             atom
           end
-        @in_progress[rep_interior].delete(atom)
-        @memo[rep_interior][atom] = injected
+        @in_progress[mode].delete(atom)
+        @memo[mode][atom] = injected
         injected
       end
     end

data/lib/parsanol/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parsanol
 version: !ruby/object:Gem::Version
-  version: 1.3.85
+  version: 1.3.86
 platform: aarch64-linux
 authors:
 - Ribose Inc.