cbor-diag 0.8.5 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 874c39aa430d1c66778805425a48b8223ca300d07467098273d82e1f00d684bc
-  data.tar.gz: eb6fec8c5fbd56b412154c23f5b5205cfb9c298634ddaf754b389400a52d2ffa
+  metadata.gz: 80b9e87624d0c6106d5a65be87ee3189f401f65064e938e0400456245bcb15e9
+  data.tar.gz: 987e5878c4106c5d3165e493313291588feaa7c9ed45a6496eca29f4a77ad768
 SHA512:
-  metadata.gz: 16e2d15926aef6606baca2bd6ecb2cfa36471cd0bf51860fe0951bfa5bae2ddc28af5c05e6dad291332d832a8990f9cf3774619b87617d3aa339c866b15d6e01
-  data.tar.gz: c39f2222f467ab9c5b6fbd894c378890896df0272a253354876fcf7c925ebb654b4cf0dba5a699630dad8afb5a163965b3561d205a83dcbe2bc1985ff1395cf5
+  metadata.gz: 8ddabdc1262691e8d13bbe1e08a391592454bb5d05d6b475053a7a4f5f8b9a8e0351552f1fe08c3911d4deab7322b4dee80e44d21d163924872eca439b20f6ef
+  data.tar.gz: 92ec952d61e7ade12ddb663040fabab0826e4d47f51ecf1a20f72521e33d2929cc1fb7d8c4827849ef578a5a76d4bba11da8353c8e115acbe9780ae8119e328d

data/cbor-diag.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "cbor-diag"
-  s.version = "0.8.5"
+  s.version = "0.8.6"
   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

@@ -2146,23 +2146,21 @@ module CBOR_DIAG
   end
 
   module Embedded0
-    def text
-      elements[0]
-    end
-
-  end
-
-  module Embedded1
     def s
       elements[1]
     end
 
   end
 
-  module Embedded2
+  module Embedded1
     def to_rb
-      if se = s.elements
-        [se[0], *se[1].elements].map{|x| CBOR.encode(x.to_rb)}.join.b
+      if se = s
+        sn = se.to_rb
+        if CBOR::Sequence === sn
+          sn.to_cborseq
+        else
+          CBOR.encode(sn)
+        end
       else
         "".b
       end
@@ -2190,29 +2188,7 @@ module CBOR_DIAG
     end
     s0 << r1
     if r1
-      i3, s3 = index, []
-      r4 = _nt_text
-      s3 << r4
-      if r4
-        s5, i5 = [], index
-        loop do
-          r6 = _nt_emb1
-          if r6
-            s5 << r6
-          else
-            break
-          end
-        end
-        r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
-        s3 << r5
-      end
-      if s3.last
-        r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
-        r3.extend(Embedded0)
-      else
-        @index = i3
-        r3 = nil
-      end
+      r3 = _nt_text
       if r3
         r2 = r3
       else
@@ -2221,19 +2197,19 @@ module CBOR_DIAG
       s0 << r2
       if r2
         if (match_len = has_terminal?(">>", false, index))
-          r7 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+          r4 = instantiate_node(SyntaxNode,input, index...(index + match_len))
           @index += match_len
         else
           terminal_parse_failure('">>"')
-          r7 = nil
+          r4 = nil
         end
-        s0 << r7
+        s0 << r4
       end
     end
     if s0.last
       r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+      r0.extend(Embedded0)
       r0.extend(Embedded1)
-      r0.extend(Embedded2)
     else
       @index = i0
       r0 = nil
@@ -2244,56 +2220,6 @@ module CBOR_DIAG
     r0
   end
 
-  module Emb10
-    def s
-      elements[1]
-    end
-  end
-
-  module Emb11
-    def to_rb
-      s.to_rb
-    end
-  end
-
-  def _nt_emb1
-    start_index = index
-    if node_cache[:emb1].has_key?(index)
-      cached = node_cache[:emb1][index]
-      if cached
-        node_cache[:emb1][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
-        @index = cached.interval.end
-      end
-      return cached
-    end
-
-    i0, s0 = index, []
-    if (match_len = has_terminal?(",", false, index))
-      r1 = true
-      @index += match_len
-    else
-      terminal_parse_failure('","')
-      r1 = nil
-    end
-    s0 << r1
-    if r1
-      r2 = _nt_text
-      s0 << r2
-    end
-    if s0.last
-      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-      r0.extend(Emb10)
-      r0.extend(Emb11)
-    else
-      @index = i0
-      r0 = nil
-    end
-
-    node_cache[:emb1][start_index] = r0
-
-    r0
-  end
-
   module Hexdigit0
     def dig
       elements[0]
@@ -2479,6 +2405,38 @@ module CBOR_DIAG
     r0
   end
 
+  def _nt_hbstring
+    start_index = index
+    if node_cache[:hbstring].has_key?(index)
+      cached = node_cache[:hbstring][index]
+      if cached
+        node_cache[:hbstring][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0 = index
+    r1 = _nt_hstring
+    if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
+      r0 = r1
+    else
+      r2 = _nt_bstring
+      if r2
+        r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
+        r0 = r2
+      else
+        @index = i0
+        r0 = nil
+      end
+    end
+
+    node_cache[:hbstring][start_index] = r0
+
+    r0
+  end
+
   module B64string0
   end
 
@@ -3141,13 +3099,17 @@ module CBOR_DIAG
   end
 
   module Streamstring0
-    def ows
+    def ows1
       elements[1]
     end
 
     def string
       elements[2]
     end
+
+    def ows2
+      elements[3]
+    end
   end
 
   module Streamstring1
@@ -3155,17 +3117,13 @@ module CBOR_DIAG
       elements[0]
     end
 
-    def ows1
+    def ows
       elements[1]
     end
 
     def an
       elements[2]
     end
-
-    def ows2
-      elements[3]
-    end
   end
 
   module Streamstring2
@@ -3195,31 +3153,31 @@ module CBOR_DIAG
   end
 
   module Streamstring4
-    def ows
+    def ows1
       elements[1]
     end
 
-    def hstring
+    def hbstring
       elements[2]
     end
+
+    def ows2
+      elements[3]
+    end
   end
 
   module Streamstring5
-    def hstring
+    def hbstring
       elements[0]
     end
 
-    def ows1
+    def ows
       elements[1]
     end
 
     def an
       elements[2]
     end
-
-    def ows2
-      elements[3]
-    end
   end
 
   module Streamstring6
@@ -3240,7 +3198,7 @@ module CBOR_DIAG
   module Streamstring7
     def to_rb
        r = if e = a1.elements
-         [e[0].to_rb] + e[2].elements.map {|x| x.hstring.to_rb }
+         [e[0].to_rb] + e[2].elements.map {|x| x.hbstring.to_rb }
        else
          []
        end
@@ -3309,6 +3267,10 @@ module CBOR_DIAG
                     if r12
                       r13 = _nt_string
                       s10 << r13
+                      if r13
+                        r14 = _nt_ows
+                        s10 << r14
+                      end
                     end
                   end
                   if s10.last
@@ -3326,10 +3288,6 @@ module CBOR_DIAG
                 end
                 r9 = instantiate_node(SyntaxNode,input, i9...index, s9)
                 s6 << r9
-                if r9
-                  r14 = _nt_ows
-                  s6 << r14
-                end
               end
             end
             if s6.last
@@ -3392,7 +3350,7 @@ module CBOR_DIAG
             s16 << r20
             if r20
               i21, s21 = index, []
-              r22 = _nt_hstring
+              r22 = _nt_hbstring
               s21 << r22
               if r22
                 r23 = _nt_ows
@@ -3413,8 +3371,12 @@ module CBOR_DIAG
                       r27 = _nt_ows
                       s25 << r27
                       if r27
-                        r28 = _nt_hstring
+                        r28 = _nt_hbstring
                         s25 << r28
+                        if r28
+                          r29 = _nt_ows
+                          s25 << r29
+                        end
                       end
                     end
                     if s25.last
@@ -3432,10 +3394,6 @@ module CBOR_DIAG
                   end
                   r24 = instantiate_node(SyntaxNode,input, i24...index, s24)
                   s21 << r24
-                  if r24
-                    r29 = _nt_ows
-                    s21 << r29
-                  end
                 end
               end
               if s21.last

data/lib/cbor-pure.rb

@@ -70,7 +70,7 @@ module CBOR
     end
     alias_method :inspect, :to_s
     def to_cborseq
-      CBOR.encode_seq(self)
+      CBOR.encode_seq(elements)
     end
   end
 
@@ -212,7 +212,7 @@ module CBOR
         d.each {|k, v| add(k); add(v)}
       end
     else
-      raise("Don't know how to encode #{d.inspect}")
+      raise("Don't know how to encode »#{d.inspect}« (#{d.class})")
     end
     self
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cbor-diag
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-29 00:00:00.000000000 Z
+date: 2023-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler