cbor-diag 0.8.8 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 379c2b3b6dfeeea6841c7892dea788a50b2960c511b25a1caece85cdffbe3d42
-  data.tar.gz: 789d2200064abbc728744bb418027e56b6516d20464a020739de9f12cbb6439e
+  metadata.gz: c41a7144e024520508e8b84b485aa53ae8b9e45f26eb60574cec5acef4c97e50
+  data.tar.gz: af46eaddb14028e6c54f6d63f261e255b7f629f8089a5d1f228d97ba916368cb
 SHA512:
-  metadata.gz: e4e20ee282d15a50654c605137eb8ad0f02b109d368e60a62a38adc3e48d7b00a7736d57dc80f56a745bf0731a0e2decff670a4d960c80eb853cd9c3021ecbf8
-  data.tar.gz: 40fac29e490c8389573b2ca7c6d0de591228c7dc5721eca5942993726cfd6aba4366220b53d906deb4294e8626a9a2b299e9c507dff6dfe76ed43b681e8c38e1
+  metadata.gz: 88cb362411df944ca64d929678f74282ecaa4c91257fe0fb38262789fe360b095e51b5ecaa6fb094f071df179051b96ddfb28b743a72bb80eccc2e6985165732
+  data.tar.gz: 3e3fec444f1996f724ea4ef05fa3ddd6ca9fc8edad06a3c85176a023ddb30ae1633c21140e59c1fbe3beb264ed6cf5396e25f8c4d22cd7647cb8f1fc4ebc68bd

data/bin/cbor2diag.rb

@@ -6,7 +6,7 @@ require 'cbor-canonical'
 
 
 require 'cbor-diagnostic-helper'
-options = cbor_diagnostic_process_args("cdetpqu")
+options = cbor_diagnostic_process_args("cdetpqun")
 
 ARGF.binmode
 i = ARGF.read

data/bin/cborleader2diag.rb

@@ -5,7 +5,7 @@ require 'cbor-deterministic'
 require 'cbor-canonical'
 
 require 'cbor-diagnostic-helper'
-options = cbor_diagnostic_process_args("cdetpqu")
+options = cbor_diagnostic_process_args("cdetpqun")
 
 ARGF.binmode
 i = ARGF.read

data/bin/cborseq2diag.rb

@@ -5,7 +5,7 @@ require 'cbor-deterministic'
 require 'cbor-canonical'
 
 require 'cbor-diagnostic-helper'
-options = cbor_diagnostic_process_args("cdetpqu")
+options = cbor_diagnostic_process_args("cdetpqun")
 
 ARGF.binmode
 i = ARGF.read

data/bin/diag2diag.rb

@@ -9,7 +9,7 @@ require 'cbor-pretty'
 require 'cbor-diagnostic'
 
 require 'cbor-diagnostic-helper'
-options = cbor_diagnostic_process_args("cdetpqu")
+options = cbor_diagnostic_process_args("cdetpqun")
 
 parser = CBOR_DIAGParser.new
 

data/bin/pretty2diag.rb

@@ -9,7 +9,7 @@ end
 
 
 require 'cbor-diagnostic-helper'
-options = cbor_diagnostic_process_args("cdetpqu")
+options = cbor_diagnostic_process_args("cdetpqun")
 
 
 i = extractbytes(ARGF)

data/cbor-diag.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "cbor-diag"
-  s.version = "0.8.8"
+  s.version = "0.9.0"
   s.summary = "CBOR (Concise Binary Object Representation) diagnostic notation"
   s.description = %q{cbor-diag implements diagnostic notation for CBOR, RFC 8949 and RFC 8742}
   s.author = "Carsten Bormann"

data/lib/cbor-diag-parser.rb

@@ -1548,7 +1548,7 @@ module CBOR_DIAG
                  CBOR_DIAG.const_set(:APPS, Hash.new { |h, k|
                    h[k] = begin CBOR_DIAG.const_get("App_#{app}")
                           rescue NameError
-                            raise ArgumentError.new("cbor-diagnostic: Unknown application-oriented extension #{k}")
+                            raise ArgumentError.new("cbor-diagnostic: application-oriented extension #{k}'' unknown or not enabled")
                           end
                  }) unless CBOR_DIAG.const_defined?(:APPS)
                  CBOR_DIAG::APPS[app].decode(app, data)

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

@@ -0,0 +1,10 @@
+require 'scanf'
+
+class CBOR_DIAG::App_nan
+  def self.decode(_, s)
+    val, = s.scanf("%a")
+    raise ArgumentError.new ("nan'#{s}' not valid") unless val &&
+                                                           val.abs > 1.0 && val.abs < 2.0
+    val.cbor_nan_toggle
+  end
+end

data/lib/cbor-diagnostic-helper.rb

@@ -4,12 +4,11 @@ require 'cbor-canonical'
 
 def cbor_diagnostic_process_args(chars)
   options = ''
-  while /\A-(?:([#{chars}]+)|a(.*))\z/ === ARGV[0]
+  while /\A-(?:([#{chars}]+)|([#{chars}]*)a(.*))\z/ === ARGV[0]
     ARGV.shift
-    if $1
-      options << $1
-    else
-      s = $2
+    options << $1 if $1
+    options << $2 if $2
+    if s = $3
       s = ARGV.shift if s == ""
       s.split(",").each do |a|
         require "cbor-diagnostic-app/#{a}"
@@ -31,5 +30,6 @@ def cbor_diagnostic_output(o, options)
   o = cbor_diagnostic_item_processing(o, options)
   o.cbor_diagnostic(try_decode_embedded: /e/ === options,
                     bytes_as_text: /t/ === options,
-                    utf8: /u/ === options)
+                    utf8: /u/ === options,
+                    nan: /n/ === options)
 end

data/lib/cbor-diagnostic.rb

@@ -2,6 +2,7 @@
 unless defined?(CBOR)
   require 'cbor-pure'
 end
+require 'cbor-nan'
 require 'json'
 
 class Object
@@ -17,7 +18,11 @@ class NilClass
 end
 
 class Float
-  def cbor_diagnostic(_=nil)           # do a little bit of JSON.stringify gaming (ECMA-262, 9.8.1)
+  def cbor_diagnostic(options = {})           # do a little bit of JSON.stringify gaming (ECMA-262, 9.8.1)
+    if options[:nan] && nan?
+      pl = cbor_nan_toggle
+      return "nan'#{'%a' % pl}'"
+    end
     a = abs
     if a < 1 && a >= 1e-6
       inspect.sub(/(\d)[.](\d+)e-(\d+)/) {"0.#{"0" * ($3.to_i - 1)}#{$1}#{$2}"}

data/lib/cbor-nan.rb

@@ -0,0 +1,7 @@
+class Float
+  def cbor_nan_toggle               # precondition: 1.0 < |self| < 2.0 or nan?
+    a = [self].pack("G")
+    a.setbyte(0, a.getbyte(0) ^ 0x40)
+    a.unpack("G").first
+  end
+end

data/lib/cbor-pure.rb

@@ -124,7 +124,21 @@ module CBOR
 
   def addfloat(fv)
     if fv.nan?
-      @buffer << HALF_NAN_BYTES
+      # | 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
+      if iv & 0x3ffffffffff == 0 # 42 zero, 10 bits fit in half
+        @buffer << [0xf9, (firstword & 0xFC00) + ((iv >> 42) & 0x3ff)].pack("Cn")
+      elsif iv & 0x1fffffff == 0 # 29 zero, 23 bits fit in single
+        @buffer << [0xfa, (ds.getbyte(0) << 24) + ((iv >> 29) & 0xffffff)].pack("CN")
+      else
+        @buffer << 0xfb << ds
+      end
     else
       ss = [fv].pack("g")         # single-precision
       if ss.unpack("g").first == fv

data/lib/half.rb

@@ -13,6 +13,8 @@
 # IEEE 754 can be found at:
 # http://ieeexplore.ieee.org/stamp/stamp.jsp?tp=&arnumber=4610935
 
+require 'cbor-nan'
+
 module Half
   NAN_BYTES = "\x7e\x00"
 
@@ -27,7 +29,7 @@ module Half
       if exp == 0
         Math.ldexp(mant, -24)
       elsif exp == 31
-        mant == 0 ? Float::INFINITY : Float::NAN
+        mant == 0 ? Float::INFINITY : Math.ldexp(0x400 + mant, -10).cbor_nan_toggle
       else
         Math.ldexp(0x400 + mant, exp-25)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cbor-diag
 version: !ruby/object:Gem::Version
-  version: 0.8.8
+  version: 0.9.0
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-29 00:00:00.000000000 Z
+date: 2024-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -163,9 +163,11 @@ files:
 - cbor-diag.gemspec
 - lib/cbor-diag-parser.rb
 - lib/cbor-diagnostic-app/dt.rb
+- lib/cbor-diagnostic-app/nan.rb
 - lib/cbor-diagnostic-helper.rb
 - lib/cbor-diagnostic-parser.rb
 - lib/cbor-diagnostic.rb
+- lib/cbor-nan.rb
 - lib/cbor-pretty.rb
 - lib/cbor-pure.rb
 - lib/cbor-transform-j.rb