parsanol 1.3.79-aarch64-linux → 1.3.80-aarch64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e9d6f048282d103bf86ad942a6a4ab886cdd63e24256fda93f318bf3b49a6af
-  data.tar.gz: 4fcce5f528a27ab4463064887177e5bbe81f71d75ed2a4740824cdc3ab93224a
+  metadata.gz: 3db21b25c629a5b9d907cf661e4bca3274008851581374dddf81f368ee1d7a03
+  data.tar.gz: 1717436f9e2cfe65ed10360126cd8324f7e4b4daa78d6225b6d1b48dd7bb9e2d
 SHA512:
-  metadata.gz: 85f8051f8ad4c6b7065f3fb88ed2ed482a56517860f59c0938086b2da5859d136b2352149288c1f1a469ef5976f0279999b4e5073e31d67ba0e5f828988ea3d0
-  data.tar.gz: b24dab2ec2f2146e79bab3cfc56e5d31dadf04980f2c29c9cfa7d9051009e69f699b81c587898e0c5723c63ff444c17c31b518ca427136da2e539aafd54311ac
+  metadata.gz: 94e3abd6b86e42bb47bec3ae815ea6e410aa932688a24d2180ab0b4df9dd93275296438bd39d90e9c559175281b16965cf157ac5b6653bd67ba577e5de03897d
+  data.tar.gz: 6eab4de294189656931273f67b7d78002796b02f0d38690e7b99294c3a24561441f335d84ba7b05823551e55c37444e313646a43c4d5c98b2859ff6b0ffff0e7

data/lib/parsanol/version.rb

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

data/lib/parsanol/vm.rb

@@ -125,11 +125,37 @@ module Parsanol
         return nil if cached.equal?(:fallback)
         return cached if key?(cache, root)
 
+        # Structure-hash probe (rs#166): a fresh parser instance (or a
+        # rule called on one) misses the identity key above and would
+        # silently recompile the ENTIRE grammar per call — the fresh-
+        # parser recompile trap (25x table transforms in coradoc,
+        # metanorma/coradoc#265). The structure hash — the same key
+        # the native grammar cache uses — lets equivalent grammars
+        # share the compiled program; identity stays as the fast
+        # first level.
+        hashed = (@programs_by_hash ||= {})
+        hash_key = begin
+          Parsanol::Native::Parser.public_structure_hash(root)
+        rescue NotImplementedError
+          # A grammar with an unimplemented lazy rule (entities resolve
+          # eagerly for hashing) has no stable structure yet; the
+          # identity cache above still serves it.
+          nil
+        end
+        if hash_key && (shared = hashed[hash_key]).is_a?(Array)
+          # The shared program's compile-time analysis (heavy-memo
+          # seeding) covered this structure; the fresh root inherits
+          # it so its first parse memoizes like the original's.
+          (@heavy ||= {}.compare_by_identity)[root] = true if @heavy_by_hash&.[](hash_key)
+          return shared
+        end
+
         # A grammar the compiler cannot compile — e.g. one containing a
         # lazily resolved Entity that a select-first literal index would
         # never select — falls back to the interpreter, the source of
         # truth. The interpreter resolves such entities lazily, so an
         # unselected branch simply never raises.
+        @last_compile_prone = nil
         program =
           begin
             compile(atom)
@@ -137,6 +163,19 @@ module Parsanol
             :fallback
           end
         cache[root] = program
+        # Only real programs share. A symbol verdict (:fallback /
+        # :oversize) is a property of this particular compile
+        # attempt's path, not of the structure: serving it to a later
+        # grammar with the same structure would silently send a
+        # compile-capable grammar to the interpreter, unseeded — the
+        # order-dependent vm_fail_dispatch failure. Verdicts stay
+        # identity-local; a fresh root recompiles and re-derives
+        # both the verdict and the heavy-memo seed naturally.
+        if hash_key && program.is_a?(Array)
+          hashed[hash_key] = program
+          (@heavy_by_hash ||= {})[hash_key] = @last_compile_prone
+          trim_hashed_cache(hashed)
+        end
         trim_cache(cache)
         # :fallback = VM-incompatible; :oversize even non-inlined means
         # the grammar is beyond the program cap — the interpreter
@@ -157,7 +196,9 @@ module Parsanol
 
       def clear_program_cache
         @programs&.clear
+        @programs_by_hash&.clear
         @heavy&.clear
+        @heavy_by_hash&.clear
       end
 
       # FIFO eviction past the cache limit.
@@ -166,6 +207,11 @@ module Parsanol
         nil
       end
 
+      def trim_hashed_cache(hashed)
+        hashed.shift while hashed.size > PROGRAM_CACHE_LIMIT
+        nil
+      end
+
       # Compiles the grammar rooted at +atom+. Returns the flat program
       # Array, or nil when the grammar uses unsupported atoms.
       def compile(atom)
@@ -205,8 +251,12 @@ module Parsanol
         # rs#166: proneness rides the structure-hash share as a bool —
         # a later identical-structure grammar inherits the seed instead
         # of running its cold start unmemoized because compilation was
-        # skipped entirely.
-        if compiler.backtracking_prone
+        # skipped entirely. Recorded on the VM singleton so the share
+        # store can read it after this compile; program_for resets it
+        # first, so a raised NotImplementedError cannot smear the
+        # previous grammar's proneness onto this one.
+        @last_compile_prone = compiler.backtracking_prone
+        if @last_compile_prone
           (@heavy ||= {}.compare_by_identity)[root] = true
           trim_cache(@heavy)
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parsanol
 version: !ruby/object:Gem::Version
-  version: 1.3.79
+  version: 1.3.80
 platform: aarch64-linux
 authors:
 - Ribose Inc.