parsanol 1.3.50 → 1.3.52

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88619cb26e9e27d9a68e8bef60cc387a3d49bb0452d7dde483e35288965a9d31
-  data.tar.gz: 66565201383cac8685a5607e864fc09f2f0baacee46a734169adadefe9976663
+  metadata.gz: 121bbd1e92041f8eba05a08427343d6f74dbfd02ba3d82f2f33bb9575647fc4e
+  data.tar.gz: 378d4b94192baa839526d54fcbaa102ff473b94c1bdaad15b8727b3b73405247
 SHA512:
-  metadata.gz: bffa5d597bb727763303af4dd72ad3394809fbe68a4fafeebb4dc520028ac836eea366a42548f8f02c1a76158207ecfbe52ddb9b6ce627328f32b8d61a22724d
-  data.tar.gz: bd4a8e1daf6e626d4626b90fe59c0703bab00c3a78e593f69d3e46d24b68376b5bf6002108a6d4302fc158e72ba3fd804e9df70338c46291702ce0d51aa93764
+  metadata.gz: b958e444c7c0ea0ff4dcc8830a52059debc5bdc6133e92fa315fe6519c9ac5462daa8ef4050ab69984cd8af57af87c3670f8bf73896cfb48c3851cfb3e84b7a8
+  data.tar.gz: 0ecf0b94dda3789953ea6e5f00ac21222d958b3427031aa67495d58fa05bf6a509e048983b3271f72a43dd92be1b2b26cb123e360b4d9aa7eebde68725b2d65e

data/Cargo.lock

@@ -139,9 +139,9 @@ checksum = "e4eba85ea1d0a966a983acd07deee566e67395d2d96b6fb39e62b5a833f1eb0b"
 
 [[package]]
 name = "hashbrown"
-version = "0.16.1"
+version = "0.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
+checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a"
 dependencies = [
  "allocator-api2",
  "equivalent",
@@ -252,9 +252,9 @@ checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
 
 [[package]]
 name = "parsanol"
-version = "0.8.5"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a57413139c7aacd6343dbcd65985eceaebcf9d61dfa73222e5d0d7b527a581b"
+checksum = "5709d5bc971fa4e28fccf401709ab1d275d180e447e3ab82fde7ebef2ecc787b"
 dependencies = [
  "ahash",
  "getrandom 0.3.4",
@@ -269,13 +269,20 @@ dependencies = [
 
 [[package]]
 name = "parsanol-derive"
-version = "0.8.5"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e33d7bd1f1644da4ee51892fc3289ec89826a59e692a4f7076a40dd8ba74672"
+checksum = "93258404b7032b85dffd9a60e3fb1ed003a268282b4f3385f1ab1aba98db34e5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.119",
+ "syn 3.0.6",
+]
+
+[[package]]
+name = "parsanol_cdylib"
+version = "1.3.50"
+dependencies = [
+ "parsanol",
 ]
 
 [[package]]

data/Cargo.toml

@@ -1,6 +1,6 @@
 [workspace]
 resolver = "2"
-members = ["ext/parsanol_native"]
+members = ["ext/parsanol_native", "ext/parsanol_cdylib"]
 
 [profile.release]
 opt-level = 3

data/Rakefile

@@ -64,6 +64,25 @@ namespace :gem do
     sh "rake gem:platform:any gem"
   end
 
+  # Vendor the pure-portable cdylib into PLATFORM gems (TODO.perf/9):
+  # the ruby (source) gem stays binary-free; each cross-gem carries its
+  # own triple's libparsanol next to the extension for the ffi tier
+  # (MRI resilience fallback, TruffleRuby native).
+  desc "Build ext/parsanol_cdylib for the active cross target and vendor it"
+  task "vendor_cdylib" do
+    triplet = ENV["CARGO_BUILD_TARGET"] || ENV.fetch("RUST_TARGET", nil)
+    args = ["cargo", "build", "--release", "-p", "parsanol_cdylib"]
+    args += ["--target", triplet] if triplet
+    sh(*args)
+    dir = triplet ? "target/#{triplet}/release" : "target/release"
+    name = %w[libparsanol.so libparsanol.dylib parsanol.dll]
+      .map { |n| File.join(dir, n) }
+      .find { |f| File.file?(f) }
+    raise "cdylib not found under #{dir}" unless name
+
+    cp name, "lib/parsanol/native/"
+  end
+
   desc "Define the gem task to build on any platform (compile on install)"
   task "platform:any" do
     spec = Gem::Specification.load("parsanol.gemspec").dup

data/ext/parsanol_cdylib/Cargo.toml

@@ -0,0 +1,15 @@
+[package]
+name = "parsanol_cdylib"
+version = "1.3.52"
+edition = "2021"
+description = "Vendored cdylib for parsanol platform gems: the pure-portable C ABI (no magnus) for the ffi tier"
+license = "MIT"
+publish = false
+
+[lib]
+name = "parsanol"
+crate-type = ["cdylib"]
+doc = false
+
+[dependencies]
+parsanol = { version = "0.8.8" }

data/ext/parsanol_cdylib/src/lib.rs

@@ -0,0 +1,12 @@
+//! Vendored cdylib twin of parsanol-rs's `parsanol-ffi` crate, living in
+//! the gem's ext workspace so the cross-gem build matrix can compile it
+//! per platform triple. Mirrors parsanol-ffi: linking the rlib publishes
+//! the `#[no_mangle] parsanol_c_*` exports; no wrappers.
+
+// Force the dependency into the link even under aggressive stripping.
+// Keep in sync with parsanol-rs parsanol-ffi/src/lib.rs.
+#[allow(unused_imports)]
+use parsanol::ffi::c::{
+    parsanol_c_last_error, parsanol_c_parse, parsanol_c_parse_len, parsanol_c_register,
+    parsanol_c_release,
+};

data/lib/parsanol/native/transformer.rb

@@ -18,8 +18,6 @@ module Parsanol
     #
     class AstTransformer
       # Frozen string constants for tag comparisons (avoid allocations)
-      SEQUENCE_TAG = ":sequence"
-      REPETITION_TAG = ":repetition"
       EMPTY_STRING = ""
       EMPTY_ARRAY = [].freeze
       EMPTY_HASH = {}.freeze
@@ -28,11 +26,12 @@ module Parsanol
       # This is a class variable to share across all transformations
       @@symbol_cache = {}
 
-      # Symbol tags from native parser
+      # Envelope tags. Both tiers (extension objects and the flat-u64
+      # batch wire) deliver Symbols — the encoder writes ':'-prefixed
+      # strings as TAG_SYMBOL — so there is exactly one tag form.
       SEQUENCE_SYM = :sequence
       REPETITION_SYM = :repetition
       MAYBE_SYM = :maybe
-      MAYBE_TAG = ":maybe"
 
       # `named` mirrors CanFlatten#flatten's named flag: inside a Named
       # result (.as), an absent maybe flattens to nil; unnamed it flattens
@@ -67,7 +66,8 @@ module Parsanol
         # Check if this is a tagged array from native parser
         # Native parser produces Symbol tags: [:sequence, item1, item2, ...]
         first = arr.first
-        if [SEQUENCE_SYM, SEQUENCE_TAG].include?(first)
+        case first
+        when SEQUENCE_SYM
           # Optimized: transform items starting from index 1
           # Avoid creating arr[1..] slice
           len = arr.length
@@ -80,7 +80,7 @@ module Parsanol
             i += 1
           end
           flatten_sequence(items)
-        elsif [REPETITION_SYM, REPETITION_TAG].include?(first)
+        when REPETITION_SYM
           # Optimized: transform items starting from index 1
           len = arr.length
           # Empty repetition: named → [], unnamed → "" (CanFlatten#flatten_repetition)
@@ -93,7 +93,7 @@ module Parsanol
             i += 1
           end
           flatten_repetition(items, named: named)
-        elsif [MAYBE_SYM, MAYBE_TAG].include?(first)
+        when MAYBE_SYM
           # Maybe flattens to nil-or-value (named) or ""-or-value (unnamed),
           # never to an array
           len = arr.length
@@ -103,7 +103,7 @@ module Parsanol
             flattened = transform(arr[1])
             named ? flattened : (flattened || EMPTY_STRING)
           end
-        elsif first.is_a?(Symbol) || (first.is_a?(String) && first.start_with?(":"))
+        when Symbol
           # Other tagged arrays - pass through
           arr.map { |item| transform(item) }
         else
@@ -138,11 +138,10 @@ module Parsanol
         # Transform the value
         transformed = transform(value, named: true)
 
-        # Check if value is a tagged repetition from native parser.
-        # The Rust handle path tags with Symbols, the batch decoder with
-        # ":repetition" Strings — accept both.
+        # Tagged repetition from the native parser (Symbol tag; both
+        # tiers deliver the same form).
         is_tagged_repetition = value.is_a?(Array) && !value.empty? &&
-          (value.first.equal?(REPETITION_SYM) || value.first == REPETITION_TAG)
+          value.first.equal?(REPETITION_SYM)
 
         # Check RAW value for repetition pattern BEFORE transformation
         # (bare repeated sibling captures, #36): array items that all
@@ -297,7 +296,7 @@ module Parsanol
           sym_key = cached_symbol(key)
 
           is_repetition = value.is_a?(Array) && !value.empty? &&
-            value.first.is_a?(String) && value.first == REPETITION_TAG
+            value.first.equal?(REPETITION_SYM)
 
           transformed = transform(value, named: true)
 

data/lib/parsanol/version.rb

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

data/parsanol.gemspec

@@ -39,7 +39,18 @@ Gem::Specification.new do |spec|
     Cargo.lock
   ]
   spec.files.reject! { |f| File.directory?(f) }
-  spec.files.reject! { |f| f =~ /\.(dll|so|dylib|lib|bundle)\Z/ }
+  # Cargo build trees are never gem content (a dirty local
+  # ext/parsanol_native/target once inflated a build to 218 MB).
+  spec.files.reject! { |f| f.include?("/target/") || f.start_with?("target/") }
+  # Binaries are never tracked in git, and the ruby (source) gem stays
+  # slim: the pure-portable cdylib is vendored ONLY into platform gems
+  # by the cross-gem build (rake gem:vendor_cdylib), never by a plain
+  # `gem build`.
+  spec.files.reject! do |f|
+    f =~ /\.(dll|so|dylib|lib|bundle)\Z/ &&
+      !(ENV["PARSANOL_VENDOR_CDYLIB"] == "1" &&
+        f =~ %r{\Alib/parsanol/native/libparsanol\.(so|dylib|dll)\Z})
+  end
   spec.require_paths = ["lib"]
 
   spec.required_ruby_version = ">= 3.2.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parsanol
 version: !ruby/object:Gem::Version
-  version: 1.3.50
+  version: 1.3.52
 platform: ruby
 authors:
 - Ribose Inc.
@@ -40,6 +40,8 @@ files:
 - LICENSE
 - README.adoc
 - Rakefile
+- ext/parsanol_cdylib/Cargo.toml
+- ext/parsanol_cdylib/src/lib.rs
 - ext/parsanol_native/Cargo.toml
 - ext/parsanol_native/extconf.rb
 - ext/parsanol_native/src/lib.rs