parsanol 1.3.28 → 1.3.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90a12c42d3cdf5eb70a49842ae813f2f09eb1795a14eafbff6883c995b231b42
-  data.tar.gz: b28b6cc887ef90d4adfa7f196e50392d9f427bdbce5b948cb1bf68ddc654db1b
+  metadata.gz: 21f56a5196775ab90fe91a82e7b71240bc1f48b64ed90886b947285bf760c0b7
+  data.tar.gz: 1463e0eb3af171d61f8e09f30deec7d15bc679341d129197cdb5845efd3357b3
 SHA512:
-  metadata.gz: 7219f81d7d291bb894e6cb4e7518a5daeea0e68a4411b21bd0e219167bb43c2b257bbce1193d1d4ea283ed31cd0a6aef3ba5d350c8d7abddddee9f7ec1b2430d
-  data.tar.gz: 69526091581aa03a9953af5ed69d2bda2ac118d730d2516534f68de9fbf1ca9de7f6d806acff2e0a2db5b8964984223b89c9f10345fbb2367fdc948a6863599c
+  metadata.gz: e552a716aa3cf2facea589d2310db16e14664ceefd6d1412d97fb945314dadb0ef31dbe2d835414d6d05c8dd1420386a244ce7ff7c1fba42e97ac26180d2db14
+  data.tar.gz: 16cf21e24b996b1f1a314e36c29b81c7ba3f16a303d9538886b823c94db1759b662e732fdb68a019e5adfb264e2c381de4aa7be3cc7907538173ef260c173a69

data/Cargo.lock

@@ -253,7 +253,7 @@ checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
 [[package]]
 name = "parsanol"
 version = "0.5.1"
-source = "git+https://github.com/parsanol/parsanol-rs?branch=main#3d61560a1eebb203d2373f56bdf209105e82e37b"
+source = "git+https://github.com/parsanol/parsanol-rs?branch=main#32cdbb1d3c04c9280f6fb4d2cf13f1c5befbd00f"
 dependencies = [
  "ahash",
  "getrandom 0.3.4",
@@ -270,7 +270,7 @@ dependencies = [
 [[package]]
 name = "parsanol-derive"
 version = "0.5.1"
-source = "git+https://github.com/parsanol/parsanol-rs?branch=main#3d61560a1eebb203d2373f56bdf209105e82e37b"
+source = "git+https://github.com/parsanol/parsanol-rs?branch=main#32cdbb1d3c04c9280f6fb4d2cf13f1c5befbd00f"
 dependencies = [
  "proc-macro2",
  "quote",

data/lib/parsanol/version.rb

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

data/lib/parsanol/vm.rb

@@ -43,6 +43,7 @@ module Parsanol
     RUN_RE = 24
     RUN_STR = 25
     SEQ_SIMPLE = 26
+    BYTE_DISPATCH = 27
 
     K_ALT = 0
     K_REP = 1
@@ -247,6 +248,147 @@ module Parsanol
         @ops.flatten!(1)
       end
 
+      # Conservative lead-byte table for a branch: table[b] true iff the
+      # atom can start with byte b. nil = cannot prove a constraint (no
+      # guard emitted). Conservative in the safe direction only: a guard
+      # may allow a branch that then fails normally, never reject one
+      # that could match.
+      def pairwise_disjoint?(tables)
+        seen = Array.new(256, false)
+        tables.each do |t|
+          i = 0
+          while i < 256
+            return false if t[i] && seen[i]
+
+            seen[i] = true if t[i]
+            i += 1
+          end
+        end
+        true
+      end
+
+      def first_byte_table(atom, depth = 0)
+        return nil if depth > 10
+
+        case atom
+        when Parsanol::Atoms::Str
+          b = atom.str.getbyte(0)
+          return nil unless b
+
+          t = Array.new(256, false)
+          t[b] = true
+          t
+        when Parsanol::Atoms::Re
+          byte_table(atom.re)
+        when Parsanol::Atoms::Sequence
+          t = nil
+          nullable_all = true
+          atom.parslets.each do |child|
+            ct = first_byte_table(child, depth + 1)
+            return nil if ct.nil?
+
+            if t
+              i = 0
+              while i < 256
+                t[i] ||= ct[i]
+                i += 1
+              end
+            else
+              t = ct
+            end
+            unless nullable?(child, depth + 1)
+              nullable_all = false
+              break
+            end
+          end
+          nullable_all ? nil : t
+        when Parsanol::Atoms::Alternative
+          t = nil
+          atom.alternatives.each do |branch|
+            bt = first_byte_table(branch, depth + 1)
+            return nil if bt.nil?
+
+            if t
+              i = 0
+              while i < 256
+                t[i] ||= bt[i]
+                i += 1
+              end
+            else
+              t = bt
+            end
+          end
+          t
+        when Parsanol::Atoms::Named
+          first_byte_table(atom.parslet, depth + 1)
+        when Parsanol::Atoms::Ignored
+          first_byte_table(atom.wrapped_atom, depth + 1)
+        when Parsanol::Atoms::Lookahead
+          # Positive: body's lead bytes. Negative: body's lead bytes are
+          # a safe superset (a failing !-check just fails the branch
+          # normally).
+          first_byte_table(atom.bound_parslet, depth + 1)
+        when Parsanol::Atoms::Repetition
+          # min 0 can match empty — no byte constraint exists.
+          return nil if atom.min.zero?
+
+          first_byte_table(atom.parslet, depth + 1)
+        when Parsanol::Atoms::Entity
+          inner = begin
+            atom.parslet
+          rescue StandardError
+            nil
+          end
+          return nil if inner.nil?
+
+          first_byte_table(inner, depth + 1)
+        when Parsanol::Atoms::Scope
+          inner = begin
+            atom.block.call
+          rescue StandardError
+            nil
+          end
+          return nil if inner.nil?
+
+          first_byte_table(inner, depth + 1)
+        end
+      end
+
+      # Wrapper branches (Entity/Scope) share body shapes by design.
+      # rubocop:disable-next Lint/DuplicateBranch
+      def nullable?(atom, depth = 0)
+        return false if depth > 10
+
+        case atom
+        when Parsanol::Atoms::Str then atom.str.bytesize.zero?
+        when Parsanol::Atoms::Re then false
+        when Parsanol::Atoms::Sequence
+          atom.parslets.all? { |c| nullable?(c, depth + 1) }
+        when Parsanol::Atoms::Alternative
+          atom.alternatives.any? { |c| nullable?(c, depth + 1) }
+        when Parsanol::Atoms::Repetition then atom.min.zero?
+        when Parsanol::Atoms::Named then nullable?(atom.parslet, depth + 1)
+        when Parsanol::Atoms::Ignored then nullable?(atom.wrapped_atom, depth + 1)
+        when Parsanol::Atoms::Lookahead then true
+        when Parsanol::Atoms::Entity, Parsanol::Atoms::Scope
+          nullable_wrapped?( # rubocop:disable Lint/DuplicateBranch -- Entity/Scope differ only in accessor
+            -> { atom.is_a?(Parsanol::Atoms::Entity) ? atom.parslet : atom.block.call }, depth
+          )
+        else false
+        end
+      end
+
+      # Entity and Scope wrap lazily-resolvable inners through different
+      # accessors; the nullability logic is shared.
+      def nullable_wrapped?(resolver, depth)
+        inner = begin
+          resolver.call
+        rescue StandardError
+          nil
+        end
+        !inner.nil? && nullable?(inner, depth + 1)
+      end
+
       def compile_atom(atom, consume_all)
         case atom
         when Parsanol::Atoms::Str
@@ -282,6 +424,37 @@ module Parsanol
           count = alts.size
           return nil if count.zero?
 
+          # First-set discrimination: when every branch has a provable
+          # lead-byte table and the tables are pairwise disjoint, at most
+          # one branch can match any input — dispatch directly to the
+          # viable branch (or fail) in one lookup. Shared lead bytes
+          # fall back to the plain CHOICE machinery untouched.
+          tables = alts.map { |a| first_byte_table(a) }
+          if tables.all? && pairwise_disjoint?(tables)
+            dispatch_idx = emit(BYTE_DISPATCH, nil, nil, nil)
+            starts = []
+            idx = 0
+            while idx < count
+              starts << flat(@ops.size)
+              return nil unless compile_atom(alts[idx], consume_all)
+
+              idx += 1
+            end
+            table = Array.new(256, -1)
+            tables.each_with_index do |t, bi|
+              pc_i = starts[bi]
+              bi2 = bi
+              j = 0
+              while j < 256
+                table[j] = pc_i if t[j]
+                j += 1
+              end
+              bi2
+            end
+            patch(dispatch_idx, 1, table)
+            return self
+          end
+
           jumps = []
           idx = 0
           while idx < count
@@ -793,6 +966,11 @@ module Parsanol
               frames.slice!(cbase..)
               pc += 4
             end
+          when BYTE_DISPATCH
+            table = ops[pc + 1]
+            b = pos < n ? bytes[pos] : -1
+            target = b == -1 ? -1 : table[b]
+            pc = target >= 0 ? target : FAIL
           when SEQ_SIMPLE
             kids = ops[pc + 1]
             kn = kids.size

data/parsanol.gemspec

@@ -46,22 +46,4 @@ Gem::Specification.new do |spec|
 
   # Required for Rust extension
   spec.add_dependency "rb_sys", "~> 0.9.39"
-
-  spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency "rake-compiler", "~> 1.2.0"
-  spec.add_development_dependency "rdoc", "~> 6.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-
-  # For code style checking
-  spec.add_development_dependency "rubocop", "~> 1.0"
-
-  # For Parslet compatibility verification
-  spec.add_development_dependency "parslet", "~> 2.0.0"
-
-  # For benchmarking
-  spec.add_development_dependency "benchmark-ips", "~> 2.0"
-
-  # For type checking
-  spec.add_development_dependency "rbs", "~> 3.0"
-  spec.add_development_dependency "steep", "~> 1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parsanol
 version: !ruby/object:Gem::Version
-  version: 1.3.28
+  version: 1.3.30
 platform: ruby
 authors:
 - Ribose Inc.
@@ -23,132 +23,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.39
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rake-compiler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: parslet
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-- !ruby/object:Gem::Dependency
-  name: benchmark-ips
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: rbs
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: steep
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 description: A small Ruby library for constructing parsers in the PEG (Parsing Expression
   Grammar) fashion. Parsanol provides Parslet-compatible API with additional features
   including static frozen parsers and dynamic parsers, with optional Rust native extension