edn-abnf 0.5.33 → 0.5.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc4cf907d32b47cc51a4326a110558a79a25ba4733873a5d6d84fd52f4e54903
-  data.tar.gz: 5424613f24e9fb8defca526961a428bba49832c57e952e848d8cbdd1b7a06f99
+  metadata.gz: 066fe883e4f63f1d4f093c32c280a69ad282f587bd289224b5f9c3c869be7e73
+  data.tar.gz: 34bccaaa9015884fbb9bc9dcc9f8c1eba352dc0178a5ba33c6a71305c2d2b51c
 SHA512:
-  metadata.gz: a0b733fbad7e31b0f371fb832c86e958476ee29da4a83d06673b216829cca62a7262f719d378480a9f315997554883df44b1fddbe47082c4af28c14727e630d1
-  data.tar.gz: 54abb14762231cfb8dbfd87a21b4f86594f0cbcc666f3333920dd2922f104f41a4cb9fc9277376dee952b831a92c563a056c6485dbf79e3a6e7e088272d1e39e
+  metadata.gz: 5ca8b9c5816196a430547ebe8ed8b6b90599161b41f51443bb319cec2b86220ffe158df62f5520afbd67cb3450ecebc3ce0e970c90e8f3040f7dd1eb355f7543
+  data.tar.gz: b1bfc0fc1f5b6f076837b47900ceb9962163e32a488ef3c89d63ac1135eec991c7c8d3fa69cbf5355d7af8757c232f7fd89cd8ffdecd38a5b1ea8ae6152007b6

data/edn-abnf.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "edn-abnf"
-  s.version = "0.5.33"
+  s.version = "0.5.35"
   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_number(n, options={})
+    def self.from_instance(n, options={})
       case n
       when Box
         n.class.new(n.value, n.options.merge(options))
@@ -20,23 +20,13 @@ 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],
@@ -44,7 +34,7 @@ module CBOR
       "2" => [0xFFFFFFFF, 4],
       "3" => [0xFFFFFFFFFFFFFFFF, 8]
     }
-    def make_head(ib, plusbytes, d)
+    def self.make_head(ib, plusbytes, d)
       case plusbytes
       when 0
         [ib + d].pack("C")
@@ -61,6 +51,52 @@ 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]
@@ -74,7 +110,7 @@ module CBOR
              end
         raise ArgumentError, "cbor-diagnostic: #{value} doesn't fit into encoding indicator _#{ei}':\n" unless d <= maxval
 
-        make_head(ib, plusbytes, d)
+        CBOR::Ibox.make_head(ib, plusbytes, d)
 
         # s = bignum_to_bytes(d)
         # head(0xc0, TAG_BIGNUM_BASE + (ib >> 5))

data/lib/parser/edngrammar.rb

@@ -197,10 +197,12 @@ module EDNGRAMMAR
 
   module String11
     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_instance(val, {ei: ei})
       end
-      elements[0].ast
+      val
     end
   end
 
@@ -452,7 +454,7 @@ module EDNGRAMMAR
   
       if ei = spec.text_value[1..-1]
          # warn "*** implementing encoding indicator #{ei.inspect} for #{elements[0].text_value}"
-         val = CBOR::Box.from_number(val, {ei: ei})
+         val = CBOR::Box.from_instance(val, {ei: ei})
       end
       val
     end
@@ -1800,10 +1802,12 @@ module EDNGRAMMAR
 
   module Tagged1
     def ast
+      val = CBOR::Tagged.new(uint.text_value.to_i, item.ast)
       if ei = spec.text_value[1..-1]
-         warn "*** ignoring unimplemented encoding indicator #{ei.inspect} after tag number #{uint.text_value}"
+        val = CBOR::Box.from_instance(val, {ei: ei})
+        # warn "*** implementing encoding indicator #{ei.inspect} after tag number #{uint.text_value}"
       end
-      CBOR::Tagged.new(uint.text_value.to_i, item.ast)
+      val
     end
   end
 
@@ -3084,7 +3088,8 @@ module EDNGRAMMAR
       if ei == ""
         r.cbor_stream!
       elsif ei
-        warn "*** ignoring unimplemented encoding indicator #{ei.inspect} after ["
+        r = CBOR::Box.from_instance(r, {ei: ei})
+        # warn "*** implementing XXX encoding indicator #{ei.inspect} after ["
       end
       r
     end
@@ -3271,7 +3276,8 @@ module EDNGRAMMAR
       if ei == ""
         r.cbor_stream!
       elsif ei
-        warn "*** ignoring unimplemented encoding indicator #{ei.inspect} after {" # }
+        r = CBOR::Box.from_instance(r, {ei: ei})
+        # warn "*** implementing encoding indicator #{ei.inspect} after {" # }
       end
       r
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: edn-abnf
 version: !ruby/object:Gem::Version
-  version: 0.5.33
+  version: 0.5.35
 platform: ruby
 authors:
 - Carsten Bormann