parsanol 1.3.94 → 1.3.96

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c413057594b283af6f74b3ca1f6374ed7ad48a0e27c2f3c9f3f4bf180758dab9
-  data.tar.gz: b1189593e24fb9da236f8146b4b25a57fa027f9059034523670da67244179b18
+  metadata.gz: 3361d31dc03ae64b82fbc5ac5429f28984b387f47b6de6f4dc782a192d75a396
+  data.tar.gz: '08c24046572b0bff4f377dfd959503d2fd86aa31c442af01e5c354f0a08e6af6'
 SHA512:
-  metadata.gz: c3c9075e127783184d55858f0ee318f1ecf07d92bf5654bc8d992c04eb39a62a9d72621fa2ba73610e1f2dfb49a81f768cecf7c077b2583450188e21ca05c4d0
-  data.tar.gz: 88170ab0ecc62622bf034af9afd013c25d57a7d89ea5bed35be4c0ab53df1a68a08bfb208b819a80ef53262b7da1a644344d25106879b06ed72d243147afc163
+  metadata.gz: 87807af6107e2df8acd840da4a815a7e432fb84cdd7f5dce3b6c737122179fe2d808d9cd259829f40b41945e9f20e85d76a99f92b04d4d31e6dc9e497518af44
+  data.tar.gz: 0a0250d855f6330a8bd0f559d8a02419f448e0f402801aa9eba97272d0e683f02a8f3557f35ad4b4b6b10ca59f11035542fb55f545048eb7af0d4030c4dd81bc

data/Cargo.lock

@@ -307,9 +307,9 @@ checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
 
 [[package]]
 name = "parsanol"
-version = "0.18.8"
+version = "0.18.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92651c1fc80fad436b29aa642bec9f652bb0170f8ff0dc2a9f5b1411532fe732"
+checksum = "456a6ee7850bd50d2254b3232d537af2de447ea354a40a06a33904da899cd57b"
 dependencies = [
  "ahash",
  "getrandom 0.3.4",
@@ -326,9 +326,9 @@ dependencies = [
 
 [[package]]
 name = "parsanol-derive"
-version = "0.18.8"
+version = "0.18.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4423949424ed9894fe79f6df7fec71d5fa7549249390e9d52e34c77a78cdad13"
+checksum = "280663d376aefe51ad6850535618f67fbb281d48f6ac024fad560ee39029ace1"
 dependencies = [
  "proc-macro2",
  "quote",

data/lib/parsanol/atoms/context.rb

@@ -72,6 +72,10 @@ module Parsanol
         # and the NEXT successful Named capture attaches (and drains)
         # them under `comments:`.
         @pending_trivia = []
+
+        # Recovery journal (TODO.sota/1): non-nil only in recovery
+        # re-parses; Named captures append to the shared array.
+        @recovery_journal = Parsanol::Recovery.journal if Parsanol::Recovery.journaling?
         @evict_threshold = 200
         @evict_counter = 0
         @evict_interval = 100
@@ -327,6 +331,10 @@ module Parsanol
       # @return [Parsanol::Scope] capture variable bindings
       attr_reader :captures
 
+      # Recovery journal (TODO.sota/1): a shared array when this
+      # context was created inside a recovery re-parse; nil otherwise.
+      attr_accessor :recovery_journal
+
       # @return [Parsanol::Pools::ArrayPool] array object pool
       attr_reader :array_pool
 

data/lib/parsanol/atoms/named.rb

@@ -42,6 +42,8 @@ module Parsanol
         comments = context.take_pending_trivia
         result = wrap_result(value)
         result = attach_comments(result, comments, source) unless comments.empty?
+        # Recovery journal (TODO.sota/1): nil on every normal parse.
+        context.recovery_journal << [@name, result] if context.recovery_journal
         ok(result)
       end
 

data/lib/parsanol/native.rb

@@ -382,6 +382,20 @@ module Parsanol
             :unavailable
           end
         end
+        name_cache_version if @native_state == :loaded
+        @native_state
+      end
+
+      private
+
+      # Compiled VM programs are cached on disk across processes; naming
+      # this gem release in the cache key means a new release never runs
+      # a program an older one compiled. Extensions built before the
+      # engine grew the hook simply skip it.
+      def name_cache_version
+        return unless respond_to?(:_set_cache_version)
+
+        _set_cache_version("parsanol-ruby #{Parsanol::VERSION}")
       end
     end
   end

data/lib/parsanol/parg/artifact.rb

@@ -197,6 +197,53 @@ module Parsanol
         end
       end
 
+      # Best-effort recovery (TODO.sota/1, R1): on success returns
+      # {"ok": true, "shape": tree}; on ParseFailed returns
+      # {"ok": false, "error": {"offset", "message"}, "captures":
+      # {name => [values...]}} — the captures observed before the
+      # failure, from a journaling re-parse on the Ruby engine (tree
+      # parity with the native engine is enforced by the differential
+      # specs). The journal is best-effort: it may include captures
+      # from branches that later failed.
+      def parse_recovering(entry_name, input, mode: :native)
+        shape = parse(entry_name, input, mode: mode)
+        { "ok" => true, "shape" => shape }
+      rescue Parsanol::ParseFailed => e
+        { "ok" => false,
+          "error" => recovery_error(e),
+          "captures" => recovery_journal(entry_name, input, mode) }
+      end
+
+      def recovery_error(err)
+        pos = err.parse_failure_cause&.position
+        { "offset" => pos, "message" => err.message }
+      end
+
+      # Journaling re-parse — always on the Ruby engine (journaling
+      # rides the interpreter's diagnostic reparse; the native engine
+      # has no journal). Tree parity with the native engine is enforced
+      # by the differential specs, so the observed captures agree.
+      def recovery_journal(entry_name, input, _mode)
+        Parsanol::Recovery.start_journal
+        begin
+          parse(entry_name, input, mode: :ruby)
+        rescue Parsanol::ParseFailed
+          # expected: the journaling pass fails at the same point
+        end
+        Parsanol::Recovery.stop_journal.each_with_object({}) do |(name, value), out|
+          # Both the initial attempt and the diagnostic re-parse journal
+          # into the shared thread-local; identical observations dedupe.
+          wire = value.is_a?(Slice) ? slice_wire(value) : value
+          (out[name.to_s] ||= []) << wire
+          out[name.to_s].uniq!
+        end
+      end
+
+      def slice_wire(slice)
+        { "value" => slice.to_s, "offset" => slice.offset,
+          "length" => slice.content.length }
+      end
+
       def test_to_hash(test)
         {
           "entry" => test.entry,

data/lib/parsanol/recovery.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Parsanol
+  # Recovery journaling (TODO.sota/1): when enabled for the current
+  # thread, every Named capture appends to a shared journal for the
+  # duration of the recovery re-parse. Success paths never enable it —
+  # normal parses see only a nil-context check.
+  module Recovery
+    module_function
+
+    def start_journal
+      Thread.current[:parsanol_recovery_journal] = []
+      Thread.current[:parsanol_recovery_journaling] = true
+    end
+
+    # Stops journaling and returns the journal: [name, value] pairs in
+    # capture order, including captures from branches that later failed
+    # (best-effort superset — same semantics as the rs recovery
+    # journal).
+    def stop_journal
+      Thread.current[:parsanol_recovery_journaling] = false
+      journal
+    end
+
+    def journal
+      Thread.current[:parsanol_recovery_journal] || []
+    end
+
+    def journaling?
+      Thread.current[:parsanol_recovery_journaling] == true
+    end
+  end
+end

data/lib/parsanol/version.rb

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

data/lib/parsanol.rb

@@ -273,6 +273,7 @@ module Parsanol
   end
   module_function :exp
 
+  autoload :Recovery, "parsanol/recovery"
   autoload :Resettable, "parsanol/resettable"
   autoload :Result, "parsanol/result"
   autoload :Slice, "parsanol/slice"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parsanol
 version: !ruby/object:Gem::Version
-  version: 1.3.94
+  version: 1.3.96
 platform: ruby
 authors:
 - Ribose Inc.
@@ -150,6 +150,7 @@ files:
 - lib/parsanol/pools/position_pool.rb
 - lib/parsanol/pools/slice_pool.rb
 - lib/parsanol/position.rb
+- lib/parsanol/recovery.rb
 - lib/parsanol/resettable.rb
 - lib/parsanol/result.rb
 - lib/parsanol/result_builder.rb