parsanol 1.3.72 → 1.3.74

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd9773776674bd865171d5b4b378628a063b0dee92e2a4442fcf3fe0182262da
-  data.tar.gz: 6e8554e163d07070a54b9255d6bed7ca348fd72fd6a8968a17308814323d0d4c
+  metadata.gz: f6eac7cb7780cfacc7d2a1989e6cea0ee26edc13f3e2d133cefc4f363a8f3e2e
+  data.tar.gz: 6629c13a4cdbf3fea6378028ae736e49a547688443769278e9583bf508462087
 SHA512:
-  metadata.gz: fa0c3526c5ab79f7d9b6ed08e7523738cf6b46e2b8a6c30e2a021845d6bdeeabd5bb3e7ddd4d31f36725c1682ad94e650975289889c1bc991364d48bd9e2c8d7
-  data.tar.gz: ea7fd569d5a432d56583d76ec896c5a0c03ab8b769d9af7863041f02e64343ce1280ee226f450efde730bcb98bb4a0391fb7fcd03d3f490c7e35b133f6f427e1
+  metadata.gz: f5f374af54ca2375e94cd04d9771088b10b383ec046731ff57f2d36da85961d29ba6c2c6af2063e88836980a5bb0c1c4d8fbaaa98af98112e4cbf9b5da4dec39
+  data.tar.gz: 6f6f2ee120b8a45fe28a403504cd198225ae4833d4e8925758cc16160a0f64f4c2b005b622fec7bd0ad3ded616f402550edf0fa4893c0858434cbe825d0b48c3

data/Cargo.lock

@@ -307,9 +307,9 @@ checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
 
 [[package]]
 name = "parsanol"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "126b715ffe53b3bc75ed8ff753333e350d51aaea64a0a51a6eb8588f0786d925"
+checksum = "25d42f7d6475885046f668bdabb6f2f8c13807148811b9d1b618fd00ec07a858"
 dependencies = [
  "ahash",
  "getrandom 0.3.4",
@@ -326,9 +326,9 @@ dependencies = [
 
 [[package]]
 name = "parsanol-derive"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f1413076b79ef60c0af56973f8bbfddcc6034bd3cb47fbc5205fcd188bc8d79"
+checksum = "8ebddcf7d0b843657a5699f3cdeb7805bc934fcb8df24c6ab460d4dd345562d1"
 dependencies = [
  "proc-macro2",
  "quote",

data/ext/parsanol_cdylib/Cargo.toml

@@ -12,5 +12,5 @@ crate-type = ["cdylib"]
 doc = false
 
 [dependencies]
-# 0.13 carries rs#174 + rs#172 (Trivia diagnostics parity)
-parsanol = { version = "0.13" }
+# 0.14.0 carries the TriviaCapture atom (native capture parity)
+parsanol = { version = "0.14.0" }

data/ext/parsanol_native/Cargo.toml

@@ -29,9 +29,9 @@ magnus = { version = "0.9" }
 
 # parsanol parser library (crates.io; 0.12 carries the rs#174 native
 # backtracking fix: dynamic-dependent memoization + outcome cache)
-# parsanol parser library (crates.io; 0.13 carries the rs#172 Trivia
-# atom: native diagnostics skip trivia positions, matching ruby #145)
-parsanol = { version = "0.13.0", features = ["ruby"] }
+# parsanol parser library (crates.io; 0.14.0 carries the TriviaCapture
+# atom: native trivia-capture parity, rs#172/#152)
+parsanol = { version = "0.14.0", features = ["ruby"] }
 
 # Logging
 log = "0.4"

data/lib/parsanol/atoms/trivia.rb

@@ -29,6 +29,8 @@ module Parsanol
       # compiler derives markers from each capturer rule's first Str
       # atom, e.g. "//" => :line_comment); units not matching any
       # marker are whitespace-shaped and stay unrecorded.
+      attr_reader :capturers
+
       def initialize(atom, capturers)
         super(atom)
         @capturers = capturers

data/lib/parsanol/native/serializer.rb

@@ -78,6 +78,15 @@ module Parsanol
                      serialize_custom_ref(atom)
                    when Parsanol::Atoms::Dynamic
                      serialize_dynamic(atom)
+                   when Parsanol::Atoms::TriviaCapture
+                     # parsanol-ruby#152: the capture wrapper carries
+                     # its marker table so the native engine records
+                     # comment-shaped units into the pending channel
+                     # and attaches them to the next Named capture
+                     # under `comments:`. A distinct variant keeps the
+                     # declared gate: engines predating it reject
+                     # capture-carrying artifacts loudly.
+                     serialize_trivia_capture(atom)
                    when Parsanol::Atoms::Trivia
                      # Wire-distinct from Ignore (rs#172): the Rust
                      # engine suppresses trivia-position diagnostics by
@@ -283,6 +292,16 @@ module Parsanol
             "parse this grammar with mode: :ruby"
     end
 
+    def serialize_trivia_capture(atom)
+      inner_id = serialize_atom(atom.wrapped_atom)
+      {
+        "TriviaCapture" => {
+          "atom" => inner_id,
+          "rules" => atom.capturers.map { |marker, label| [marker, label.to_s] },
+        },
+      }
+    end
+
     def serialize_trivia(atom)
       inner_id = serialize_atom(atom.wrapped_atom)
       {

data/lib/parsanol/native/transformer.rb

@@ -298,9 +298,17 @@ module Parsanol
           is_repetition = value.is_a?(Array) && !value.empty? &&
             value.first.equal?(REPETITION_SYM)
 
+          # parsanol-ruby#152: `comments` lists are host-constructed
+          # trivia attachments, not parser repetitions — their unit
+          # hashes carry the trivia kind key, never the attachment
+          # key, so the re-keying below must not wrap them.
+          is_trivia_attachment = is_repetition && sym_key == :comments
+
           transformed = transform(value, named: true)
 
-          result[sym_key] = if is_repetition
+          result[sym_key] = if is_trivia_attachment
+                              transformed
+                            elsif is_repetition
                               if transformed.is_a?(Array)
                                 if transformed.all? do |item|
                                   item.is_a?(Hash) && item.key?(sym_key)

data/lib/parsanol/version.rb

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

metadata

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