cbor-diag 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10976372c461c25a70671e224b8136d5c3d949d5
-  data.tar.gz: d0bf29799ded2f7abb0bb544c7902ce58eac4978
+  metadata.gz: 0704b1e17c083c9ef5d176e5ea9d60510149c47f
+  data.tar.gz: ad8ff1c34855e5c2df358938a457c256015a6f37
 SHA512:
-  metadata.gz: 413152c4d8cb22cd01bc287060063bdbd5fa5d22ce5644aa7b6278a93a4db2cf881c850227855d0ea1aa7169fdef1bff7ae87bf20e6562619982e8c2d2a5b81f
-  data.tar.gz: 17d2a17a00fcc1e5c76ed31928ddf003c0222c99a6a65ab41e204198654530823aadae6708e8cfe955db8fd2c729d4aaa8ff5e491c42464f88cee96e5dbd759d
+  metadata.gz: ac29ccd1f9e7f34b152b88d33ed55c9daf4118268c42ddd1ebfb143d68fee6a2f8a5fa7c7249c81b5b47549a5df57e17cd641b66cc7cc2db101cc085f486fd3c
+  data.tar.gz: 2b01d4aabf59a15f20fb39a47cc44356e52d1336cf3e2ee4f4e20efcfdc34ea94b763f0faaa102adf1a385df8eab92d92fe5db2298071d5015126511941cdff9

data/cbor-diag.gemspec

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

data/lib/cbor-diag-parser.rb

@@ -119,23 +119,29 @@ module CBOR_DIAG
                       r9 = SyntaxNode.new(input, (index-1)...index) if r9 == true
                       r0 = r9
                     else
-                      r10 = _nt_array
+                      r10 = _nt_embedded
                       if r10
                         r10 = SyntaxNode.new(input, (index-1)...index) if r10 == true
                         r0 = r10
                       else
-                        r11 = _nt_map
+                        r11 = _nt_array
                         if r11
                           r11 = SyntaxNode.new(input, (index-1)...index) if r11 == true
                           r0 = r11
                         else
-                          r12 = _nt_streamstring
+                          r12 = _nt_map
                           if r12
                             r12 = SyntaxNode.new(input, (index-1)...index) if r12 == true
                             r0 = r12
                           else
-                            @index = i0
-                            r0 = nil
+                            r13 = _nt_streamstring
+                            if r13
+                              r13 = SyntaxNode.new(input, (index-1)...index) if r13 == true
+                              r0 = r13
+                            else
+                              @index = i0
+                              r0 = nil
+                            end
                           end
                         end
                       end
@@ -1912,6 +1918,155 @@ module CBOR_DIAG
     r0
   end
 
+  module Embedded0
+    def text
+      elements[0]
+    end
+
+  end
+
+  module Embedded1
+    def s
+      elements[1]
+    end
+
+  end
+
+  module Embedded2
+    def to_rb
+      if se = s.elements
+        [se[0], *se[1].elements].map{|x| CBOR.encode(x.to_rb)}.join.b
+      else
+        "".b
+      end
+    end
+  end
+
+  def _nt_embedded
+    start_index = index
+    if node_cache[:embedded].has_key?(index)
+      cached = node_cache[:embedded][index]
+      if cached
+        node_cache[:embedded][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 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+      @index += match_len
+    else
+      terminal_parse_failure('"<<"')
+      r1 = nil
+    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
+      if r3
+        r2 = r3
+      else
+        r2 = instantiate_node(SyntaxNode,input, index...index)
+      end
+      s0 << r2
+      if r2
+        if (match_len = has_terminal?(">>", false, index))
+          r7 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+          @index += match_len
+        else
+          terminal_parse_failure('">>"')
+          r7 = nil
+        end
+        s0 << r7
+      end
+    end
+    if s0.last
+      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+      r0.extend(Embedded1)
+      r0.extend(Embedded2)
+    else
+      @index = i0
+      r0 = nil
+    end
+
+    node_cache[:embedded][start_index] = r0
+
+    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]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cbor-diag
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Carsten Bormann