edn-abnf 0.5.8 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74a7d7e1c31717d2f7a42f5d44199b54066a5acdb4b624a2cc961ba02356df53
-  data.tar.gz: b229fcd8f8d792363ec1a05af94f6619a22630b52e36c01574e232d204a3e82d
+  metadata.gz: 806ffbc9b5f1324cd2ae94381fc1260144ed5a8dc62c29a45d42335fb5424a19
+  data.tar.gz: bcfcf9de27c7fe957601ee45ba33dec200314ddab4015543cf2f76aec39a3c6a
 SHA512:
-  metadata.gz: 65241c695737a54fd4e4496bd463bbfeec7a257f9a82e900f6f85f45c698dbf6b5dd49fcabd0db4775d057a11675d3a17e164a22949ed3f79176d5cbfc99b544
-  data.tar.gz: bcc298642bb1ab8f8f456b76c6e7c7139bc2e96aeeffdf312869119352fa7580e369e4db28122db008d673a20f7018c6beb1927ec07a581effb615338dc3d14a
+  metadata.gz: d3897fe3c7e47eadb5d3d29b90ed663d397254b802ce5fe54b493dbf75a1d3a808b04426e80c5b5e15410ab75d60056b4ca0f7a8b165140a4ba72ff49950cace
+  data.tar.gz: 6aab126c0f00fc8b2b6b43bffb9bd8902c79f6ae3df2fa1f6b7a866d277ed27825aa8f48d20294b24e44f62f4d5b7b9a6452a6e33bcb234476449a9901c0b827

data/bin/edn-abnf

@@ -57,6 +57,10 @@ begin
     opts.on("-i", "--[no-]integrated", "use integrated parsers where available") do |v|
       $options.integrated = v
     end
+    opts.on("--[no-]level", "use separate level shifter") do |v|
+      $options.level = v
+      $stdout.sync = true
+    end
     opts.on("-eEDN", "--e=EDN", "supply EDN on command line") do |v|
       $options.edn = v
     end

data/edn-abnf.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "edn-abnf"
-  s.version = "0.5.8"
+  s.version = "0.5.9"
   s.summary = "CBOR Extended Diagnostic Notation (EDN) implemented in ABNF"
   s.description = %q{edn-abnf implements converters and miscellaneous tools for CBOR EDN's ABNF}
   s.author = "Carsten Bormann"

data/lib/parser/edn-util.rb

@@ -41,19 +41,45 @@ class Treetop::Runtime::SyntaxNode
   end
   def app_parser_level1_diagnostics(e, node)
     outbytes = 0
-    intv = node.interval.end...(node.interval.end+1) # default: closing '
-    node.elements.each_with_index do |el, i|
-      outbytes += el.ast.size
-      if outbytes > e.position
-        intv = el.interval
-        break
+    if $options.level                                # do manual level-shifting
+      input = node.input
+      ol1pos = l1pos = node.interval.begin
+      while outbytes <= e.position
+        outbytes += 1
+        ol1pos = l1pos
+        c1 = input[l1pos]
+        if c1 == "\\"           # escapable-s
+          c2 = input[l1pos += 1]
+          if c2 == "u"          # hexchar-s
+            c3 = input[l1pos += 1]
+            if c3 == "{"
+              l1pos = input.index("}", l1pos)
+            else
+              if (input[l1pos, 4].to_i(16) & 0xFC00) == 0xD800 # high-surrogate
+                l1pos += 6                                     # low-surrogate
+              end
+              l1pos += 3        # non-surrogate
+            end
+          end
+        end
+        l1pos += 1
+      end
+      intv = ol1pos...l1pos
+    else
+      intv = node.interval.end...(node.interval.end+1) # default: closing '
+      node.elements.each_with_index do |el, i|
+        outbytes += el.ast.size
+        if outbytes > e.position
+          intv = el.interval
+          break
+        end
       end
     end
     failure_index = intv.begin
     failure_line = node.input.line_of(failure_index)
     failure_column = node.input.column_of(failure_index)
+    reason = "** Line #{failure_line}, column #{failure_column}:\n"
     if line = node.input.lines.to_a[failure_line - 1]
-      reason = "** Line #{failure_line}, column #{failure_column}:\n"
       reason << line
       reason << "\n#{'~' * (failure_column - 1)}#{'^' * intv.size}"
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: edn-abnf
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.9
 platform: ruby
 authors:
 - Carsten Bormann
 bindir: bin
 cert_chain: []
-date: 2025-07-05 00:00:00.000000000 Z
+date: 2025-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler