parsanol 1.3.104-aarch64-linux → 1.3.105-aarch64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc25b50085a250243ed7d5e94c9f028ffaa48ce55c6e4b5e72a037cb97a28e5d
-  data.tar.gz: 06f110ab23f0c30e48131b740efabbb26d7be26a7960cc34c5a283754078af12
+  metadata.gz: 82bc03a0b23a9a8d7504a043a69dd3b4173924c644cd94a3261311d3a4723218
+  data.tar.gz: ff3498232d47c056f13cd1eecbc048cb2281b83b4ecda6bc775d19317906769d
 SHA512:
-  metadata.gz: 6c585244b47add8ca85ce23cadf3df96338078f7bee1864c7790843c1e0af91eabb468d8c9c231c7bb881f082d2a01a98d2f90d5744810fe68919019e7e06c07
-  data.tar.gz: d4feb4309d16fec54b1ee7ecc0c89e81ac10644869452bf7de2e9518aa479fce4e6fc90955aa3257ba47f97e4fc36c216e0248e6d1a85afecf68a4d856c38a8a
+  metadata.gz: 1de990af98a1415ae63ceaa6273172966022666518470b6d0759fb385df86db5aaa63bd5ef5e36463ba1329f08428bd36c11ee34638b5ed013851d0a82e6cc75
+  data.tar.gz: 22e439c393b64036d5b9151e7016edeae132948fca1812fb337a39d053fbf69eaacfed77603a8e96b29d03e36a3087408fd3e7c86cab41e42deddcfcf802609a

data/lib/parsanol/parg/artifact.rb

@@ -331,14 +331,33 @@ module Parsanol
         { root_name => flattened }
       end
 
+      # Recovery error wire — the rs engine's F7 shape (offset, line,
+      # column, expected at the deepest position, ranked distinct
+      # positions deepest-first), computed from the interpreter's cause
+      # tree. `message` rides along for consumers that surface the
+      # rendered text (lutaml-lml digs line/column from it).
+      # Parity with parsanol::portable::parser::MAX_RANKED_FAILURES.
+      MAX_RANKED_FAILURES = 8
+
       def recovery_error(err)
         cause = err.parse_failure_cause
-        # The raised cause can sit shallower than the real failure (a
-        # consume-all leftover reported at the partial run's end);
-        # recovery annotations carry the DEEPEST position in the cause
-        # tree — the same semantics as the rs engine's failure wire.
-        { "offset" => cause && deepest_position(cause),
-          "message" => err.message }
+        return { "offset" => nil, "message" => err.message } unless cause
+
+        ranks = collect_ranks(cause)
+        offset = ranks.keys.max
+        line, column = cause.source&.line_and_column(offset)
+        {
+          "offset" => offset,
+          "line" => line,
+          "column" => column,
+          # The deepest entry mirrors ranked's head — same as the rs
+          # wire, where failure_wire and ranked[0] agree.
+          "expected" => ranks[offset] || [],
+          "ranked" => ranks.sort_by { |pos, _| -pos }
+            .first(MAX_RANKED_FAILURES)
+            .map { |pos, labels| [pos, labels] },
+          "message" => err.message,
+        }
       end
 
       def deepest_position(cause)
@@ -351,6 +370,22 @@ module Parsanol
         max
       end
 
+      # Distinct failure positions with the labels expected at each —
+      # every cause node contributes its position and message; deeper
+      # duplicates of the same position merge. Capped like the rs wire
+      # (MAX_RANKED_FAILURES) at the reader, deepest first.
+      def collect_ranks(cause, into = {})
+        labels = into[cause.position] ||= []
+        text = cause.message.to_s
+        labels << text unless labels.include?(text)
+        Array(cause.children).each do |child|
+          next if child.nil?
+
+          collect_ranks(child, into)
+        end
+        into
+      end
+
       # Journaling re-parse — always on the Ruby engine (journaling
       # rides the interpreter's diagnostic reparse; the native engine
       # has no journal). Tree parity with the native engine is enforced

data/lib/parsanol/version.rb

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

metadata

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