parsanol 1.3.37 → 1.3.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3ee6550442261f9f42d66c0b51e9b5fe5f186c54c9b36a2932abc0410608a42
-  data.tar.gz: 9f0476cfd0d65c1642c81bf86bd36a2a0a6627d1c2978ba65f00989e84e6bd44
+  metadata.gz: 8160526df9d517b13742be64b4507b1d5ce7b036045ac28427bea31b0c1b95ab
+  data.tar.gz: dc5287c93e31034c8421274be3c383db30d0d81a896f948e30edc96fb5d7be3e
 SHA512:
-  metadata.gz: b1dbb402205ebfb234148f7f87b5d9bcf6cd201b7f72f3c73bd096c7a0c3ba092582ad1a37a543f1665fd2542d8b2c6841b5ca9e4f21525a2ecfac68e343bad7
-  data.tar.gz: dc490cc9e39a4feb101139c1fd9a2d47e5509d495cb99920f6856cf65eac3303147e8cb95c13b25f8086d2fc31cb77be5193438527e28d4d261f08f28a7842cb
+  metadata.gz: 382334b59ceb6e08c8615cbd36895d8c9c3bf5f2f7f94767b0ff3d552734d1659d85ce7e3840aac23cd756504708857cc2ca82cab15cceb855ee88954021420f
+  data.tar.gz: 68ca0460ab220b9ded30c07d1d08a2e2f368b2173d655deaef82e13ffd91564c6a0f37bb92b3c4c145fd506dfb5f3a61dbfcf2fa4fbfcf0eea45d83fd6cb0c06

data/ext/parsanol_native/Cargo.toml

@@ -28,7 +28,7 @@ rb-sys = { version = "0.9.124", features = ["global-allocator"] }
 magnus = { version = "0.9" }
 
 # parsanol parser library (from git for latest features)
-parsanol = { version = "0.7.3", features = ["ruby"] }
+parsanol = { version = "0.7.4", features = ["ruby"] }
 
 # Logging
 log = "0.4"

data/lib/parsanol/atoms/base.rb

@@ -123,6 +123,15 @@ module Parsanol
       # Override to disable caching for simple atoms.
       #
       # @return [Boolean]
+      # Single-atom JSON in the native grammar format
+      # ({"Str":{"pattern":"a"}}, ...). Protocol for dynamic-atom
+      # callbacks whose blocks return atoms: the Rust callback bridge
+      # resolves the returned value through this method.
+      def to_atom_json
+        require "parsanol/native"
+        Parsanol::GrammarSerializer.atom_json(self)
+      end
+
       def cached?
         true
       end

data/lib/parsanol/atoms/dynamic.rb

@@ -27,6 +27,9 @@ module Parsanol
         block = @block
         result = block.call(source, context)
 
+        # A nil return fails the atom (native callback parity).
+        return context.err(self, source, "dynamic block returned nil") if result.nil?
+
         # Result is a parslet atom.
         result.apply(source, context, consume_all)
       end

data/lib/parsanol/native/serializer.rb

@@ -29,6 +29,13 @@ module Parsanol
       %({"atoms":#{@atoms.to_json},"root":#{root_id}})
     end
 
+    # Grammar JSON for dynamic-atom callbacks: {"atoms":[...],"root":N}.
+    # The Rust bridge inlines the referenced atoms into a self-contained
+    # atom tree before running it.
+    def self.atom_json(atom)
+      serialize(atom)
+    end
+
     private
 
     # Serialize a single atom and return its atom_id
@@ -155,40 +162,20 @@ module Parsanol
         nil
       end
 
-      if parslet
-        # Serialize the resolved parslet inline (don't call serialize_atom to avoid double-caching)
-        serialized = case parslet
-                     when Parsanol::Atoms::Str
-                       serialize_str(parslet)
-                     when Parsanol::Atoms::Re
-                       serialize_re(parslet)
-                     when Parsanol::Atoms::Sequence
-                       serialize_sequence(parslet)
-                     when Parsanol::Atoms::Alternative
-                       serialize_alternative(parslet)
-                     when Parsanol::Atoms::Repetition
-                       serialize_repetition(parslet)
-                     when Parsanol::Atoms::Named
-                       serialize_named(parslet)
-                     when Parsanol::Atoms::Entity
-                       # Nested entity - just reference it via serialize_atom
-                       { "Entity" => { "atom" => serialize_atom(parslet) } }
-                     when Parsanol::Atoms::Lookahead
-                       serialize_lookahead(parslet)
-                     else
-                       serialize_unknown(parslet)
-                     end
-
-        # Replace the placeholder with the serialized atom
-        @atoms[atom_id] = serialized
-      else
-        # If the entity's block returns nil, create a placeholder that will fail
-        @atoms[atom_id] = {
-          "Str" => {
-            "pattern" => "\x00__UNIMPLEMENTED_ENTITY_#{atom.name}__",
-          },
-        }
-      end
+      # Serialize the resolved parslet via the normal dispatch. A
+      # uniform Entity reference keeps every atom type supported here
+      # (a duplicated inline table once dropped Dynamic/Capture/Scope
+      # and made every rule-wrapped Dynamic atom unserializable).
+      @atoms[atom_id] = if parslet
+                          { "Entity" => { "atom" => serialize_atom(parslet) } }
+                        else
+                          # If the entity's block returns nil, create a placeholder that will fail
+                          {
+                            "Str" => {
+                              "pattern" => "\x00__UNIMPLEMENTED_ENTITY_#{atom.name}__",
+                            },
+                          }
+                        end
       atom_id
     end
 

data/lib/parsanol/version.rb

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

metadata

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