cbor-diag 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b69d3972c5025e19fc39e62c2f3047d065175937
-  data.tar.gz: 751518e67725d57779c880cfa7dd5076f88e4434
+  metadata.gz: fcb520130b1dd8d160e193f0e220042dfd4779ea
+  data.tar.gz: 2f1f8ed1bcb7b8e0d956d505307b3b6bd22edc1f
 SHA512:
-  metadata.gz: 678e307b425002b382c970432808d5fdb83743b1318a72ee6f0bd6e8d14940089668a0e3d22d6d55e0c87029d5849bb59f866efe63d2d887ba275e5363ddf8a2
-  data.tar.gz: a63b963cf1f68b75349a87a39bf91280c844649bf8eaeaf49c12cab3c14f5d13f67ee42800e52e68ab239e580d691e55f712b197151c9dd7ae89d95b0d9fbc22
+  metadata.gz: be137d244ceaedcb26dcdcecd52ec08684703759b3364b902aa6244c459f2e27a82999d0d4244d3ef7d638930925a2c5b1bbd790cf7c8ba79a6acf77cebdcb00
+  data.tar.gz: d790ec5b0deaefe14607c3ea18eb8aacd50933f9d270bdedb3da13b6e3a65dc81508c0128bf20aa5b472e16800c7e958c884612181990d0edc1d6039a3bbcb65

data/cbor-diag.gemspec

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

@@ -104,23 +104,29 @@ module CBOR_DIAG
                 r6 = SyntaxNode.new(input, (index-1)...index) if r6 == true
                 r0 = r6
               else
-                r7 = _nt_array
+                r7 = _nt_b64string
                 if r7
                   r7 = SyntaxNode.new(input, (index-1)...index) if r7 == true
                   r0 = r7
                 else
-                  r8 = _nt_map
+                  r8 = _nt_array
                   if r8
                     r8 = SyntaxNode.new(input, (index-1)...index) if r8 == true
                     r0 = r8
                   else
-                    r9 = _nt_streamstring
+                    r9 = _nt_map
                     if r9
                       r9 = SyntaxNode.new(input, (index-1)...index) if r9 == true
                       r0 = r9
                     else
-                      @index = i0
-                      r0 = nil
+                      r10 = _nt_streamstring
+                      if r10
+                        r10 = SyntaxNode.new(input, (index-1)...index) if r10 == true
+                        r0 = r10
+                      else
+                        @index = i0
+                        r0 = nil
+                      end
                     end
                   end
                 end
@@ -1273,17 +1279,17 @@ module CBOR_DIAG
     r0
   end
 
-  module Hstring0
+  module B64string0
   end
 
-  module Hstring1
+  module B64string1
     def s
       elements[1]
     end
 
   end
 
-  module Hstring2
+  module B64string2
     #"
                 def to_rb;
                   t = s.text_value.chars.each_slice(4).map(&:join)
@@ -1294,12 +1300,12 @@ module CBOR_DIAG
                 end
   end
 
-  def _nt_hstring
+  def _nt_b64string
     start_index = index
-    if node_cache[:hstring].has_key?(index)
-      cached = node_cache[:hstring][index]
+    if node_cache[:b64string].has_key?(index)
+      cached = node_cache[:b64string][index]
       if cached
-        node_cache[:hstring][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:b64string][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -1354,7 +1360,7 @@ module CBOR_DIAG
       end
       if s2.last
         r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
-        r2.extend(Hstring0)
+        r2.extend(B64string0)
       else
         @index = i2
         r2 = nil
@@ -1373,14 +1379,14 @@ module CBOR_DIAG
     end
     if s0.last
       r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-      r0.extend(Hstring1)
-      r0.extend(Hstring2)
+      r0.extend(B64string1)
+      r0.extend(B64string2)
     else
       @index = i0
       r0 = nil
     end
 
-    node_cache[:hstring][start_index] = r0
+    node_cache[:b64string][start_index] = r0
 
     r0
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cbor-diag
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-02 00:00:00.000000000 Z
+date: 2015-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler