edn-abnf 0.5.30 → 0.5.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ebeb1470b1565a31939bfbca8e695d4376220f29ad26b3e299b870358f4e063
-  data.tar.gz: 6c9947fa5ca0f670c952ef8a180f4712220bf8a142488f5f040a412b8209f53f
+  metadata.gz: 13451876d6da0efdac4b2d724c6f8fca316ec0ae321e58fd6b878803e6afa9f0
+  data.tar.gz: 73d0f5f2eec9db0bba4f64c38c91ae387cb9b30f6b620c06f20752b06a932c13
 SHA512:
-  metadata.gz: 3d16fd0184ae65329b09eac63f2a27d24ccf7609bc6f2da5993272e844f58667d87dcd31163481323858fe92049dbc41beed7a7ad8ba33595ab65acf6cc2e492
-  data.tar.gz: dc225c8629265f47e3921ae6db088534e337f215d7de5f5f7152e493090fb15b740884fd4b3d0fdca35912e833355943aa259e67ba3f972fb3f3f3bedf53a653
+  metadata.gz: 3873c6f64421e73775676dea23c9bdc3bd5f195997f81e1f9d3098da06b67450c103ccdad42d4dc2fc11bf379f0f0df023a0955d806b43deca5cca7ff5dd1d56
+  data.tar.gz: 7000b01b9221e1282bb4fd0e4e67fa3f8a396ca34a9f9f3e4798b3f9a57e1fa3f9b07f36a3eb9b762a8622dc4ab668c61236979822b6f73b6b3b7d01bcfa9045

data/bin/edn-abnf

@@ -115,11 +115,12 @@ if $options.lines
     exit 1
   end
   CSV.parse(edn_file) do |ok, ednin, out|
-    if ok[0] == "#"
+    if !ok || ok[0] == "#" || ok == "op"
       puts "# #{ok}, #{ednin.inspect}, #{out}" if $options.verbose
       next
     end
     if ok[0] == "x"
+      warn "#{[ok, ednin, out].inspect}" unless ednin
       result = tree_from_edn_possibly_hex(ednin)
       result_hex = result.to_cbor.hexi
       result_diag = result.cbor_diagnostic
@@ -136,8 +137,8 @@ if $options.lines
     end
     begin
       ok = ok == "="
-      puts "➔ #{ok}, #{ednin}, #{out}" if $options.verbose
-      result = tree_from_edn_possibly_hex(ednin)
+      puts "➔ #{ok.inspect}, #{ednin.inspect}, #{out.inspect}" if $options.verbose
+      result = tree_from_edn_possibly_hex(ednin || "")
       diag = result.cbor_diagnostic
       if out == diag && !ok
           puts "** ≠ / #{diag.inspect} / #{out.inspect}"
@@ -151,7 +152,7 @@ if $options.lines
         end
         puts "reparsed / #{diag.inspect} / #{out.inspect}" if $options.verbose
       end
-    rescue ArgumentError => e
+    rescue CBOR_DIAG::AppParseError, ArgumentError => e
       if ok
         puts "** #{e} / #{result.inspect} / #{out.inspect}"
         $error += 1

data/edn-abnf.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "edn-abnf"
-  s.version = "0.5.30"
+  s.version = "0.5.31"
   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/cbor-diagnostic-app/zzz.rb

@@ -0,0 +1,13 @@
+require "cbor-diagnostic-app/0"
+
+class CBOR_DIAG::App_zzz
+  def self.decode(app_prefix, s)
+    CBOR::Tagged.new(999, [app_prefix, s])
+  end
+end
+
+class CBOR_DIAG::App_yyy
+  def self.decode(app_prefix, s)
+    CBOR::Tagged.new(999, [app_prefix, s])
+  end
+end

data/lib/parser/edngrammar.rb

@@ -356,7 +356,7 @@ module EDNGRAMMAR
         join1(s)
       else
         unless c == CBOR::Tagged && s.first.tag == 888 && s.first.value == nil # XXX check all values?
-          raise "*** unjoinable chunks #{c.inspect} #{s.inspect}" if s.size != 1
+          raise ArgumentError, "*** unjoinable chunks #{c.inspect} #{s.inspect}" if s.size != 1
         end
         s.first
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: edn-abnf
 version: !ruby/object:Gem::Version
-  version: 0.5.30
+  version: 0.5.31
 platform: ruby
 authors:
 - Carsten Bormann
@@ -112,6 +112,7 @@ files:
 - lib/cbor-diagnostic-app/hgrammar.rb
 - lib/cbor-diagnostic-app/ip.rb
 - lib/cbor-diagnostic-app/ipgrammar.rb
+- lib/cbor-diagnostic-app/zzz.rb
 - lib/edn-abnf.rb
 - lib/parser/edn-util.rb
 - lib/parser/edngrammar.rb