parsanol 1.3.89-x86_64-linux → 1.3.91-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a55404de3c45d09d0a74f7cc2432881f52c88c732fe8e64f8cc70f2ff0f16c36
-  data.tar.gz: 67ccdfc39337063f9b39365efc698d0fd75aaa5df9cc6f9485cb2dacb474eae2
+  metadata.gz: cc4463b1c2ebdd777a82123af6dbff3971d709251d0e2e4049f3bb83a2d3924e
+  data.tar.gz: 660ce6c9b29bbf29a3cb94f3214f53c0a20ce0b60441b1ad633c098cfe030ca5
 SHA512:
-  metadata.gz: 633a4957eabcd4dfacdc3b487ff36bf59eb7713c937f09e168bee98afa6c85d5013bdb895653c5405aa1f6f77dd909b434f69c5ac7a625370c1b488685f314f6
-  data.tar.gz: ffd4616bccad4323b03e15f966bbab36457077a1942dbc944631ba0f4ac8c5f8a6e7e8597ff5f39d95ad49f5fe8271192ee8943cdc0b0508c18f1da9e70af703
+  metadata.gz: e005bb72656514d52014a62827b08a56fb6c491f5edd61af2beb08c1f66bcae2736aa5319cb2fba4c81c116010b468979524af519fd200dd8f2672834f5f3818
+  data.tar.gz: 78d2a2f9390e3352ae4333fc856b561d4e64e5d09b0ee04c1c3d46114313f714347f0dfe85eab1eead857a06960fa677133c2130d690712352f5a943ba43c70b

data/lib/parsanol/parg/compiler.rb

@@ -421,7 +421,23 @@ module Parsanol
           Atoms::Alternative.new(*node.a.map { |child| build_atom(child) })
         when :rep
           Atoms::Repetition.new(build_atom(node.a), node.b, node.c)
-        when :opt then Atoms::Repetition.new(build_atom(node.a), 0, 1, :maybe)
+        when :opt
+          # [ … ] is the OPTIONAL form; a bracket whose elements are all
+          # character classes reads as an optional SEQUENCE of single
+          # characters (matchable empty — captures come back nil), which
+          # is almost certainly a mis-typed multi-range class
+          # (parsanol-ruby#201). One class alone stays a legitimate
+          # optional ([ %x0D ] — CRLF handling).
+          if (content = node.a).kind == :seq && content.a.length > 1 &&
+              content.a.all? { |el| el.kind == :class }
+            raise CompileError,
+                  "brackets contain a sequence of character classes: " \
+                  "[ … ] is the optional form, so each class matches one " \
+                  "character and the sequence can match empty (an as-capture " \
+                  "over it yields nil). A multi-range character class is an " \
+                  "alternation: (%x21-2f / %x3a-40 / …)"
+          end
+          Atoms::Repetition.new(build_atom(node.a), 0, 1, :maybe)
         when :pred
           if node.c == :behind
             build_lookbehind(node)

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.89"
+  VERSION = "1.3.91"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parsanol
 version: !ruby/object:Gem::Version
-  version: 1.3.89
+  version: 1.3.91
 platform: x86_64-linux
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2026-10-09 00:00:00.000000000 Z
+date: 2026-10-11 00:00:00.000000000 Z
 dependencies: []
 description: A small Ruby library for constructing parsers in the PEG (Parsing Expression
   Grammar) fashion. Parsanol provides Parslet-compatible API with additional features