asciichem 0.28.0 → 0.28.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fb92ff1cd35eeb546372b2ac9c3cf97b908971409e9a1d473b575479464e356
-  data.tar.gz: 2cc3be9f85b7ca2d7e3fe773e981073b6a755344cc6b593b1940666653fb52e7
+  metadata.gz: 9e4646420eb8fdde22a218b2f65d6b4dce4661264124f98d1fd4716eb82a7faf
+  data.tar.gz: 1dd763180c8466a8c0245e0147b4f79201f8e40957586a8392827d8bf21fea11
 SHA512:
-  metadata.gz: 6d2f065122017d83a4e0fdb5a9da9db50a9dbd321e335a9f49bce5c3d253e78ae11f7ae33899ad4ce60fa28b9053a085f4cac7acefbd22999c88287fc0d38d2d
-  data.tar.gz: 369b73e26be9c6234fd36c6a2e5d14b53a8746a5fa44c7bc5949297cc17978e6a135e4f003a90641ad7e63a2ce4dd400e05107bb79157628028f14bc68104ac2
+  metadata.gz: 9783079bd787334d96149f8f7826bb80c0314aec5b9a4d45ba7be96b6b4a52ff43bce3f962c273c6bdbf2f6d78a4721a011f32a5ef2897a4fbcd99af5f074ef9
+  data.tar.gz: 2edf62206b51e7fa1cf97181976a19b8903f00bb4d5cd9cfbffc1c1a5750dfa0bb60d3f356f8b4031ce17cca1f142f147268f2aaa3ddb65ee8459c4c4130f2f8

data/.github/workflows/ci.yml

@@ -16,6 +16,10 @@ jobs:
       - uses: actions/checkout@v4
       - name: Clone conformance corpus (asciichem-tests)
         run: git clone --depth 1 https://github.com/asciichem/asciichem-tests.git ../asciichem-tests
+      - name: Record corpus version for the conformance report
+        run: |
+          git -C ../asciichem-tests fetch --depth 1 --tags --quiet
+          echo "ASCIICHEM_CORPUS_VERSION=$(git -C ../asciichem-tests describe --tags --abbrev=0 2>/dev/null || echo main)" >> "$GITHUB_ENV"
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}

data/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to AsciiChem are documented here.
 This project follows [Semantic Versioning](https://semver.org/).
 
+## [0.28.2] - 2026-09-14
+
+### Fixed
+- Conformance reports now name the corpus version CI actually ran
+  (derived from the cloned asciichem-tests tag) instead of a stale
+  default. Pairs with asciichem-tests v0.4.0 (MathML golden suite).
+
+## [0.28.1] - 2026-09-14
+
+### Fixed
+- Cascade transform is engine-agnostic: CascadeBuilder#canonicalise_hash
+  wraps scalar arrow/products values instead of Array(hash), which
+  enumerates a Hash. The parsanol 1.3.13 re-check (221/221 corpus-green
+  through the unmodified grammar) surfaced the shape; parslet is
+  unaffected. Spec'd for all three engine shapes.
+
 ## [0.28.0] - 2026-09-14
 
 ### Changed

data/benchmarks/README.md

@@ -15,6 +15,7 @@ WORKLOAD = ["H_2O", "Ca^2+", "SO_4^2-", "(R)-CH_3CH(OH)COOH",
 |---|---|---|---|
 | Ruby (parslet), 3.4.8 arm64 | 29.1 ms | ~2.9 ms | `bundle exec ruby benchmarks/engines.rb` |
 | Ruby + parse+text | 35.3 ms | ~3.5 ms | round-trip adds the formatter |
+| Ruby (parsanol compat, :ruby), 1.3.13 | 19.9 ms | ~2.0 ms | `benchmarks/parsanol_recheck.rb`, same session as the 11.8 ms parslet baseline below |
 | TypeScript (peggy), Node 24 | 0.19 ms | ~19 µs | `npm run bench` (asciichem-ts) |
 | Python (RD), 3.10 | 3.94 ms | ~394 µs | `python benchmarks/engines.py` (asciichem-py) |
 
@@ -54,3 +55,33 @@ upstream in parsanol-ruby#25):
 Revisit trigger unchanged: engage the native backend for full
 grammars, fix the repetition-termination bug, and beat parslet on
 this workload — then re-run the corpus against the port.
+
+### Re-check (2026-09-14, parsanol 1.3.13)
+
+The upstream "native by default" + RepetitionTag work landed, so the
+revisit trigger was tested (`benchmarks/parsanol_recheck.rb`):
+
+1. **The repetition-termination bug is fixed.** `SO_4^2-` parses and
+   round-trips, and the unmodified grammar passes the entire shared
+   corpus through the `Parsanol::Parslet` compat layer —
+   **221/221** parse/reject/round-trip cases identical to parslet.
+   One divergence surfaced on our side and is fixed in the gem:
+   parsanol's transform delivers cascade tail segments as scalar
+   hashes, and `CascadeBuilder#canonicalise_hash` used `Array(hash)`
+   (which enumerates a Hash instead of wrapping it) — now wraps
+   explicitly, engine-agnostic.
+2. **Perf (compat, :ruby forced):** 19.9 ms vs 11.8 ms per 10-input
+   pass in the same session — **~1.7x slower than parslet** (down
+   from ~6x in the first investigation). Correct but not a win.
+3. **Native still cannot serialize full parslet grammars** — two
+   upstream bugs (reported in parsanol-ruby#25):
+   `native.rb` never loads `native/dynamic` (NameError silently
+   falls back to :ruby), and `Dynamic.register` never increments
+   `@next_id`, so the second lazily-bound rule panics the Rust core
+   with "callback ID 1000000 is already registered".
+
+**Verdict: still not adopted — but one small upstream fix away from
+a meaningful re-measure.** Corpus correctness is already there; the
+native path is the whole point and remains unmeasurable until
+serialization survives a multi-rule grammar.
+

data/benchmarks/parsanol_recheck.rb

@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+
+# Parsanol re-check (parsanol-ruby 1.3.13, post-issue-25): runs the
+# UNMODIFIED AsciiChem grammar over the Parsanol engine via the
+# Parslet compat shim, then (1) gates on the shared corpus, (2) gates
+# on the issue-25 EOF repro, (3) measures against the parslet path.
+#
+# Native mode cannot serialize this grammar today (two upstream bugs:
+# native.rb never loads native/dynamic; Dynamic.register never
+# increments @next_id so the second callback panics the Rust core —
+# parsanol-ruby#25). The measurement therefore forces :ruby, the
+# only working mode for full parslet grammars via the shim.
+#
+# Run from asciichem-ruby/:
+#   ruby -I /tmp/parsanol_spike -I ../parsanol/parsanol-ruby/lib benchmarks/parsanol_recheck.rb
+require "benchmark/ips"
+require "asciichem"
+require "json"
+
+Parsanol::Native.singleton_class.define_method(:available?) { false } # spike: force :ruby
+
+puts "parsanol #{Parsanol::VERSION} | parslet-compat Parser=#{Parsanol::Parslet::Parser}"
+puts "AsciiChem::Grammar superclass: #{AsciiChem::Grammar.superclass}"
+
+# -- 1. Issue-25 repro: repeat-of-maybe at end of input --------------
+begin
+  formula = AsciiChem.parse("SO_4^2-")
+  puts "issue-25 repro SO_4^2-: PARSES -> #{formula.to_text.inspect}"
+rescue AsciiChem::ParseError => e
+  puts "issue-25 repro SO_4^2-: FAILS -> #{e.message[0, 100]}"
+end
+
+# -- 2. Shared-corpus gate --------------------------------------------
+corpus_dir = File.expand_path("../../asciichem-tests/corpus/fixtures", __dir__)
+cases = Dir[File.join(corpus_dir, "*.json")].sort.flat_map { |p| JSON.parse(File.read(p)) }
+parser_cases = cases.select { |c| c.key?("input") && !c.key?("lint") && !c.key?("convention") }
+
+pass = fail_parse = fail_reject = fail_roundtrip = 0
+parser_cases.each do |fixture|
+  input = fixture.fetch("input")
+  if fixture.fetch("parses")
+    begin
+      formula = AsciiChem.parse(input)
+      if fixture["roundTrip"] && formula.to_text != input
+        fail_roundtrip += 1
+        puts "  ROUNDTRIP DIFF: #{input.inspect} -> #{formula.to_text.inspect}" if fail_roundtrip <= 5
+      end
+      pass += 1
+    rescue AsciiChem::ParseError, Parslet::ParseFailed => e
+      fail_parse += 1
+      puts "  PARSE FAIL: #{input.inspect} -> #{e.message[0, 90]}" if fail_parse <= 8
+    end
+  else
+    begin
+      AsciiChem.parse(input)
+      fail_reject += 1
+      puts "  SHOULD REJECT: #{input.inspect}" if fail_reject <= 8
+    rescue AsciiChem::ParseError, Parslet::ParseFailed
+      pass += 1
+    end
+  end
+end
+total = parser_cases.length
+puts format("corpus gate: %d/%d ok (parse-fails %d, should-reject %d, roundtrip-diffs %d)",
+            pass, total, fail_parse, fail_reject, fail_roundtrip)
+
+# -- 3. Performance ----------------------------------------------------
+WORKLOAD = [
+  "H_2O", "Ca^2+", "SO_4^2-", "(R)-CH_3CH(OH)COOH",
+  "2H_2 + O_2 -> 2H_2O", "N_2 + 3H_2 <=>[Fe][400C] 2NH_3",
+  "C1-C-C-C-C-C1", "CH_3-CH_2-OH",
+  '^14C @name("carbon-14") @cas("14104-86-4")',
+  "A ->[heat] B ->[cool] C",
+].freeze
+
+Benchmark.ips do |x|
+  x.report("parsanol parse x10") { WORKLOAD.each { |s| AsciiChem.parse(s) } }
+  x.compare!
+end

data/lib/asciichem/transform.rb

@@ -830,11 +830,18 @@ module AsciiChem
 
       def canonicalise_hash(hash)
         first = hash[:first]
-        arrows = Array(hash[:arrow])
-        products = Array(hash[:products])
-        tail = arrows.zip(products)
+        # Wrap, never Array(): Array(hash) on a scalar Hash value
+        # (the shape parsanol's transform delivers) would enumerate
+        # key/value pairs instead of wrapping it.
+        tail = wrap(hash[:arrow]).zip(wrap(hash[:products]))
         [first, tail]
       end
+
+      def wrap(value)
+        return [] if value.nil?
+
+        value.is_a?(Array) ? value : [value]
+      end
     end
 
     # Maps the captured stereo letter to the model's stereo symbol.

data/lib/asciichem/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AsciiChem
-  VERSION = "0.28.0"
+  VERSION = "0.28.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciichem
 version: !ruby/object:Gem::Version
-  version: 0.28.0
+  version: 0.28.2
 platform: ruby
 authors:
 - Ribose Inc.
@@ -190,6 +190,7 @@ files:
 - benchmarks/RESULTS.md
 - benchmarks/benchmark.rb
 - benchmarks/engines.rb
+- benchmarks/parsanol_recheck.rb
 - exe/asciichem
 - lib/asciichem.rb
 - lib/asciichem/citation.rb