edn-abnf 0.5.6 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3af63aa900f9f717d9f2d2a50a15ee315d7e6c08c6c1a25cf774b4ee2d9b1582
-  data.tar.gz: a3e7fccd19e0b3ce9858d023dc1217c65b624be46a88561078b32c9a3f626a9f
+  metadata.gz: 74a7d7e1c31717d2f7a42f5d44199b54066a5acdb4b624a2cc961ba02356df53
+  data.tar.gz: b229fcd8f8d792363ec1a05af94f6619a22630b52e36c01574e232d204a3e82d
 SHA512:
-  metadata.gz: 9a1c93950df83082da957bfeb9b3989981615d15c48100af5f01682532496d93d5191e5ce435b0c747c7107c86a3d9cc072e3c4f6d08296ccfa6431d42d38322
-  data.tar.gz: 7f3feae2f8db35a1206527a8b4142dfa7f28e276a85b0cad8f1b931a8c3e713a622f6dd6b3e2f35d05a0e6e6db79225eb33f387e51f364e317b80ca0f67fe76a
+  metadata.gz: 65241c695737a54fd4e4496bd463bbfeec7a257f9a82e900f6f85f45c698dbf6b5dd49fcabd0db4775d057a11675d3a17e164a22949ed3f79176d5cbfc99b544
+  data.tar.gz: bcc298642bb1ab8f8f456b76c6e7c7139bc2e96aeeffdf312869119352fa7580e369e4db28122db008d673a20f7018c6beb1927ec07a581effb615338dc3d14a

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)
@@ -64,21 +70,25 @@ 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
+    opts.on("-f", "--[no-]fallback", "use tag 999 for unknown app-extensions") do |v|
+      $options.fallback = v
+    end
   end
   op.parse!
 rescue Exception => e
   warn e
+  warn op
   exit 1
 end
 
 
 if !$options.edn
   if ARGV == []
-    puts op
+    warn op
     exit 1
   end
   $options.edn = ARGF.read
@@ -152,7 +162,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.6"
+  s.version = "0.5.8"
   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

@@ -5,11 +5,26 @@ end
 require 'treetop'
 require_relative './edngrammar'
 
+class CBOR_DIAG::App_ # fallback!
+  def self.decode(app_prefix, s)
+    if CBOR::Sequence === s
+      args = s.elements
+    else
+      args = [s]
+    end
+    CBOR::Tagged.new(999, [app_prefix, args])
+  end
+end
+
 module EDNGRAMMAR
   const_set(:APPS, Hash.new { |h, k|
               h[k] = begin ::CBOR_DIAG.const_get("App_#{k.downcase}")
                      rescue NameError
-                       raise ArgumentError, "cbor-diagnostic: Unknown application-oriented extension '#{k}'", caller
+                       if $options.fallback
+                         ::CBOR_DIAG::App_
+                       else
+                         raise ArgumentError, "cbor-diagnostic: Unknown application-oriented extension '#{k}'", caller
+                       end
                      end
             }) unless const_defined?(:APPS)
 end
@@ -24,6 +39,26 @@ class Treetop::Runtime::SyntaxNode
   def hex_value
     text_value.to_i(16)
   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
+      end
+    end
+    failure_index = intv.begin
+    failure_line = node.input.line_of(failure_index)
+    failure_column = node.input.column_of(failure_index)
+    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
+    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.6
+  version: 0.5.8
 platform: ruby
 authors:
 - Carsten Bormann
 bindir: bin
 cert_chain: []
-date: 2025-05-15 00:00:00.000000000 Z
+date: 2025-07-05 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