parsanol 1.3.65 → 1.3.66

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a40f12d1d7a5fc67b1ef3255e9d9c5f4c38fd6a8fb266995974beec982728ca1
-  data.tar.gz: 297a013726a6e9ff9e81b385a8074e45afd5e9a22739e28852219f35cd1ad3a4
+  metadata.gz: da894739a391336f9b9f65a65abc87da1fe51b3f3268c0c2334638e53f5adb8f
+  data.tar.gz: 6777a602a63a37e599fdc1ed9c38f82eb8b01a30a12a23c24bbed7518f37e5cf
 SHA512:
-  metadata.gz: 6f171865bebc41146db262fcbdf5f05bdd3daf0e424cf29eaf26351408ca5d35db904057dfd64f0b57bd6a18190e48596bfd2af21ebfbf75d79a7fbc421c2bd1
-  data.tar.gz: d69f48dcc19e090e4b7c0fa880f142d9a76ff95e1aa6d8f73803558902c66621abbc7f28d24ca683ecadab7a5f6855fb88913dfecf05e5699a12780e98722ff7
+  metadata.gz: 0fad1aa5febfc712a767578c4ca4d9c9c6cf3def48ed7f6fe97a66a95e45d0e628a4285660eb14b40e6d0b72bbd6422868b85ea901d84318382f23aa5744378b
+  data.tar.gz: 6ab9b3b4461592a3a5e91accd57d0341c59c7f878985b01fd89b73fe91c8abd71eacedd6246d0c79a2fd57547607415c0932e73cfb2c2e61b3adb2af5165a9a6

data/lib/parsanol/parg/lutaml.rb

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+# Standalone requires of this file bypass the parg autoload registry —
+# declare the namespace dependency so Artifact resolves.
+require "parsanol/parg"
+
 module Parsanol
   module PARG
     # lutaml-model integration: register a PARG artifact as a lutaml-model

data/lib/parsanol/version.rb

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

data/lib/parsanol/vm.rb

@@ -175,8 +175,10 @@ module Parsanol
         compiler.to_program
       end
 
+      # Returns violation descriptions for this atom's ordered-choice
+      # branches (empty-matchable non-last branches shadow later ones).
       def validate_choice_branches(atom)
-        atom.alternatives.each_with_index do |branch, idx|
+        atom.alternatives.each_with_index.filter_map do |branch, idx|
           walk_branch = branch
           next if idx == atom.alternatives.size - 1
 
@@ -194,14 +196,13 @@ module Parsanol
           next if walk_branch.nil?
           next unless Compiler.new.nullable?(walk_branch)
 
-          raise Parsanol::GrammarError,
-                "wrong grammar: alternative branch #{idx} " \
-                "(#{branch.inspect}) can match empty input and is not " \
-                "the last branch — ordered choice commits to its empty " \
-                "match, so #{atom.alternatives.size - idx - 1} later " \
-                "branch(es) can never match at positions where it " \
-                "matches empty. Reorder branches so empty-matchable " \
-                "ones come last, or make the branch non-empty."
+          "alternative branch #{idx} (#{branch.inspect}) can match " \
+            "empty input and is not the last branch — ordered choice " \
+            "commits to its empty match, so " \
+            "#{atom.alternatives.size - idx - 1} later branch(es) can " \
+            "never match at positions where it matches empty. Reorder " \
+            "branches so empty-matchable ones come last, or make the " \
+            "branch non-empty."
         end
       end
 
@@ -211,6 +212,7 @@ module Parsanol
       # the grammar is wrong, and inputs it would mis-parse fail with a
       # baffling cause. Raise before any input is seen.
       def validate_alternatives(root)
+        violations = []
         visited = {}.compare_by_identity
         walk = lambda do |atom, depth|
           next if atom.nil? || depth > 20
@@ -219,26 +221,26 @@ module Parsanol
           visited[atom] = true
           case atom
           when Parsanol::Atoms::Alternative
-            validate_choice_branches(atom)
+            violations.concat(validate_choice_branches(atom))
             atom.alternatives.each { |c| walk.call(c, depth + 1) }
           when Parsanol::Atoms::Sequence
             atom.parslets.each { |c| walk.call(c, depth + 1) }
           when Parsanol::Atoms::Repetition, Parsanol::Atoms::Named
             walk.call(atom.parslet, depth + 1)
-          when Parsanol::Atoms::Lookahead
-            walk.call(atom.bound_parslet, depth + 1)
-          when Parsanol::Atoms::Ignored
-            walk.call(atom.wrapped_atom, depth + 1)
           when Parsanol::Atoms::Entity
+            # Rule bodies hide behind the entity wrapper; without this
+            # descent the lint passes DSL grammars that fail the same
+            # grammar compiled from PARG (where bodies are inlined).
+            # Entities that cannot resolve outside a parse are skipped.
             begin
               walk.call(atom.parslet, depth + 1)
-            rescue Parsanol::GrammarError
-              raise
             rescue StandardError
-              # Lazily resolved / recursive entity that cannot resolve
-              # outside a parse: skip this branch of the walk.
               nil
             end
+          when Parsanol::Atoms::Lookahead
+            walk.call(atom.bound_parslet, depth + 1)
+          when Parsanol::Atoms::Ignored
+            walk.call(atom.wrapped_atom, depth + 1)
           when Parsanol::Atoms::Scope
             begin
               walk.call(atom.block.call, depth + 1)
@@ -248,6 +250,11 @@ module Parsanol
           end
         end
         walk.call(root, 0)
+        return if violations.empty?
+
+        raise Parsanol::GrammarError,
+              "wrong grammar: #{violations.size} shadowed-alternative " \
+              "violation(s):\n  - #{violations.join('\n  - ')}"
       end
 
       # Executes a compiled program. Returns [true, value] on success;

metadata

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