parsanol 1.3.21 → 1.3.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9eb43d37e76e0d2483832c1d9f9d3f32b5ea66304b21c4aa0f1c6cb86731f81c
-  data.tar.gz: adf4a7e05cddc6b4da594f4ad7fc14df058444ba13bfce9008830bbf96c37c9d
+  metadata.gz: '09e8cbdb35f892fc514bed1dbcade3fdbb9a3da37a36e021e75b55c3599da2fd'
+  data.tar.gz: 6ccb6c8bdd584e209d2fac37e8ebf1ed5c597546608cc57d93d12c62ba4c6255
 SHA512:
-  metadata.gz: 78115ec7794cd6587de1fbee17583027faabd1bc282aeda18d5cd3f26c6e1540d25f2ece6ae701de54405fc4d6fad960f030ee235c43545e70071c794aebe41a
-  data.tar.gz: 7cdfc3b8811cdd777085aec1333217602dfd0cbb19572e00c4b6b351182963495bc5add5b79b7b91eec7be3c2db61e27638f1aa43c4a591933eb7ed2c2e19c43
+  metadata.gz: 4edb7d59e2e1cd68284b49260240d09b3e43d9065508a1b93209d5ed3455b210b611f4e75b7c11bd9af823c0277d26a796252599e59a082b7d34b189e9c541c5
+  data.tar.gz: bae0c17ddd24ef7364594a1c82a65a3a8e510ea307f4630e67d6d8c140726153d016d66a9b13ce158c62d123764ab9a4385888689f145ed8b014964ef1073d0f

data/Cargo.lock

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

data/lib/parsanol/native.rb

@@ -202,14 +202,29 @@ module Parsanol
       # native serializer cannot express (e.g. custom atoms). For
       # pre-serialized JSON grammars the native message is wrapped in a
       # Parsanol::ParseFailed directly.
+      NATIVE_POS_MARKER = /\n@@parsanol_pos:(\d+)\z/
+
       def raise_native_parse_error(error, grammar, input)
+        # Native diagnostics: the Rust tracker reports the deepest
+        # failure position and the terminals expected there. Build the
+        # cause from that directly — the failure path never needs a
+        # reporter reparse. The single interpreter pass below stays only
+        # to recover inputs from grammars native cannot express.
+        if grammar.respond_to?(:parse) && (m = error.message.match(NATIVE_POS_MARKER))
+          source = Parsanol::Source.new(input)
+          success, value = grammar.run_with_context(source, nil, true)
+          return grammar.finalize_result(value) if success
+
+          pos = m[1].to_i
+          msg = error.message.sub(NATIVE_POS_MARKER, "")
+          cause = Parsanol::Cause.new(msg, source, pos)
+          raise Parsanol::ParseFailed.new(cause.to_s, cause)
+        end
+
         if grammar.respond_to?(:parse)
-          # One interpreter pass with the error reporter attached covers
-          # both jobs: a success means the native backend could not
-          # express the grammar (recover the tree), a failure raises the
-          # parslet-compatible cause tree. The native backend has
-          # already failed, so a separate plain attempt first would be a
-          # wasted parse.
+          # No native diagnostics (e.g. incomplete-input errors): one
+          # interpreter pass with the reporter attached — a success
+          # recovers the tree, a failure raises the cause tree.
           reporter = Parsanol::ErrorReporter::Tree.new
           source = Parsanol::Source.new(input)
           success, value = grammar.run_with_context(source, reporter, true)

data/lib/parsanol/version.rb

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

metadata

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