parsanol 1.3.7 → 1.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39ce7a8554166a92125c5336c0f7e7f3c9011791cd0c366c037f74d6d9b73a6e
-  data.tar.gz: b33ecab1a711628c5fc4135705a5d21e7af53e48b5472fb60925664e15ce9688
+  metadata.gz: eb19c18264a1e1c6e26dfb2bab0ff9c9fd005f631423b918240a321e2470848a
+  data.tar.gz: 49af7d190c09e38ec7c46a168e0f2a20bbbfd4afe1d63b006becbe20b69e14f5
 SHA512:
-  metadata.gz: da8b989aba1451e3bcbe5a922eef7a481614e098a5e1095a5f9a8d8d6f6d8ac46fbcf7e6fe727fc06c40753d80df1fb2731d54bdf66f96d5441aaf284eb6d2bd
-  data.tar.gz: bbab802f416f69dfb61bd856549a3755b87923fb0944d9fcc06b96466ebe8cad8ac51515086b5bd40b7eb04bc3c8f813a7f6c109a9931952fc9d70c21f0304d8
+  metadata.gz: 58f02929ffcffb52c15fad2545f9fb36076e8396ec04ca90ea5c1d1a8186b5cd242b11fc415127906bccf724d3da3f175ad67c2b54ced828ad61a286802e6648
+  data.tar.gz: 3581460ba7dd3cd81634ab19fbb405c6220ac6d0084b0c9d1d13a8232d5d700346c560a76b6eaf610ff30c967b506c10fcb87879d4df46a18c2a2615feac261f

data/Cargo.lock

@@ -206,15 +206,15 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.17"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2"
+checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
 
 [[package]]
 name = "js-sys"
-version = "0.3.91"
+version = "0.3.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b49715b7073f385ba4bc528e5747d02e66cb39c6146efb66b781f131f0fb399c"
+checksum = "cc4c90f45aa2e6eacbe8645f77fdea542ac97a494bcd117a67df9ff4d611f995"
 dependencies = [
  "once_cell",
  "wasm-bindgen",
@@ -305,7 +305,8 @@ checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
 
 [[package]]
 name = "parsanol"
-version = "0.4.1"
+version = "0.5.0"
+source = "git+https://github.com/parsanol/parsanol-rs?branch=main#99a5a2f3fa292ce506cda9ea7a6d5403abd5e8a0"
 dependencies = [
  "ahash",
  "getrandom 0.3.4",
@@ -321,7 +322,8 @@ dependencies = [
 
 [[package]]
 name = "parsanol-derive"
-version = "0.4.1"
+version = "0.5.0"
+source = "git+https://github.com/parsanol/parsanol-rs?branch=main#99a5a2f3fa292ce506cda9ea7a6d5403abd5e8a0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -437,9 +439,9 @@ checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a"
 
 [[package]]
 name = "rustc-hash"
-version = "2.1.1"
+version = "2.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
+checksum = "94300abf3f1ae2e2b8ffb7b58043de3d399c73fa6f4b73826402a5c457614dbe"
 
 [[package]]
 name = "rustversion"
@@ -563,9 +565,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.114"
+version = "0.2.115"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6532f9a5c1ece3798cb1c2cfdba640b9b3ba884f5db45973a6f442510a87d38e"
+checksum = "6523d69017b7633e396a89c5efab138161ed5aafcbc8d3e5c5a42ae38f50495a"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -576,9 +578,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.114"
+version = "0.2.115"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18a2d50fcf105fb33bb15f00e7a77b772945a2ee45dcf454961fd843e74c18e6"
+checksum = "4e3a6c758eb2f701ed3d052ff5737f5bfe6614326ea7f3bbac7156192dc32e67"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -586,9 +588,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.114"
+version = "0.2.115"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03ce4caeaac547cdf713d280eda22a730824dd11e6b8c3ca9e42247b25c631e3"
+checksum = "921de2737904886b52bcbb237301552d05969a6f9c40d261eb0533c8b055fedf"
 dependencies = [
  "bumpalo",
  "proc-macro2",
@@ -599,9 +601,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.114"
+version = "0.2.115"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75a326b8c223ee17883a4251907455a2431acc2791c98c26279376490c378c16"
+checksum = "a93e946af942b58934c604527337bad9ae33ba1d5c6900bbb41c2c07c2364a93"
 dependencies = [
  "unicode-ident",
 ]
@@ -736,18 +738,18 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.8.42"
+version = "0.8.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2578b716f8a7a858b7f02d5bd870c14bf4ddbbcf3a4c05414ba6503640505e3"
+checksum = "eed437bf9d6692032087e337407a86f04cd8d6a16a37199ed57949d415bd68e9"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.42"
+version = "0.8.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e6cc098ea4d3bd6246687de65af3f920c430e236bee1e3bf2e441463f08a02f"
+checksum = "70e3cd084b1788766f53af483dd21f93881ff30d7320490ec3ef7526d203bad4"
 dependencies = [
  "proc-macro2",
  "quote",

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 = { git = "https://github.com/parsanol/parsanol-rs", rev = "3eda2c0", features = ["ruby"] }
+parsanol = { git = "https://github.com/parsanol/parsanol-rs", branch = "main", features = ["ruby"] }
 
 # Logging
 log = "0.4"

data/lib/parsanol/native/transformer.rb

@@ -323,9 +323,26 @@ module Parsanol
               all_items_are_hashes = non_hash_items.empty?
 
               if all_items_are_hashes
-                # Merge all inner hashes into merged_hash
-                item.each do |sub_item|
-                  merged_hash.merge!(sub_item) if sub_item.is_a?(Hash)
+                # Check if merging would overwrite existing keys in merged_hash.
+                # If so, this is a repetition pattern (item >> (sep >> item).repeat)
+                # and should be kept as array, not merged.
+                # Example: merged_hash={namedTypeOrRename: A}, array=[{namedTypeOrRename: B}]
+                # → should produce [{namedTypeOrRename: A}, {namedTypeOrRename: B}]
+                existing_keys = merged_hash.keys
+                shares_keys = item.any? do |sub_item|
+                  sub_item.is_a?(Hash) && sub_item.keys.intersect?(existing_keys)
+                end
+
+                if shares_keys
+                  has_non_empty_array = true
+                  item.each do |sub_item|
+                    hash_count += 1 if sub_item.is_a?(Hash)
+                  end
+                  total_items += 1
+                else
+                  item.each do |sub_item|
+                    merged_hash.merge!(sub_item) if sub_item.is_a?(Hash)
+                  end
                 end
               else
                 # Non-empty repetition with non-hash items - mark that we should keep as array

data/lib/parsanol/native.rb

@@ -57,6 +57,27 @@ module Parsanol
                                         grammar_atom)
       end
 
+      # Memory-bounded parsing without packrat cache.
+      #
+      # This creates a fresh arena and empty cache per call, bounding memory
+      # to AST size rather than input × atoms. Use for large files.
+      #
+      # @param grammar [Parsanol::Atoms::Base] Ruby grammar definition
+      # @param input [String] Input string to parse
+      # @return [Hash, Array, Parsanol::Slice] Transformed AST
+      def parse_fresh(grammar, input)
+        raise LoadError, "Native parser not available" unless available?
+
+        grammar_json = if grammar.is_a?(String)
+                         grammar
+                       else
+                         Parser.serialize_grammar(grammar)
+                       end
+
+        raw_ast = _parse_fresh_raw(grammar_json, input)
+        BatchDecoder.decode_and_flatten(raw_ast, input, Parsanol::Slice, grammar)
+      end
+
       # Parse and return RAW AST without transformation.
       #
       # This returns the raw Parslet intermediate format before any transformation.

data/lib/parsanol/slice.rb

@@ -67,6 +67,10 @@ module Parsanol
 
     alias length size
 
+    def empty?
+      content.empty?
+    end
+
     def +(other)
       self.class.new(@byte_position, content + other.to_s, @input)
     end

data/lib/parsanol/version.rb

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

metadata

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