parsanol 1.3.90 → 1.3.91

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 990d56f1eade7c92ce7e2c2eee1fb7d40dcb5f20d65e908ca96de667f52e3e04
-  data.tar.gz: 266ccec852e0e33bd3ff716be9a4cfaa7585da8e7c1bf29150f3e06c20c2868a
+  metadata.gz: 2876669149be4d6b90a15246708d4a40ef6bb75d0d2991b53485cff21abd768e
+  data.tar.gz: 1750418bf4195336601f90f0bc67bf8dd669069440def4be0ceba728f7a0ef47
 SHA512:
-  metadata.gz: 2d83cc5f03a2e59ddad9b3dabe3b3ae2fcf4848ef0863d772838d82f2c4cb63581440e3c47e5d13dea24ca55c733c22a678f2c55438504a625b73ba7a9a3fd35
-  data.tar.gz: 426f89a6fead4a7bddcee5618881593914015e12b32abeafa470bd0a467c03f4bbca45733455978f6a4f9838a49f677f02006e2eceb9353de79947a8317b736d
+  metadata.gz: 6ba314ff5ac132d5bb04470b024e8df3b45e1736ae64a5a5ddfa743a96fbd6971211cf9e0a2fa31be1a6d24ed9b5a612ee685f6d3ad11e5e97b9adb6875c356a
+  data.tar.gz: f50c7d6d2e8dcb09588127755fdc12a60917406b3ee2be068f8309138a8d36f4c92175e661915484872aa3b989c51e306b741a30e2e11073866d992df68251ab

data/lib/parsanol/parser.rb

@@ -77,6 +77,13 @@ module Parsanol
       # `skip = trivia capture: comments` shape) instead of being
       # discarded; whitespace-shaped units never record.
       #
+      # +exempt:+ (parsanol-ruby#195) lists rule names whose bodies
+      # build WITHOUT injection — the DSL mirror of the PARG
+      # compiler's automatic skip-rule-closure exemption. Declare it
+      # for rules that manage their own trivia explicitly (expressir's
+      # remark rules): a wrapper inside them consumes text the rule
+      # itself captures, corrupting the value and double-recording it.
+      #
       # @example
       #   class MyParser < Parsanol::Parser
       #     rule(:spaces) { match(/[ \t]/).repeat(1) }

data/lib/parsanol/skip.rb

@@ -41,11 +41,46 @@ module Parsanol
 
       markers = capturer_markers(parser_instance, captures)
       whitespace_kind = whitespace&.to_sym
-      exempt_names = exempt.nil? ? nil : Set.new(exempt.map(&:to_s))
+      exempt_names = Set.new(exempt.nil? ? [] : exempt.map(&:to_s))
+      exempt_names.merge(closure_names(skip_atom))
       injector = Injector.new(skip_atom, markers, whitespace_kind, exempt_names)
       [injector.inject(root_atom, entry: true), skip_atom]
     end
 
+    # The skip rule's transitive rule-reference closure (parsanol-ruby#195
+    # follow-up): those rule bodies build without injection — the same
+    # exemption the PARG compiler applies to its skip declaration's
+    # closure. The docstring promised this; the code exempted only the
+    # skip atom itself. Rules the grammar manages explicitly stay
+    # declarable through +exempt:+ (their names merge with these).
+    def self.closure_names(skip_atom)
+      names = Set.new
+      seen = {}.compare_by_identity
+      queue = [skip_atom]
+      until queue.empty?
+        node = queue.shift
+        next if node.nil? || seen.key?(node)
+
+        seen[node] = true
+        case node
+        when Atoms::Entity
+          names << node.rule_name.to_s
+          begin
+            queue << node.parslet
+          rescue StandardError
+            nil
+          end
+        else
+          queue.concat(node.parslets) if node.respond_to?(:parslets)
+          queue.concat(node.alternatives) if node.respond_to?(:alternatives)
+          queue << node.parslet if node.respond_to?(:parslet)
+          queue << node.bound_parslet if node.respond_to?(:bound_parslet)
+          queue << node.wrapped_atom if node.respond_to?(:wrapped_atom)
+        end
+      end
+      names
+    end
+
     # Derives each capturer's leading literal (the leftmost Str the
     # rule can start with) and keys the marker table by it — the same
     # derivation the PARG compiler applies to its skip declaration. A

data/lib/parsanol/version.rb

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

metadata

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