parsanol 1.3.113 → 1.3.114

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9a04b4f0add7d25933bf9ddd041f28cf067e9b2750abb6595915d63cdd4cd3a
-  data.tar.gz: 69767361cdcb52ddeb7e0dbd4b05498e72fffe4d64639c4c5d00aad723f7c659
+  metadata.gz: c113bca1ed586242d379c7be03cda7897c6cbb2862d2305f9257cd7670b5e62b
+  data.tar.gz: 4aa6a7a5e0d7f8d7c8ab5424b89d02d6835beee3f12e8cfacefe07e07d3344b4
 SHA512:
-  metadata.gz: 8407c77dbca38833e2e2ddf189d601be84ed14f07bbe5e972feb76ce016df3f88c7725951ed20ba74b5403ad83dae25fef8d3f1259c6312e6e4158e709c037ba
-  data.tar.gz: 9fe4fd4df2ba548a686226ee50c80c60945dfad0e3719d7b1593fe9678a5a2f464df833940cb87201e86b98243c025d94ab42664b914f29ea3ca2649773c6aff
+  metadata.gz: 3259ed625a354e9d36ec43c2737f8d7c0c91e783ca6f573317f0a61a6f0268073f426cc3866721262cca167fd6ee0d7a112751741720dadf1ac9a858a3acb79d
+  data.tar.gz: 51fe65b35a4cef0f660148e90331cb0bae788710c35214baa2d0139a9e516faa0c43e75004bbd23d0874e68fdddf01fb5c437135399f2c1e2198b8742f8310f5

data/Cargo.lock

@@ -307,9 +307,9 @@ checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
 
 [[package]]
 name = "parsanol"
-version = "0.19.7"
+version = "0.19.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5233088cf0cde65b9a6e5e41d558b689becc722ccf156946c8f118049f2d3f5c"
+checksum = "86357f129e791c3b7b79a0a8a2b10c7ad00a2e0f8452224bc1cd15b81a7d5c31"
 dependencies = [
  "ahash",
  "getrandom 0.3.4",
@@ -326,9 +326,9 @@ dependencies = [
 
 [[package]]
 name = "parsanol-derive"
-version = "0.19.7"
+version = "0.19.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c84688541fbbd11509183b9c53debd924bcdbfae8cf8aca053414ea11a7aa7e9"
+checksum = "45bbd7570b3fe0a704e1db635f2f54b792d34646576794244646e88f4575c06d"
 dependencies = [
  "proc-macro2",
  "quote",

data/lib/parsanol/parg/compiler.rb

@@ -233,12 +233,24 @@ module Parsanol
       # compile time — the tree shape consumers read, opt-in via
       # `mode` in the grammar header. Engines see ordinary
       # Named atoms; identity rides the differential corpus.
-      def apply_modern_captures(atom)
+      def apply_modern_captures(atom, rule_name)
         return atom if @document.edition == "v1"
+        # A glue rule's own body compiles unwrapped (parsanol-ruby#364):
+        # the declaration means the tree never sees this subtree named,
+        # inside or out.
+        return atom if glue_rule?(rule_name)
 
         wrap_uncaptured(atom)
       end
 
+      # The `glue` declaration's verdict (parsanol-ruby#364): references
+      # to declared glue rules never wrap — the trivia exemption's
+      # "glue never becomes a capture", author-declared for rules that
+      # eat more than whitespace.
+      def glue_rule?(name)
+        @document.glue_rules.include?(name.to_s)
+      end
+
       def wrap_uncaptured(atom)
         case atom
         when Atoms::Named
@@ -254,10 +266,11 @@ module Parsanol
           # capture-producing refs both stay unwrapped; the bodies
           # agree by design.
           if trivia_only?(atom.rule_name.to_s, { atom.rule_name.to_s => true }) ||
+              glue_rule?(atom.rule_name.to_s) ||
               produces_capture?(atom.parslet)
             atom
           else
-            Atoms::Named.new(atom, atom.rule_name.to_s)
+            Atoms::Named.new(atom, atom.rule_name.to_sym)
           end
           # rubocop:enable Lint/DuplicateBranch
         when Atoms::Sequence, Atoms::Alternative
@@ -440,9 +453,10 @@ module Parsanol
         case atom
         when Atoms::Named then nil
         when Atoms::Entity
-          # Mirror wrap_uncaptured's verdicts: trivia glue and
-          # capture-producing refs both stay bare.
+          # Mirror wrap_uncaptured's verdicts: trivia glue, declared
+          # glue, and capture-producing refs all stay bare.
           unless trivia_only?(atom.rule_name.to_s, { atom.rule_name.to_s => true }) ||
+              glue_rule?(atom.rule_name.to_s) ||
               produces_capture?(atom.parslet)
             lines << "rule #{site}: reference to #{atom.rule_name} produces no capture -- " \
                      "modern mode would name it #{atom.rule_name}"
@@ -482,7 +496,7 @@ module Parsanol
           # atom_for; a mutual-reference grammar must hit the cache,
           # not rebuild), then the cache takes the wrapped tree.
           @atom_cache[name] = atom
-          atom = apply_modern_captures(atom)
+          atom = apply_modern_captures(atom, name)
           @atom_cache[name] = atom
           atom
         end

data/lib/parsanol/parg/document.rb

@@ -18,7 +18,7 @@ module Parsanol
       Test = Struct.new(:entry, :kind, :input, :expect)
 
       attr_accessor :grammar_name, :version, :edition, :source, :uses, :skip_declaration, :skip_source,
-                    :atomic_rules, :skip_capture_key, :brace_rules
+                    :atomic_rules, :skip_capture_key, :brace_rules, :glue_rules
       # R2 declared resync: rule name -> skip pattern (the span matched
       # at a recovery point is consumed as annotated error text).
       attr_reader :resyncs
@@ -60,6 +60,10 @@ module Parsanol
         # contiguously).
         @atomic_rules = []
         @brace_rules = []
+        # Rules declared `glue <name> ...` (parsanol-ruby#364): the
+        # edition-2 wrap never names them — references stay bare and
+        # the rule's own body compiles unwrapped.
+        @glue_rules = []
         @authored_rules = nil
         # R2 declared resync: rule -> skip pattern. Recovery consumes
         # each pattern match at a failure point as annotated error text

data/lib/parsanol/parg/parser.rb

@@ -338,6 +338,24 @@ module Parsanol
             skip_newlines
             next
           end
+          # `glue <rule> [<rule>...]` (parsanol-ruby#364): names rules
+          # whose references edition 2 never wraps — glue the tree must
+          # not see. Same-line names accumulate; the declaration may
+          # appear any number of times.
+          if peek&.type == :ident && peek.value == "glue"
+            advance
+            names = []
+            while peek&.type == :ident
+              names << ident.value
+            end
+            if names.empty?
+              raise ParseError, "glue must name at least one rule"
+            end
+
+            document.glue_rules.concat(names)
+            skip_newlines
+            next
+          end
           # `atomic <rule> = ...` suppresses skip-trivia injection inside
           # the rule body: token-shaped rules match their input
           # contiguously instead of spanning trivia between iterations.

data/lib/parsanol/version.rb

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

metadata

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