cbor-diag 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbc50b81351785251755ccefdd4699d3fc47b05f
-  data.tar.gz: 395b8361bf5e6e8ac25e9ba33fae3932656407eb
+  metadata.gz: 7aa80d45a6ae5f3ed58ba23f627a72783d3ef09e
+  data.tar.gz: fbf6382b6f7351229f470c836395ba14f903a825
 SHA512:
-  metadata.gz: 79c34273050260b7c295a99f00b39c6ce6f99e6858a3d1a2446bdeeb5262b905f5f72becab34d2b10a53f4b92ad8fe628eaddfffee3f63e842d12a0580b82508
-  data.tar.gz: bbc94c97f12177dda1bb3198570332c2e52b71ec10c5b1a07b7cdcedd6ace72816a587b1e255e703fa35d2074a3a43a50351590131dc57d33a7ed9f556ec9b46
+  metadata.gz: 63eb19bedae2c11b1b687828869af180326e0f562fb9052ed556a6674734fc640cb3abecd55ec595a495a6f0cc7ef99cdcf534fef026b64fe163ae3de0a4a1ad
+  data.tar.gz: d72dd52e82fd8ae59742353b2da6e6d2472218d1931f3eb98a45284eefe75e4e11a27373d35332838e4676c99e0f23430dfe52936d5bfcfcba14e38b037531fe

data/cbor-diag.gemspec

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

@@ -233,7 +233,7 @@ module CBOR_DIAG
         r8 = true
         @index += match_len
       else
-        terminal_parse_failure('.')
+        terminal_parse_failure('\'.\'')
         r8 = nil
       end
       s7 << r8
@@ -381,7 +381,7 @@ module CBOR_DIAG
       r1.extend(Infin0)
       @index += match_len
     else
-      terminal_parse_failure('Infinity')
+      terminal_parse_failure('\'Infinity\'')
       r1 = nil
     end
     if r1
@@ -393,7 +393,7 @@ module CBOR_DIAG
         r2.extend(Infin1)
         @index += match_len
       else
-        terminal_parse_failure('-Infinity')
+        terminal_parse_failure('\'-Infinity\'')
         r2 = nil
       end
       if r2
@@ -405,7 +405,7 @@ module CBOR_DIAG
           r3.extend(Infin2)
           @index += match_len
         else
-          terminal_parse_failure('NaN')
+          terminal_parse_failure('\'NaN\'')
           r3 = nil
         end
         if r3
@@ -475,7 +475,7 @@ module CBOR_DIAG
       r1.extend(Simple0)
       @index += match_len
     else
-      terminal_parse_failure('false')
+      terminal_parse_failure('\'false\'')
       r1 = nil
     end
     if r1
@@ -487,7 +487,7 @@ module CBOR_DIAG
         r2.extend(Simple1)
         @index += match_len
       else
-        terminal_parse_failure('true')
+        terminal_parse_failure('\'true\'')
         r2 = nil
       end
       if r2
@@ -499,7 +499,7 @@ module CBOR_DIAG
           r3.extend(Simple2)
           @index += match_len
         else
-          terminal_parse_failure('null')
+          terminal_parse_failure('\'null\'')
           r3 = nil
         end
         if r3
@@ -511,7 +511,7 @@ module CBOR_DIAG
             r4.extend(Simple3)
             @index += match_len
           else
-            terminal_parse_failure('undefined')
+            terminal_parse_failure('\'undefined\'')
             r4 = nil
           end
           if r4
@@ -523,7 +523,7 @@ module CBOR_DIAG
               r6 = instantiate_node(SyntaxNode,input, index...(index + match_len))
               @index += match_len
             else
-              terminal_parse_failure('simple(')
+              terminal_parse_failure('\'simple(\'')
               r6 = nil
             end
             s5 << r6
@@ -541,7 +541,7 @@ module CBOR_DIAG
                       r10 = true
                       @index += match_len
                     else
-                      terminal_parse_failure(')')
+                      terminal_parse_failure('\')\'')
                       r10 = nil
                     end
                     s5 << r10
@@ -638,7 +638,7 @@ module CBOR_DIAG
         r3 = true
         @index += match_len
       else
-        terminal_parse_failure('(')
+        terminal_parse_failure('\'(\'')
         r3 = nil
       end
       s0 << r3
@@ -656,7 +656,7 @@ module CBOR_DIAG
                 r7 = true
                 @index += match_len
               else
-                terminal_parse_failure(')')
+                terminal_parse_failure('\')\'')
                 r7 = nil
               end
               s0 << r7
@@ -709,7 +709,7 @@ module CBOR_DIAG
       r1 = true
       @index += match_len
     else
-      terminal_parse_failure('"')
+      terminal_parse_failure('\'"\'')
       r1 = nil
     end
     s0 << r1
@@ -730,7 +730,7 @@ module CBOR_DIAG
           r4 = true
           @index += match_len
         else
-          terminal_parse_failure('"')
+          terminal_parse_failure('\'"\'')
           r4 = nil
         end
         s0 << r4
@@ -848,7 +848,7 @@ module CBOR_DIAG
         r4 = true
         @index += match_len
       else
-        terminal_parse_failure("\\")
+        terminal_parse_failure('"\\\\"')
         r4 = nil
       end
       s3 << r4
@@ -879,7 +879,7 @@ module CBOR_DIAG
           r7 = instantiate_node(SyntaxNode,input, index...(index + match_len))
           @index += match_len
         else
-          terminal_parse_failure("\\u")
+          terminal_parse_failure('"\\\\u"')
           r7 = nil
         end
         s6 << r7
@@ -925,6 +925,9 @@ module CBOR_DIAG
                 @index = i11
                 r11 = nil
               else
+                if s11.size < 2
+                  terminal_failures.pop
+                end
                 r11 = instantiate_node(SyntaxNode,input, i11...index, s11)
               end
               s8 << r11
@@ -943,7 +946,7 @@ module CBOR_DIAG
               r13 = instantiate_node(SyntaxNode,input, index...(index + match_len))
               @index += match_len
             else
-              terminal_parse_failure("\\u")
+              terminal_parse_failure('"\\\\u"')
               r13 = nil
             end
             s6 << r13
@@ -989,6 +992,9 @@ module CBOR_DIAG
                     @index = i17
                     r17 = nil
                   else
+                    if s17.size < 2
+                      terminal_failures.pop
+                    end
                     r17 = instantiate_node(SyntaxNode,input, i17...index, s17)
                   end
                   s14 << r17
@@ -1022,7 +1028,7 @@ module CBOR_DIAG
             r20 = instantiate_node(SyntaxNode,input, index...(index + match_len))
             @index += match_len
           else
-            terminal_parse_failure("\\u")
+            terminal_parse_failure('"\\\\u"')
             r20 = nil
           end
           s19 << r20
@@ -1060,6 +1066,9 @@ module CBOR_DIAG
                 @index = i24
                 r24 = nil
               else
+                if s24.size < 3
+                  terminal_failures.pop
+                end
                 r24 = instantiate_node(SyntaxNode,input, i24...index, s24)
               end
               s22 << r24
@@ -1116,6 +1125,9 @@ module CBOR_DIAG
                     @index = i29
                     r29 = nil
                   else
+                    if s29.size < 2
+                      terminal_failures.pop
+                    end
                     r29 = instantiate_node(SyntaxNode,input, i29...index, s29)
                   end
                   s26 << r29
@@ -1195,7 +1207,7 @@ module CBOR_DIAG
       r1 = instantiate_node(SyntaxNode,input, index...(index + match_len))
       @index += match_len
     else
-      terminal_parse_failure("h'")
+      terminal_parse_failure('"h\'"')
       r1 = nil
     end
     s0 << r1
@@ -1241,7 +1253,7 @@ module CBOR_DIAG
           r6 = true
           @index += match_len
         else
-          terminal_parse_failure("'")
+          terminal_parse_failure('"\'"')
           r6 = nil
         end
         s0 << r6
@@ -1261,6 +1273,118 @@ module CBOR_DIAG
     r0
   end
 
+  module Hstring0
+  end
+
+  module Hstring1
+    def s
+      elements[1]
+    end
+
+  end
+
+  module Hstring2
+    #"
+                def to_rb;
+                  t = s.text_value.chars.each_slice(4).map(&:join)
+                  if last = t[-1]
+                    last << "=" * (4 - last.size)
+                  end
+                  t.join.tr("-_", "+/").unpack("m0")[0]
+                end
+  end
+
+  def _nt_hstring
+    start_index = index
+    if node_cache[:hstring].has_key?(index)
+      cached = node_cache[:hstring][index]
+      if cached
+        node_cache[:hstring][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?("b64'", false, index))
+      r1 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+      @index += match_len
+    else
+      terminal_parse_failure('"b64\'"')
+      r1 = nil
+    end
+    s0 << r1
+    if r1
+      i2, s2 = index, []
+      s3, i3 = [], index
+      loop do
+        if has_terminal?(@regexps[gr = '\A[0-9a-fA-F_\\-+/]'] ||= Regexp.new(gr), :regexp, index)
+          r4 = true
+          @index += 1
+        else
+          terminal_parse_failure('[0-9a-fA-F_\\-+/]')
+          r4 = nil
+        end
+        if r4
+          s3 << r4
+        else
+          break
+        end
+      end
+      r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
+      s2 << r3
+      if r3
+        s5, i5 = [], index
+        loop do
+          if has_terminal?(@regexps[gr = '\A[=]'] ||= Regexp.new(gr), :regexp, index)
+            r6 = true
+            @index += 1
+          else
+            terminal_parse_failure('[=]')
+            r6 = nil
+          end
+          if r6
+            s5 << r6
+          else
+            break
+          end
+        end
+        r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
+        s2 << r5
+      end
+      if s2.last
+        r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
+        r2.extend(Hstring0)
+      else
+        @index = i2
+        r2 = nil
+      end
+      s0 << r2
+      if r2
+        if (match_len = has_terminal?("'", false, index))
+          r7 = true
+          @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(Hstring1)
+      r0.extend(Hstring2)
+    else
+      @index = i0
+      r0 = nil
+    end
+
+    node_cache[:hstring][start_index] = r0
+
+    r0
+  end
+
   module Array0
     def ows1
       elements[1]
@@ -1334,7 +1458,7 @@ module CBOR_DIAG
       r1 = true
       @index += match_len
     else
-      terminal_parse_failure('[')
+      terminal_parse_failure('\'[\'')
       r1 = nil
     end
     s0 << r1
@@ -1356,7 +1480,7 @@ module CBOR_DIAG
                 r9 = true
                 @index += match_len
               else
-                terminal_parse_failure(',')
+                terminal_parse_failure('\',\'')
                 r9 = nil
               end
               s8 << r9
@@ -1410,7 +1534,7 @@ module CBOR_DIAG
               r14 = true
               @index += match_len
             else
-              terminal_parse_failure(']')
+              terminal_parse_failure('\']\'')
               r14 = nil
             end
             s0 << r14
@@ -1505,7 +1629,7 @@ module CBOR_DIAG
       r1 = true
       @index += match_len
     else
-      terminal_parse_failure('{')
+      terminal_parse_failure('\'{\'')
       r1 = nil
     end
     s0 << r1
@@ -1527,7 +1651,7 @@ module CBOR_DIAG
                 r9 = true
                 @index += match_len
               else
-                terminal_parse_failure(',')
+                terminal_parse_failure('\',\'')
                 r9 = nil
               end
               s8 << r9
@@ -1581,7 +1705,7 @@ module CBOR_DIAG
               r14 = true
               @index += match_len
             else
-              terminal_parse_failure('}')
+              terminal_parse_failure('\'}\'')
               r14 = nil
             end
             s0 << r14
@@ -1649,7 +1773,7 @@ module CBOR_DIAG
           r3 = true
           @index += match_len
         else
-          terminal_parse_failure(":")
+          terminal_parse_failure('":"')
           r3 = nil
         end
         s0 << r3
@@ -1835,7 +1959,7 @@ module CBOR_DIAG
       r2 = true
       @index += match_len
     else
-      terminal_parse_failure('(')
+      terminal_parse_failure('\'(\'')
       r2 = nil
     end
     s1 << r2
@@ -1847,7 +1971,7 @@ module CBOR_DIAG
           r4 = true
           @index += match_len
         else
-          terminal_parse_failure("_")
+          terminal_parse_failure('"_"')
           r4 = nil
         end
         s1 << r4
@@ -1869,7 +1993,7 @@ module CBOR_DIAG
                     r11 = true
                     @index += match_len
                   else
-                    terminal_parse_failure(",")
+                    terminal_parse_failure('","')
                     r11 = nil
                   end
                   s10 << r11
@@ -1915,7 +2039,7 @@ module CBOR_DIAG
                 r15 = true
                 @index += match_len
               else
-                terminal_parse_failure(')')
+                terminal_parse_failure('\')\'')
                 r15 = nil
               end
               s1 << r15
@@ -1941,7 +2065,7 @@ module CBOR_DIAG
         r17 = true
         @index += match_len
       else
-        terminal_parse_failure('(')
+        terminal_parse_failure('\'(\'')
         r17 = nil
       end
       s16 << r17
@@ -1953,7 +2077,7 @@ module CBOR_DIAG
             r19 = true
             @index += match_len
           else
-            terminal_parse_failure("_")
+            terminal_parse_failure('"_"')
             r19 = nil
           end
           s16 << r19
@@ -1975,7 +2099,7 @@ module CBOR_DIAG
                       r26 = true
                       @index += match_len
                     else
-                      terminal_parse_failure(",")
+                      terminal_parse_failure('","')
                       r26 = nil
                     end
                     s25 << r26
@@ -2021,7 +2145,7 @@ module CBOR_DIAG
                   r30 = true
                   @index += match_len
                 else
-                  terminal_parse_failure(')')
+                  terminal_parse_failure('\')\'')
                   r30 = nil
                 end
                 s16 << r30
@@ -2091,7 +2215,7 @@ module CBOR_DIAG
         r3 = true
         @index += match_len
       else
-        terminal_parse_failure("_")
+        terminal_parse_failure('"_"')
         r3 = nil
       end
       if r3

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cbor-diag
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-09 00:00:00.000000000 Z
+date: 2015-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -105,3 +105,4 @@ signing_key:
 specification_version: 4
 summary: CBOR (Concise Binary Object Representation) diagnostic notation
 test_files: []
+has_rdoc: false