edn-abnf 0.5.21 → 0.5.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a48d4b4d55d42a64eb47ed73557f846722afa3c53bd8f41585361c34968eda7
-  data.tar.gz: db3a3032894bf087c97ff0ce6cc61b39378d4eca06d5512ded102bfaec2aa66d
+  metadata.gz: 2de62d87cb2ff756b2aaf5a615604391289921e5430f28f5ba0d655d4e0eb631
+  data.tar.gz: 56d5f8bc3a375799c9d8c534463b61a3b0e1d69c8422e21d0b8e40e7f4b79164
 SHA512:
-  metadata.gz: e26cb769623d7a3cf6e5d2eb43a971651b36523b8f14152c6d8d703212f0c5be4bddd5b7f92f3add2f60545d39d075cebccb2eed98a377d0ccac4560207b0076
-  data.tar.gz: 53c91f71836fe3532e358d6d2c74fa196274fb66b098c048ce8ff587dec561139edd3877b6ff734fc9904752bfb2ae3b42d4b475ace082085a1610531d6eeb58
+  metadata.gz: 05ca01e9fb98904f0d81b61d94bd78006ab09c8abf059c8ee71d40bf8110624021c711ca995fda388ac0528d1653100e57459487425166e785dbd2e6f0ff67aa
+  data.tar.gz: 3b8cb49feb84b974d613b87094e391bc3f00a7afb7fdbf113a37f92d996123b764729e876849432539a9a57244365954152d7d5daa9b41dbe208eb125b3bfb5a

data/edn-abnf.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "edn-abnf"
-  s.version = "0.5.21"
+  s.version = "0.5.23"
   s.summary = "CBOR Extended Diagnostic Notation (EDN) implemented in ABNF"
   s.description = %q{edn-abnf implements converters and miscellaneous tools for CBOR EDN's ABNF}
   s.author = "Carsten Bormann"

data/lib/parser/edngrammar.rb

@@ -2129,69 +2129,57 @@ module EDNGRAMMAR
     s0, i0 = [], index
     loop do
       i1 = index
-      if (match_len = has_terminal?("\t", false, index))
+      if (match_len = has_terminal?("\n", false, index))
         r2 = true
         @index += match_len
       else
-        terminal_parse_failure('"\\t"')
+        terminal_parse_failure('"\\n"')
         r2 = nil
       end
       if r2
         r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
         r1 = r2
       else
-        if (match_len = has_terminal?("\n", false, index))
+        if (match_len = has_terminal?("\r", false, index))
           r3 = true
           @index += match_len
         else
-          terminal_parse_failure('"\\n"')
+          terminal_parse_failure('"\\r"')
           r3 = nil
         end
         if r3
           r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
           r1 = r3
         else
-          if (match_len = has_terminal?("\r", false, index))
+          if has_terminal?(@regexps[gr = '\A[\\ -_]'] ||= Regexp.new(gr), :regexp, index)
             r4 = true
-            @index += match_len
+            @index += 1
           else
-            terminal_parse_failure('"\\r"')
+            terminal_parse_failure('[\\ -_]')
             r4 = nil
           end
           if r4
             r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
             r1 = r4
           else
-            if has_terminal?(@regexps[gr = '\A[\\ -_]'] ||= Regexp.new(gr), :regexp, index)
+            if has_terminal?(@regexps[gr = '\A[a-~]'] ||= Regexp.new(gr), :regexp, index)
               r5 = true
               @index += 1
             else
-              terminal_parse_failure('[\\ -_]')
+              terminal_parse_failure('[a-~]')
               r5 = nil
             end
             if r5
               r5 = SyntaxNode.new(input, (index-1)...index) if r5 == true
               r1 = r5
             else
-              if has_terminal?(@regexps[gr = '\A[a-~]'] ||= Regexp.new(gr), :regexp, index)
-                r6 = true
-                @index += 1
-              else
-                terminal_parse_failure('[a-~]')
-                r6 = nil
-              end
+              r6 = _nt_NONASCII
               if r6
                 r6 = SyntaxNode.new(input, (index-1)...index) if r6 == true
                 r1 = r6
               else
-                r7 = _nt_NONASCII
-                if r7
-                  r7 = SyntaxNode.new(input, (index-1)...index) if r7 == true
-                  r1 = r7
-                else
-                  @index = i1
-                  r1 = nil
-                end
+                @index = i1
+                r1 = nil
               end
             end
           end
@@ -3189,6 +3177,50 @@ module EDNGRAMMAR
     r0
   end
 
+  def _nt_lblank
+    start_index = index
+    if node_cache[:lblank].has_key?(index)
+      cached = node_cache[:lblank][index]
+      if cached
+        node_cache[:lblank][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0 = index
+    if (match_len = has_terminal?("\n", false, index))
+      r1 = true
+      @index += match_len
+    else
+      terminal_parse_failure('"\\n"')
+      r1 = nil
+    end
+    if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
+      r0 = r1
+    else
+      if (match_len = has_terminal?(" ", false, index))
+        r2 = true
+        @index += match_len
+      else
+        terminal_parse_failure('" "')
+        r2 = nil
+      end
+      if r2
+        r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
+        r0 = r2
+      else
+        @index = i0
+        r0 = nil
+      end
+    end
+
+    node_cache[:lblank][start_index] = r0
+
+    r0
+  end
+
   def _nt_non_slash
     start_index = index
     if node_cache[:non_slash].has_key?(index)
@@ -8009,63 +8041,51 @@ module EDNGRAMMAR
     end
 
     i0 = index
-    if (match_len = has_terminal?("\t", false, index))
+    if (match_len = has_terminal?("\r", false, index))
       r1 = true
       @index += match_len
     else
-      terminal_parse_failure('"\\t"')
+      terminal_parse_failure('"\\r"')
       r1 = nil
     end
     if r1
       r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
       r0 = r1
     else
-      if (match_len = has_terminal?("\r", false, index))
+      if has_terminal?(@regexps[gr = '\A[\\ -_]'] ||= Regexp.new(gr), :regexp, index)
         r2 = true
-        @index += match_len
+        @index += 1
       else
-        terminal_parse_failure('"\\r"')
+        terminal_parse_failure('[\\ -_]')
         r2 = nil
       end
       if r2
         r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
         r0 = r2
       else
-        if has_terminal?(@regexps[gr = '\A[\\ -_]'] ||= Regexp.new(gr), :regexp, index)
+        if has_terminal?(@regexps[gr = '\A[a-]'] ||= Regexp.new(gr), :regexp, index)
           r3 = true
           @index += 1
         else
-          terminal_parse_failure('[\\ -_]')
+          terminal_parse_failure('[a-]')
           r3 = nil
         end
         if r3
           r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
           r0 = r3
         else
-          if has_terminal?(@regexps[gr = '\A[a-]'] ||= Regexp.new(gr), :regexp, index)
-            r4 = true
-            @index += 1
-          else
-            terminal_parse_failure('[a-]')
-            r4 = nil
-          end
+          r4 = _nt_NONASCII
           if r4
             r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
             r0 = r4
           else
-            r5 = _nt_NONASCII
+            r5 = _nt_shortrawdelim
             if r5
               r5 = SyntaxNode.new(input, (index-1)...index) if r5 == true
               r0 = r5
             else
-              r6 = _nt_shortrawdelim
-              if r6
-                r6 = SyntaxNode.new(input, (index-1)...index) if r6 == true
-                r0 = r6
-              else
-                @index = i0
-                r0 = nil
-              end
+              @index = i0
+              r0 = nil
             end
           end
         end
@@ -8078,14 +8098,14 @@ module EDNGRAMMAR
   end
 
   module SqAppStringH0
-    def app_string_h
+    def s_app_string_h
       elements[1]
     end
 
   end
 
   module SqAppStringH1
-    def ast; app_string_h.ast end
+    def ast; s_app_string_h.ast end
   end
 
   def _nt_sq_app_string_h
@@ -8109,7 +8129,7 @@ module EDNGRAMMAR
     end
     s0 << r1
     if r1
-      r2 = _nt_app_string_h
+      r2 = _nt_s_app_string_h
       s0 << r2
       if r2
         if (match_len = has_terminal?("'", false, index))
@@ -8136,7 +8156,7 @@ module EDNGRAMMAR
     r0
   end
 
-  module AppStringH0
+  module SAppStringH0
     def HEXDIG1
       elements[0]
     end
@@ -8154,13 +8174,13 @@ module EDNGRAMMAR
     end
   end
 
-  module AppStringH1
+  module SAppStringH1
     def ast
       Integer(elements[0].text_value + elements[2].text_value, 16).chr("BINARY")
     end
   end
 
-  module AppStringH2
+  module SAppStringH2
     def ellipsis
       elements[0]
     end
@@ -8170,21 +8190,21 @@ module EDNGRAMMAR
     end
   end
 
-  module AppStringH3
+  module SAppStringH3
     def ast; ellipsis.ast end
   end
 
-  module AppStringH4
+  module SAppStringH4
   end
 
-  module AppStringH5
+  module SAppStringH5
     def h_S
       elements[0]
     end
 
   end
 
-  module AppStringH6
+  module SAppStringH6
     def unpack_thread(s)
       case s[0]
       when CBOR::Tagged
@@ -8215,12 +8235,12 @@ module EDNGRAMMAR
     end
   end
 
-  def _nt_app_string_h
+  def _nt_s_app_string_h
     start_index = index
-    if node_cache[:app_string_h].has_key?(index)
-      cached = node_cache[:app_string_h][index]
+    if node_cache[:s_app_string_h].has_key?(index)
+      cached = node_cache[:s_app_string_h][index]
       if cached
-        node_cache[:app_string_h][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:s_app_string_h][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -8250,8 +8270,8 @@ module EDNGRAMMAR
         end
         if s4.last
           r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
-          r4.extend(AppStringH0)
-          r4.extend(AppStringH1)
+          r4.extend(SAppStringH0)
+          r4.extend(SAppStringH1)
         else
           @index = i4
           r4 = nil
@@ -8269,8 +8289,8 @@ module EDNGRAMMAR
           end
           if s9.last
             r9 = instantiate_node(SyntaxNode,input, i9...index, s9)
-            r9.extend(AppStringH2)
-            r9.extend(AppStringH3)
+            r9.extend(SAppStringH2)
+            r9.extend(SAppStringH3)
           else
             @index = i9
             r9 = nil
@@ -8316,7 +8336,7 @@ module EDNGRAMMAR
         end
         if s13.last
           r13 = instantiate_node(SyntaxNode,input, i13...index, s13)
-          r13.extend(AppStringH4)
+          r13.extend(SAppStringH4)
         else
           @index = i13
           r13 = nil
@@ -8331,14 +8351,14 @@ module EDNGRAMMAR
     end
     if s0.last
       r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-      r0.extend(AppStringH5)
-      r0.extend(AppStringH6)
+      r0.extend(SAppStringH5)
+      r0.extend(SAppStringH6)
     else
       @index = i0
       r0 = nil
     end
 
-    node_cache[:app_string_h][start_index] = r0
+    node_cache[:s_app_string_h][start_index] = r0
 
     r0
   end
@@ -8712,7 +8732,7 @@ module EDNGRAMMAR
     i0, s0 = index, []
     s1, i1 = [], index
     loop do
-      r2 = _nt_blank
+      r2 = _nt_lblank
       if r2
         s1 << r2
       else
@@ -8730,7 +8750,7 @@ module EDNGRAMMAR
         if r5
           s6, i6 = [], index
           loop do
-            r7 = _nt_blank
+            r7 = _nt_lblank
             if r7
               s6 << r7
             else
@@ -8781,7 +8801,7 @@ module EDNGRAMMAR
     end
 
     i0 = index
-    r1 = _nt_blank
+    r1 = _nt_lblank
     if r1
       r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
       r0 = r1
@@ -9042,7 +9062,7 @@ module EDNGRAMMAR
       elements[0]
     end
 
-    def h_S
+    def rh_S
       elements[1]
     end
   end
@@ -9144,7 +9164,7 @@ module EDNGRAMMAR
           r10 = _nt_ellipsis
           s9 << r10
           if r10
-            r11 = _nt_h_S
+            r11 = _nt_rh_S
             s9 << r11
           end
           if s9.last
@@ -9237,14 +9257,14 @@ module EDNGRAMMAR
   end
 
   module SqAppStringB640
-    def app_string_b64
+    def s_app_string_b64
       elements[1]
     end
 
   end
 
   module SqAppStringB641
-    def ast; app_string_b64.ast end
+    def ast; s_app_string_b64.ast end
   end
 
   def _nt_sq_app_string_b64
@@ -9268,7 +9288,7 @@ module EDNGRAMMAR
     end
     s0 << r1
     if r1
-      r2 = _nt_app_string_b64
+      r2 = _nt_s_app_string_b64
       s0 << r2
       if r2
         if (match_len = has_terminal?("'", false, index))
@@ -9295,7 +9315,7 @@ module EDNGRAMMAR
     r0
   end
 
-  module AppStringB640
+  module SAppStringB640
     def b64dig
       elements[0]
     end
@@ -9305,14 +9325,14 @@ module EDNGRAMMAR
     end
   end
 
-  module AppStringB641
+  module SAppStringB641
     def b64_S
       elements[1]
     end
 
   end
 
-  module AppStringB642
+  module SAppStringB642
     def b64dig
       elements[0]
     end
@@ -9323,7 +9343,7 @@ module EDNGRAMMAR
 
   end
 
-  module AppStringB643
+  module SAppStringB643
     def b64dig1
       elements[0]
     end
@@ -9345,17 +9365,17 @@ module EDNGRAMMAR
     end
   end
 
-  module AppStringB644
+  module SAppStringB644
   end
 
-  module AppStringB645
+  module SAppStringB645
     def b64_S
       elements[0]
     end
 
   end
 
-  module AppStringB646
+  module SAppStringB646
     def ast
       t = text_value.gsub(/\s|#[^\n]*(?:\n|\z)/, '').chars.each_slice(4).map(&:join)
       if last = t[-1]
@@ -9370,12 +9390,12 @@ module EDNGRAMMAR
     end
   end
 
-  def _nt_app_string_b64
+  def _nt_s_app_string_b64
     start_index = index
-    if node_cache[:app_string_b64].has_key?(index)
-      cached = node_cache[:app_string_b64][index]
+    if node_cache[:s_app_string_b64].has_key?(index)
+      cached = node_cache[:s_app_string_b64][index]
       if cached
-        node_cache[:app_string_b64][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:s_app_string_b64][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -9398,7 +9418,7 @@ module EDNGRAMMAR
           end
           if s4.last
             r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
-            r4.extend(AppStringB640)
+            r4.extend(SAppStringB640)
           else
             @index = i4
             r4 = nil
@@ -9469,7 +9489,7 @@ module EDNGRAMMAR
                 end
                 if s15.last
                   r15 = instantiate_node(SyntaxNode,input, i15...index, s15)
-                  r15.extend(AppStringB641)
+                  r15.extend(SAppStringB641)
                 else
                   @index = i15
                   r15 = nil
@@ -9502,7 +9522,7 @@ module EDNGRAMMAR
                   end
                   if s19.last
                     r19 = instantiate_node(SyntaxNode,input, i19...index, s19)
-                    r19.extend(AppStringB642)
+                    r19.extend(SAppStringB642)
                   else
                     @index = i19
                     r19 = nil
@@ -9531,7 +9551,7 @@ module EDNGRAMMAR
         end
         if s8.last
           r8 = instantiate_node(SyntaxNode,input, i8...index, s8)
-          r8.extend(AppStringB643)
+          r8.extend(SAppStringB643)
         else
           @index = i8
           r8 = nil
@@ -9567,7 +9587,7 @@ module EDNGRAMMAR
           end
           if s26.last
             r26 = instantiate_node(SyntaxNode,input, i26...index, s26)
-            r26.extend(AppStringB644)
+            r26.extend(SAppStringB644)
           else
             @index = i26
             r26 = nil
@@ -9583,14 +9603,14 @@ module EDNGRAMMAR
     end
     if s0.last
       r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-      r0.extend(AppStringB645)
-      r0.extend(AppStringB646)
+      r0.extend(SAppStringB645)
+      r0.extend(SAppStringB646)
     else
       @index = i0
       r0 = nil
     end
 
-    node_cache[:app_string_b64][start_index] = r0
+    node_cache[:s_app_string_b64][start_index] = r0
 
     r0
   end
@@ -9876,7 +9896,7 @@ module EDNGRAMMAR
       elements[0]
     end
 
-    def b64_S
+    def rb64_S
       elements[1]
     end
   end
@@ -9928,7 +9948,7 @@ module EDNGRAMMAR
   end
 
   module RAppStringB645
-    def b64_S
+    def rb64_S
       elements[0]
     end
 
@@ -9961,7 +9981,7 @@ module EDNGRAMMAR
     end
 
     i0, s0 = index, []
-    r1 = _nt_b64_S
+    r1 = _nt_rb64_S
     s0 << r1
     if r1
       s2, i2 = [], index
@@ -9972,7 +9992,7 @@ module EDNGRAMMAR
           r5 = _nt_b64dig
           s4 << r5
           if r5
-            r6 = _nt_b64_S
+            r6 = _nt_rb64_S
             s4 << r6
           end
           if s4.last
@@ -10211,7 +10231,7 @@ module EDNGRAMMAR
     i0, s0 = index, []
     s1, i1 = [], index
     loop do
-      r2 = _nt_blank
+      r2 = _nt_lblank
       if r2
         s1 << r2
       else
@@ -10229,7 +10249,7 @@ module EDNGRAMMAR
         if r5
           s6, i6 = [], index
           loop do
-            r7 = _nt_blank
+            r7 = _nt_lblank
             if r7
               s6 << r7
             else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: edn-abnf
 version: !ruby/object:Gem::Version
-  version: 0.5.21
+  version: 0.5.23
 platform: ruby
 authors:
 - Carsten Bormann