cbor-diag 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7bb510fc7bc50a18a36135d64f8532ecd481f5d
-  data.tar.gz: a2b1adf9abdf7ac8fc6dd69b1e3abbbc4f150a74
+  metadata.gz: 07d189c84e8268cba0d305a69be2be6171fb6fe5
+  data.tar.gz: 71145361b05c19d21bd26320fae09d34720ba60c
 SHA512:
-  metadata.gz: 60de42be3a630b23fb820e778a546064218cf31742b46f03e96892dc90be6dd200256344d5965849cc5d275ac5702da898137ed100754f9496008fc35fbfc122
-  data.tar.gz: 04a1672f01c56258d63c6fc708707f38215885cc0456b1ee321d4593730f7f564810f0863bc0b3657c589c14906232bbc10e9b46d83b2191f370e8a80a9d3414
+  metadata.gz: ce77f679d0fcc80d9c1e60567548dbe3eb6d50af296b4e5d9f04fea10105cc1346b829fb4d41b2ef79359f946f501688b2f1ba6e051d4cb362faf676ba267eb1
+  data.tar.gz: 6b5b719f66a3add0320e6638ffb0f77e7f10edbc5e65491f626fcf4e7b89c631edd11a3f0a702041b80bd9e7ff330cb21ca924b779bd5cfe9fec477b0a5082c9

data/cbor-diag.gemspec

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

@@ -374,12 +374,21 @@ module CBOR_DIAG
   end
 
   module Hnumber1
+  end
+
+  module Hnumber2
+  end
+
+  module Hnumber3
+  end
+
+  module Hnumber4
     def ip
       elements[0]
     end
   end
 
-  module Hnumber2
+  module Hnumber5
     def to_rb
       Integer(ip.text_value)
     end
@@ -421,43 +430,150 @@ module CBOR_DIAG
       end
       s1 << r4
       if r4
+        i5 = index
+        i6, s6 = index, []
         if has_terminal?(@regexps[gr = '\A[xX]'] ||= Regexp.new(gr), :regexp, index)
-          r5 = true
+          r7 = true
           @index += 1
         else
           terminal_parse_failure('[xX]')
-          r5 = nil
+          r7 = nil
         end
-        s1 << r5
-        if r5
-          s6, i6 = [], index
+        s6 << r7
+        if r7
+          s8, i8 = [], index
           loop do
             if has_terminal?(@regexps[gr = '\A[0-9a-fA-F]'] ||= Regexp.new(gr), :regexp, index)
-              r7 = true
+              r9 = true
               @index += 1
             else
               terminal_parse_failure('[0-9a-fA-F]')
-              r7 = nil
+              r9 = nil
             end
-            if r7
-              s6 << r7
+            if r9
+              s8 << r9
             else
               break
             end
           end
-          if s6.empty?
-            @index = i6
-            r6 = nil
+          if s8.empty?
+            @index = i8
+            r8 = nil
+          else
+            r8 = instantiate_node(SyntaxNode,input, i8...index, s8)
+          end
+          s6 << r8
+        end
+        if s6.last
+          r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
+          r6.extend(Hnumber0)
+        else
+          @index = i6
+          r6 = nil
+        end
+        if r6
+          r6 = SyntaxNode.new(input, (index-1)...index) if r6 == true
+          r5 = r6
+        else
+          i10, s10 = index, []
+          if has_terminal?(@regexps[gr = '\A[oO]'] ||= Regexp.new(gr), :regexp, index)
+            r11 = true
+            @index += 1
+          else
+            terminal_parse_failure('[oO]')
+            r11 = nil
+          end
+          s10 << r11
+          if r11
+            s12, i12 = [], index
+            loop do
+              if has_terminal?(@regexps[gr = '\A[0-7]'] ||= Regexp.new(gr), :regexp, index)
+                r13 = true
+                @index += 1
+              else
+                terminal_parse_failure('[0-7]')
+                r13 = nil
+              end
+              if r13
+                s12 << r13
+              else
+                break
+              end
+            end
+            if s12.empty?
+              @index = i12
+              r12 = nil
+            else
+              r12 = instantiate_node(SyntaxNode,input, i12...index, s12)
+            end
+            s10 << r12
+          end
+          if s10.last
+            r10 = instantiate_node(SyntaxNode,input, i10...index, s10)
+            r10.extend(Hnumber1)
+          else
+            @index = i10
+            r10 = nil
+          end
+          if r10
+            r10 = SyntaxNode.new(input, (index-1)...index) if r10 == true
+            r5 = r10
           else
-            r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
+            i14, s14 = index, []
+            if has_terminal?(@regexps[gr = '\A[bB]'] ||= Regexp.new(gr), :regexp, index)
+              r15 = true
+              @index += 1
+            else
+              terminal_parse_failure('[bB]')
+              r15 = nil
+            end
+            s14 << r15
+            if r15
+              s16, i16 = [], index
+              loop do
+                if has_terminal?(@regexps[gr = '\A[01]'] ||= Regexp.new(gr), :regexp, index)
+                  r17 = true
+                  @index += 1
+                else
+                  terminal_parse_failure('[01]')
+                  r17 = nil
+                end
+                if r17
+                  s16 << r17
+                else
+                  break
+                end
+              end
+              if s16.empty?
+                @index = i16
+                r16 = nil
+              else
+                r16 = instantiate_node(SyntaxNode,input, i16...index, s16)
+              end
+              s14 << r16
+            end
+            if s14.last
+              r14 = instantiate_node(SyntaxNode,input, i14...index, s14)
+              r14.extend(Hnumber2)
+            else
+              @index = i14
+              r14 = nil
+            end
+            if r14
+              r14 = SyntaxNode.new(input, (index-1)...index) if r14 == true
+              r5 = r14
+            else
+              @index = i5
+              r5 = nil
+            end
           end
-          s1 << r6
         end
+        s1 << r5
       end
     end
     if s1.last
       r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
-      r1.extend(Hnumber0)
+      r1.extend(Hnumber3)
     else
       @index = i1
       r1 = nil
@@ -465,8 +581,8 @@ module CBOR_DIAG
     s0 << r1
     if s0.last
       r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-      r0.extend(Hnumber1)
-      r0.extend(Hnumber2)
+      r0.extend(Hnumber4)
+      r0.extend(Hnumber5)
     else
       @index = i0
       r0 = nil

metadata

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