edn-abnf 0.5.7 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bcd4eb027bdd536dd68495888d729d0bd74647daa157fe2ba8f674432f6a8d8
-  data.tar.gz: 3fcc1ece75ccda7eca35284880b26232f6014528d17e0abd46ef73c86c2dc7da
+  metadata.gz: 806ffbc9b5f1324cd2ae94381fc1260144ed5a8dc62c29a45d42335fb5424a19
+  data.tar.gz: bcfcf9de27c7fe957601ee45ba33dec200314ddab4015543cf2f76aec39a3c6a
 SHA512:
-  metadata.gz: c2820714dc0bca0ac2196af9f156062423db534c166de6b18dd0e243638b808d2906b3bcd2cf0e2d7fcbb6555fa42f21213c1026983ac586e1793735b21bfcd1
-  data.tar.gz: dc913cf9e16dfc2655c086042c477ac664f43ac179bfd06939cc063426360e1e62a1173f84b7413cc97a4f4b7f663a399b3eaaf7e7099f48d1c1c6feeef12614
+  metadata.gz: d3897fe3c7e47eadb5d3d29b90ed663d397254b802ce5fe54b493dbf75a1d3a808b04426e80c5b5e15410ab75d60056b4ca0f7a8b165140a4ba72ff49950cace
+  data.tar.gz: 6aab126c0f00fc8b2b6b43bffb9bd8902c79f6ae3df2fa1f6b7a866d277ed27825aa8f48d20294b24e44f62f4d5b7b9a6452a6e33bcb234476449a9901c0b827

data/bin/edn-abnf

@@ -6,6 +6,12 @@ require 'treetop'
 require 'json'
 require 'cbor-pretty'
 
+# Temporary fix for name conflicts between cbor-diag and edn-abnf
+diag_path = $LOAD_PATH.grep(/gems\/cbor-diag/).first
+edn_path = $LOAD_PATH.grep(/gems\/edn-abnf/).first
+$LOAD_PATH[$LOAD_PATH.index(diag_path)] = edn_path
+$LOAD_PATH << diag_path
+
 require_relative '../lib/edn-abnf.rb'
 
 def snaky(name)
@@ -51,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
@@ -64,7 +74,7 @@ begin
         if nm =~ /\A[a-z][a-z0-9]*\z/
           require "cbor-diagnostic-app/#{nm}"
         else
-          raise ArgumentError.new("edn-abnf: app-extension name #{nm} not valid")
+          raise ArgumentError.new("edn-abnf: app-extension name #{nm} not installed")
         end
       end
     end
@@ -156,7 +166,7 @@ end
 begin
   edn = EDN.from_edn(edn_file)
   result = edn.tree               # XXX .tree?
-rescue ArgumentError => e
+rescue CBOR_DIAG::AppParseError, ArgumentError => e
   puts "** #{e}"
   exit 1
 end

data/edn-abnf.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "edn-abnf"
-  s.version = "0.5.7"
+  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"
@@ -18,5 +18,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'treetop', '~>1'
   s.add_dependency 'json', '~>2'
   s.add_dependency 'neatjson', '~>0.10'
-  s.add_dependency 'cbor-diag'
+  s.add_dependency 'cbor-diag', '>= 0.9.8'
 end

data/lib/cbor-diagnostic-app/b64.rb

@@ -5,7 +5,7 @@ class CBOR_DIAG::App_b64
     parser = B64GRAMMARParser.new #  B? XXX
     ast = parser.parse(s)
     if !ast
-      raise ArgumentError, "cbor-diagnostic: Parse Error in b64'#{s}':\n" << EDN.reason(parser, s)
+      raise CBOR_DIAG::AppParseError.new("cbor-diagnostic: Parse Error in b64'#{s}':\n" << EDN.reason(parser, s), parser.failure_index)
     end
     # lazy -- not using parse tree...:
     t = s.gsub(/\s|#[^\n]*(?:\n|\z)/, '').chars.each_slice(4).map(&:join)

data/lib/cbor-diagnostic-app/dt.rb

@@ -11,7 +11,7 @@ class CBOR_DIAG::App_dt
     parser = DTGRAMMARParser.new
     ast = parser.parse(s)
     if !ast
-      raise ArgumentError, "cbor-diagnostic: Parse Error in dt'#{s}':\n" << EDN.reason(parser, s)
+      raise CBOR_DIAG::AppParseError.new("cbor-diagnostic: Parse Error in dt'#{s}':\n" << EDN.reason(parser, s), parser.failure_index)
     end
     frac = ast.has_frac != ""
 

data/lib/cbor-diagnostic-app/h.rb

@@ -5,7 +5,7 @@ class CBOR_DIAG::App_h
     parser = HGRAMMARParser.new
     ast = parser.parse(s)
     if !ast
-      raise ArgumentError, "cbor-diagnostic: Parse Error in h'#{s}':\n" << EDN.reason(parser, s)
+      raise CBOR_DIAG::AppParseError.new("cbor-diagnostic: Parse Error in h'#{s}':\n" << EDN.reason(parser, s), parser.failure_index)
     end
     ast.ast
   end

data/lib/cbor-diagnostic-app/ip.rb

@@ -1,12 +1,14 @@
 require_relative "ipgrammar.rb"
 require 'ipaddr'
 
+require "cbor-diagnostic-app/0"
+
 class CBOR_DIAG::App_ip
   def self.decode(app_prefix, s)
     parser = IPGRAMMARParser.new
     ast = parser.parse(s)
     if !ast
-      raise ArgumentError, "cbor-diagnostic: Parse Error in ip'#{s}':\n" << EDN.reason(parser, s)
+      raise CBOR_DIAG::AppParseError.new("cbor-diagnostic: Parse Error in ip'#{s}':\n" << EDN.reason(parser, s), parser.failure_index)
     end
     fam, ipv = ast.ast
     case app_prefix

data/lib/parser/edn-util.rb

@@ -39,6 +39,52 @@ class Treetop::Runtime::SyntaxNode
   def hex_value
     text_value.to_i(16)
   end
+  def app_parser_level1_diagnostics(e, node)
+    outbytes = 0
+    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
+      reason << "\n#{'~' * (failure_column - 1)}#{'^' * intv.size}"
+    end
+    warn reason
+  end
 end
 
 

data/lib/parser/edngrammar.rb

@@ -1696,7 +1696,12 @@ module EDNGRAMMAR
     def ast                       # XXX ignoring h and b64
       data = sqstr.ast.force_encoding(Encoding::UTF_8) # XXX undo .b
       app = app_prefix.text_value
-      ::EDNGRAMMAR::APPS[app].decode(app, data)
+      begin
+        ::EDNGRAMMAR::APPS[app].decode(app, data)
+      rescue CBOR_DIAG::AppParseError => e
+        app_parser_level1_diagnostics(e, elements[1].elements[1])
+        raise e
+      end
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: edn-abnf
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.9
 platform: ruby
 authors:
 - Carsten Bormann
 bindir: bin
 cert_chain: []
-date: 2025-05-15 00:00:00.000000000 Z
+date: 2025-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -85,14 +85,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.8
 description: edn-abnf implements converters and miscellaneous tools for CBOR EDN's
   ABNF
 email: cabo@tzi.org