edn-abnf 0.2.5 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3897c19560ddc1c89c6a54f9ae9e71d88e1f1450589cd703261db76bfcca52c
-  data.tar.gz: 561925dbb535a93b97bce28fd6c36882a8ee73dd12e71bce99381f9f0d94dcfd
+  metadata.gz: e17fb20ba9bb383a9172ef8bb3f04e2c473ec1d215972711ecac235dbf3da7d6
+  data.tar.gz: a9908d2846aef7899ec5ff96b4c0613a69019650239d89aa63c7cac1e8773ed7
 SHA512:
-  metadata.gz: a77b88f8fa087d4a5f1284cfb9735183af07a20090788e9d9b3b3eb0396005d35396cca28228842a0d7d5a9ecbbfa3debb3f6f7a86d83564df1ee2474aed52ff
-  data.tar.gz: a6c564e1577ea8dc88859465112a57a5e5d62473fa36e0f73cf3c30eeb46de0ad46f67197a826f178987b8b7dd856697e3e7c117f127909798e88715bfeda64c
+  metadata.gz: cd4641f2f4cdf9a48d79ab41f9891f29578d2c0c6d277c468e4ed92c6ed32756611375db720e30fb39e097ee3819d18902e71a330e666b97bd55d551219255b4
+  data.tar.gz: 62586e9cc378e802565f3c2e746bad989b7803c9a38a336b2c88db480dcf8df00125f254e30eafe67d3e80d1dbe920a4a9db24418e6aa0379fb9890214fc7fda

data/bin/edn-abnf

@@ -46,7 +46,7 @@ begin
     opts.on("-eEDN", "--e=EDN", "supply EDN on command line") do |v|
       $options.edn = v
     end
-    opts.on("-tFMT", "--to=FMT", [:basic, :neat, :json, :yaml, :edn, :diag], "Target format") do |v|
+    opts.on("-tFMT", "--to=FMT", [:basic, :neat, :json, :yaml, :edn, :diag], "Target format (default: diag)") do |v|
       $options.target = v
     end
   end
@@ -83,7 +83,11 @@ if $options.lines
       result_diag = result.cbor_diagnostic
       puts "x #{ok}, #{ednin.inspect} / #{out} ➔ #{result_diag.inspect} / #{result_hex}" if $options.verbose
       if result_hex != out
+        if  CBOR.decode(out.xeh).to_cbor == result.to_cbor
+          puts "** x variant / #{ednin.inspect} / #{out} ≠ #{result_diag.inspect} / #{result_hex}"
+        else
           puts "** x / #{ednin.inspect} / #{out} ≠ #{result_diag.inspect} / #{result_hex}"
+        end
       end
       next
     end
@@ -96,7 +100,7 @@ if $options.lines
           puts "** ≠ / #{diag.inspect} / #{out.inspect}"
       end
       if out != diag && ok
-        outdiag = tree_from_edn_possibly_hex(out).cbor_diagnostic
+        outdiag = tree_from_edn_possibly_hex(out || "").cbor_diagnostic
         if outdiag != diag
           puts "** ≡ / #{ednin.inspect} #{diag.inspect} / #{out.inspect} #{outdiag.inspect}"
         end
@@ -124,14 +128,14 @@ rescue ArgumentError => e
 end
 
 case $options.target
-when :basic, nil
+when :basic
   pp result
 when :neat, :json
   require 'neatjson'
   puts JSON.neat_generate(result, after_comma: 1, after_colon: 1)
 when :yaml
   puts result.to_yaml
-when :edn, :diag
+when :edn, :diag, nil
   puts result.cbor_diagnostic
 else
   warn ["Unknown target format: ", $options.target].inspect

data/edn-abnf.gemspec

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

data/lib/cbor-diag-support.rb

@@ -0,0 +1,134 @@
+module CBOR
+  Box = Struct.new(:value, :options) do
+    def to_s
+      value.to_s
+    end
+    def inspect
+      "#<CBOR::Box #{self.class} value=#{value.inspect}, options=#{options.inspect}>"
+    end
+    def self.from_number(n, options={})
+      case n
+      when Box
+        n.class.new(n.value, n.options.merge(options))
+      when ::Integer
+        Ibox.new(n, options.dup)
+      when ::Float
+        Fbox.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
+  end
+
+  class Ibox < Box
+    INTEGER_EI = {
+      "i" => [23, 0],
+      "0" => [0xFF, 1],
+      "1" => [0xFFFF, 2],
+      "2" => [0xFFFFFFFF, 4],
+      "3" => [0xFFFFFFFFFFFFFFFF, 8]
+    }
+    def make_head(ib, plusbytes, d)
+      case plusbytes
+      when 0
+        [ib + d].pack("C")
+      when 1
+        [ib + 24, d].pack("CC")
+      when 2
+        [ib + 25, d].pack("Cn")
+      when 4
+        [ib + 26, d].pack("CN")
+      when 8
+        [ib + 27, d].pack("CQ>")
+      else
+        raise ArgumentError, "cbor-diagnostic: #{plusbytes} plusbytes when encoding head\n"
+      end
+    end
+
+    def to_cbor
+      if ei = options[:ei]
+        maxval, plusbytes = INTEGER_EI[ei]
+        raise ArgumentError, "cbor-diagnostic: unknown encoding indicator _#{ei} for Integer\n" unless maxval
+        d = value
+        ib = if d < 0
+               d = -1-d
+               0x20
+             else
+               0x00
+             end
+        raise ArgumentError, "cbor-diagnostic: #{value} doesn't fit into encoding indicator _#{ei}':\n" unless d <= maxval
+
+        make_head(ib, plusbytes, d)
+
+        # s = bignum_to_bytes(d)
+        # head(0xc0, TAG_BIGNUM_BASE + (ib >> 5))
+        # head(0x40, s.bytesize)
+      else
+        CBOR.encode(value)
+      end
+    end
+  end
+  class Fbox < Box
+    FLOAT_EI = {
+      "1" => 2,
+      "2" => 4,
+      "3" => 8
+    }
+    def make_float(plusbytes, fv)
+      ret =
+        if fv.nan?
+          # | Format   | Sign bit | Exponent | Significand | Zero
+          # | binary16 |        1 |        5 |          10 | 42
+          # | binary32 |        1 |        8 |          23 | 29
+          # | binary64 |        1 |       11 |          52 | 0
+          ds = [fv].pack("G")
+          firstword = ds.unpack("n").first
+          raise "NaN exponent error #{firstword}" unless firstword & 0x7FF0 == 0x7FF0
+          iv = ds.unpack("Q>").first
+          ret = case plusbytes
+                when 2
+                  if iv & 0x3ffffffffff == 0 # 42 zero, 10 bits fit in half
+                    [0xf9, (firstword & 0xFC00) + ((iv >> 42) & 0x3ff)].pack("Cn")
+                  end
+                when 4
+                  if iv & 0x1fffffff == 0 # 29 zero, 23 bits fit in single
+                    [0xfa, (ds.getbyte(0) << 24) + ((iv >> 29) & 0xffffff)].pack("CN")
+                  end
+                when 8
+                  "\xfb".b << ds
+                end
+        else
+          if plusbytes == 8
+            [0xfb, fv].pack("CG") # double-precision
+          else
+            ss = [fv].pack("g")         # single-precision
+            if ss.unpack("g").first == fv
+              if plusbytes == 4
+                "\xfa".b << ss
+              else
+                if hs = Half.encode_from_single(fv, ss)
+                  "\xf9".b << hs
+                end
+              end
+            end
+          end
+        end
+      raise ArgumentError, "cbor-diagnostic: make_float #{plusbytes.inspect} #{fv.inspect}" unless ret
+      ret
+    end
+
+    def to_cbor
+      if ei = options[:ei]
+        plusbytes = FLOAT_EI[ei]
+        raise ArgumentError, "cbor-diagnostic: unknown encoding indicator _#{ei} for Float':\n" unless plusbytes
+        make_float(plusbytes, value)
+      else
+        CBOR.encode(value)
+      end
+    end
+  end
+
+end

data/lib/edn-abnf.rb

@@ -1,4 +1,5 @@
 require_relative "parser/edn-util.rb"
+require_relative "cbor-diag-support.rb"
 
 class EDN
   @@parser = EDNGRAMMARParser.new

data/lib/parser/edngrammar.rb

@@ -464,10 +464,13 @@ module EDNGRAMMAR
 
   module Number1
     def ast
+      val = elements[0].ast
+  
       if ei = spec.text_value[1..-1]
-         warn "*** ignoring unimplemented encoding indicator #{ei.inspect} for #{elements[0].text_value}"
+         # warn "*** implementing encoding indicator #{ei.inspect} for #{elements[0].text_value}"
+         val = CBOR::Box.from_number(val, {ei: ei})
       end
-      elements[0].ast
+      val
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edn-abnf
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.2
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-22 00:00:00.000000000 Z
+date: 2024-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: cbor-diag
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: edn-abnf implements converters and miscellaneous tools for CBOR EDN's
   ABNF
 email: cabo@tzi.org
@@ -90,6 +104,7 @@ extra_rdoc_files: []
 files:
 - bin/edn-abnf
 - edn-abnf.gemspec
+- lib/cbor-diag-support.rb
 - lib/cbor-diagnostic-app/b64.rb
 - lib/cbor-diagnostic-app/b64grammar.rb
 - lib/cbor-diagnostic-app/dt.rb