edn-abnf 0.5.46 → 0.6.1pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce437be748a594bd3b3dec2af5597f03170c4d152ba34dcb41de407b03202a55
-  data.tar.gz: 8d6183c6c7f8464d80215de784d82743f2a8da0ac8f79af317e01cf2b6aa86a8
+  metadata.gz: 35b0986f4a0d059f1223e057a2cd2ea5c6852e2a682ad5fa1a3c1e135b2446c7
+  data.tar.gz: 98f4bdb66e78f3b3c85edd88bcd18dbb3a832dd9153d178a79f89baf911ac109
 SHA512:
-  metadata.gz: c2ce4b1577d3a5531832ebb4c45e3b852299f675ca83d4c0d982f3d033586cd2ddeeddc76e672a7584754da3475f13369a7682a727f64de228c1b2cc4e9e8164
-  data.tar.gz: c7ce32eb330b37b70acdc2151de08bd3295ef2b95caa354f47782ce4dab165abee7874236cbc87a3671d2d2b12c44626c61f1a072c986464945f61e61e3f3640
+  metadata.gz: 3e7ce39d92102381078c9d3da002dd2362808fd9c7faaca0676fbdc532d430ffeb85c6c6f770b34466571814529c66aaa172b26a179e26d8b081bea9cb08b5af
+  data.tar.gz: 62c3946d702aec9897e4149021e3798459abbe93927e87942faec2df9373190b4d86877e9dfd01ff5f8b40c3635fafd0203f18e2f4244dc22b8d713bc4c5361b

data/bin/edn-abnf

@@ -7,6 +7,12 @@ require 'json'
 require 'cbor-pretty'
 require 'cbor-deterministic'
 
+# 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)
@@ -35,7 +41,7 @@ require 'ostruct'
 
 $error = 0
 
-output_formats = [:basic, :neat, :json, :yaml, :edn, :diag, :pretty, :hex, :cbor, :"test-vector", :feat]
+output_formats = [:basic, :neat, :json, :yaml, :edn, :diag, :pretty, :hex, :cbor, :"test-vector"]
 
 $options = OpenStruct.new
 begin
@@ -76,31 +82,9 @@ begin
         end
       end
     end
-    opts.on("-AAPP", "--app-later=APP", "Handle application extension later") do |v|
-      v.split(",") do |nm|
-        if nm =~ /\A[a-z][a-z0-9]*\z/
-          code = <<-RUBY
-            class CBOR_DIAG::App_#{nm}
-              def self.decode(app_prefix, s)
-                CBOR::Tagged.new(999, [app_prefix, s])
-              end
-            end
-          RUBY
-          eval(code, TOPLEVEL_BINDING, "(app-extension #{nm})")
-        else
-          raise ArgumentError.new("edn-abnf: app-extension name #{nm} not supported")
-        end
-      end
-    end
-    opts.on("--[no-]app-now", "Handle postponed application extensions now") do |v|
-      $options.app_now = v
-    end
     opts.on("-f", "--[no-]fallback", "use tag 999 for unknown app-extensions") do |v|
       $options.fallback = v
     end
-    opts.on("-b", "--[no-]brace", "retry parsind with braces around added") do |v|
-      $options.brace = v
-    end
     opts.on("-wCOL", "--wrap=COL", Integer, "EDN: wrap at column COL") do |v|
       $options.wrap = v
     end
@@ -109,19 +93,12 @@ begin
     end
   end
   op.parse!
-rescue LoadError => e
-  warn "Unsupported application extension '#{e.message.split('/')[1]}'"
-  exit 1
 rescue Exception => e
-  warn e.inspect unless e.to_s == 'exit'
   warn op unless e.to_s == 'exit'
   exit 1
 end
 
-$feat = Set[]
-
 if !$options.edn
-  $fn = ARGV.join(";")
   ARGF.binmode if $options.cbor
   $options.edn = ARGF.read
 else
@@ -138,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
@@ -160,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}"
@@ -175,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
@@ -198,31 +174,20 @@ end
 
 begin
   if $options.cbor
-    result = CBOR.decode_seq(edn_file)
+    result = CBOR.decode(edn_file)
   else
-    if $options.brace
-      begin
-        edn = EDN.from_edn(edn_file)
-      rescue ArgumentError # Parse error
-        edn = EDN.from_edn("{\n" + edn_file + "}\n")
-      end
-    else
-      edn = EDN.from_edn(edn_file)
-    end
+    edn = EDN.from_edn(edn_file)
     result = edn.tree               # XXX .tree?
   end
 rescue CBOR_DIAG::AppParseError, ArgumentError => e
-  warn "** #{e}"
-  warn e.backtrace if $options.verbose
+  puts "** #{e}"
   exit 1
 rescue CBOR::OutOfBytesError, RuntimeError, JSON::GeneratorError => e
-  warn "** (encoded CBOR input:) #{e}"
+  puts "** (encoded CBOR input:) #{e}"
   exit 1
 end
 
 case $options.target
-when :feat
-  puts [$fn, $feat.to_a.join(",")].join(":")
 when :basic
   pp result
 when :neat, :json

data/edn-abnf.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "edn-abnf"
-  s.version = "0.5.46"
+  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

@@ -9,13 +9,10 @@ module CBOR
     def to_s
       value.to_s
     end
-    def to_str
-      value.to_str
-    end
     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))
@@ -23,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],
@@ -37,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")
@@ -54,55 +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 encoding; value.encoding end
-    def size; value.size end
-    def b; value.b end
-    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]
@@ -116,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))

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

@@ -1,9 +1,8 @@
 require_relative "b64grammar.rb"
 
 class CBOR_DIAG::App_b64
-  def self.decode(prefix, s)
+  def self.decode(_, s)
     parser = B64GRAMMARParser.new #  B? XXX
-    s = EDN.to_one_string(prefix, s)
     ast = parser.parse(s)
     if !ast
       raise CBOR_DIAG::AppParseError.new("cbor-diagnostic: Parse Error in b64'#{s}':\n" << EDN.reason(parser, s), parser.failure_index)

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

@@ -7,9 +7,8 @@ require 'time'
 # Probably should copy over Time#xmlschema and fix that for us.
 
 class CBOR_DIAG::App_dt
-  def self.decode(prefix, s)
+  def self.decode(app_prefix, s)
     parser = DTGRAMMARParser.new
-    s = EDN.to_one_string(prefix, s)
     ast = parser.parse(s)
     if !ast
       raise CBOR_DIAG::AppParseError.new("cbor-diagnostic: Parse Error in dt'#{s}':\n" << EDN.reason(parser, s), parser.failure_index)
@@ -22,13 +21,13 @@ class CBOR_DIAG::App_dt
     else
       t.to_i
     end
-    case prefix
+    case app_prefix
     when 'dt'
       tv
     when 'DT'
       CBOR::Tagged.new(1, tv)
     else
-      fail prefix
+      fail app_prefix
     end
   end
 end

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

@@ -1,16 +1,8 @@
 require_relative "hgrammar.rb"
 
 class CBOR_DIAG::App_h
-  def self.decode(prefix, s)
+  def self.decode(_, s)
     parser = HGRAMMARParser.new
-    s = EDN.to_one_string(prefix, s)
-    s.scan(/#.*|\s|\/[^\/]*\//).each do |comment|
-      case comment
-      in /\A\s\z/; $feat << :h_comment_space
-      in /\A#.*\z/; $feat << :h_comment_hash
-      in /\A\/[^\/]*\/\z/; $feat << :h_comment_slash
-      end
-    end
     ast = parser.parse(s)
     if !ast
       raise CBOR_DIAG::AppParseError.new("cbor-diagnostic: Parse Error in h'#{s}':\n" << EDN.reason(parser, s), parser.failure_index)