edn-abnf 0.5.36pre2 → 0.6.1pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffe8e904ee5a50ead60bd3583dc0280908528c42d0d9def2c6d957a76a37412c
-  data.tar.gz: 7cc0afc1c2be87aad5d61006cf186209fba5ff9f5519e9b4de301f4713adfdff
+  metadata.gz: 35b0986f4a0d059f1223e057a2cd2ea5c6852e2a682ad5fa1a3c1e135b2446c7
+  data.tar.gz: 98f4bdb66e78f3b3c85edd88bcd18dbb3a832dd9153d178a79f89baf911ac109
 SHA512:
-  metadata.gz: 4b22f6dc393b06caf005b9a912570c710face625647d710c5ec34ebc26d2c2be64d6f7e5c292f6bada972b3f4cb4375a114fea0e6196b388eeba6eedd36a4fde
-  data.tar.gz: fc1d29a21c85fb0e16beb271df70397a930aaebc6155f9dd348c9e8494d09b03904d811472fcb65123f0fad01461c3b0b458a36858bf964725de099192684031
+  metadata.gz: 3e7ce39d92102381078c9d3da002dd2362808fd9c7faaca0676fbdc532d430ffeb85c6c6f770b34466571814529c66aaa172b26a179e26d8b081bea9cb08b5af
+  data.tar.gz: 62c3946d702aec9897e4149021e3798459abbe93927e87942faec2df9373190b4d86877e9dfd01ff5f8b40c3635fafd0203f18e2f4244dc22b8d713bc4c5361b

data/bin/edn-abnf

@@ -115,12 +115,11 @@ if $options.lines
     exit 1
   end
   CSV.parse(edn_file) do |ok, ednin, out|
-    if !ok || ok[0] == "#" || ok == "op"
+    if ok[0] == "#"
       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
@@ -137,8 +136,8 @@ if $options.lines
     end
     begin
       ok = ok == "="
-      puts "➔ #{ok.inspect}, #{ednin.inspect}, #{out.inspect}" if $options.verbose
-      result = tree_from_edn_possibly_hex(ednin || "")
+      puts "➔ #{ok}, #{ednin}, #{out}" if $options.verbose
+      result = tree_from_edn_possibly_hex(ednin)
       diag = result.cbor_diagnostic
       if out == diag && !ok
           puts "** ≠ / #{diag.inspect} / #{out.inspect}"
@@ -152,7 +151,7 @@ if $options.lines
         end
         puts "reparsed / #{diag.inspect} / #{out.inspect}" if $options.verbose
       end
-    rescue CBOR_DIAG::AppParseError, ArgumentError => e
+    rescue ArgumentError => e
       if ok
         puts "** #{e} / #{result.inspect} / #{out.inspect}"
         $error += 1
@@ -181,10 +180,10 @@ begin
     result = edn.tree               # XXX .tree?
   end
 rescue CBOR_DIAG::AppParseError, ArgumentError => e
-  warn "** #{e}"
+  puts "** #{e}"
   exit 1
 rescue CBOR::OutOfBytesError, RuntimeError, JSON::GeneratorError => e
-  warn "** (encoded CBOR input:) #{e}"
+  puts "** (encoded CBOR input:) #{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.36pre2"
+  s.version = "0.6.1pre"
   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-diag-support.rb

@@ -12,7 +12,7 @@ module CBOR
     def inspect
       "#<CBOR::Box #{self.class} value=#{value.inspect}, options=#{options.inspect}>"
     end
-    def self.from_instance(n, options={})
+    def self.from_number(n, options={})
       case n
       when Box
         n.class.new(n.value, n.options.merge(options))
@@ -20,13 +20,23 @@ module CBOR
         Ibox.new(n, options.dup)
       when ::Float
         Fbox.new(n, options.dup)
-      when ::String, ::Array, ::Hash, ::CBOR::Tagged
-        Xbox.new(n, options.dup)
       else
         raise ArgumentError, "cbor-diagnostic: can't box number from #{n.inspect}':\n"
       end
     end
+    def to_cbor
+      CBOR.encode(value)
+    end
+    def cbor_diagnostic(opts = {})
+      ret = value.cbor_diagnostic(opts)
+      if ei = options[:ei]
+        ret << "_#{ei}"
+      end
+      ret
+    end
+  end
 
+  class Ibox < Box
     INTEGER_EI = {
       "i" => [23, 0],
       "0" => [0xFF, 1],
@@ -34,7 +44,7 @@ module CBOR
       "2" => [0xFFFFFFFF, 4],
       "3" => [0xFFFFFFFFFFFFFFFF, 8]
     }
-    def self.make_head(ib, plusbytes, d)
+    def make_head(ib, plusbytes, d)
       case plusbytes
       when 0
         [ib + d].pack("C")
@@ -51,52 +61,6 @@ module CBOR
       end
     end
 
-    def to_cbor
-      CBOR.encode(value)
-    end
-    def cbor_diagnostic(opts = {})
-      ret = value.cbor_diagnostic(opts)
-      if ei = options[:ei]
-        ret << "_#{ei}"
-      end
-      ret
-    end
-  end
-
-  class Xbox < Box
-    def to_cbor
-      enc = CBOR.encode(value)
-      if ei = options[:ei]
-        maxval, plusbytes = INTEGER_EI[ei]
-        if maxval
-          ib = enc.getbyte(0) & 0xE0
-          ai = enc.getbyte(0) & 0x1F
-          d, replacement = case ai
-                           when 0...24; [ai, 0]
-                           when 24; [enc[1..1].ord, 1]
-                           when 25; [enc[1..2].unpack1("n"), 2]
-                           when 26; [enc[1..4].unpack1("N"), 4]
-                           when 27; [enc[1..8].unpack1("Q>"), 8]
-                           # when 31; XXX conflicting EI information
-                           else raise "unknown additional information #{ai} in ib #{ib}"
-                           end
-          raise ArgumentError, "cbor-diagnostic: #{value} doesn't fit into encoding indicator _#{ei}':\n" unless d <= maxval
-          ib = enc.getbyte(0) & 0xE0
-          new_head = CBOR::Ibox.make_head(ib, plusbytes, d)
-          enc[0..replacement] = new_head
-        else
-          if ei == "" && value == ""
-            enc = CBOR.encode(value.cbor_stream!([]))
-          else
-            warn "*** cbor-diagnostic: ignoring unsupported encoding indicator _#{ei} for #{value.inspect}"
-          end
-        end
-      end
-      enc
-    end
-  end
-
-  class Ibox < Box
     def to_cbor
       if ei = options[:ei]
         maxval, plusbytes = INTEGER_EI[ei]
@@ -110,7 +74,7 @@ module CBOR
              end
         raise ArgumentError, "cbor-diagnostic: #{value} doesn't fit into encoding indicator _#{ei}':\n" unless d <= maxval
 
-        CBOR::Ibox.make_head(ib, plusbytes, d)
+        make_head(ib, plusbytes, d)
 
         # s = bignum_to_bytes(d)
         # head(0xc0, TAG_BIGNUM_BASE + (ib >> 5))