edn-abnf 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 119b776b0bf643c32c9c0c2481b654e3087d0a7747f0a3f9bf9ae2460837a67a
-  data.tar.gz: bc7545b0786eeae5f5d33c6b95b702fe383ccdc306ecc5370e932413e089838e
+  metadata.gz: 65315f840b92a39b734580ff2050ff4e92329048046c9d24ed1d1246858ae8fd
+  data.tar.gz: 1949f58b8fe44914999cc91a78c14f87d28865cd753d749c0752333448d676a2
 SHA512:
-  metadata.gz: e5c9dd0f7c19367133392c803bdf4719d6e0ec45d49d74c3fc05bb59e2d38e6ce0ffe38f17c0610c454783b795d5528e3bb030f32b452df9a802cbd447fc4c13
-  data.tar.gz: 994b84d2f1e90643aacfb3ef117d150bafbbd2a28f63057f25b51d5a1222d5a222a5d7fd8c77c83232c28e7378084bfaccc0d04db3e0f60eafecca7ed2eecb86
+  metadata.gz: 9a559663ff8b81dcccecb561c8226dc5184276f119e08b23195578ead701a92fc1068e7067416a352c41596bbe733f503df7c554dbcb13ba36541da2661f4fd9
+  data.tar.gz: 6429e1496befd64f71a17e933132c39bfb960e342d40d8616ee4f272d47feafef1f9d5323e075a02007a854990c23e1881e691851cca8545a51a069d10cde171

data/edn-abnf.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "edn-abnf"
-  s.version = "0.0.6"
+  s.version = "0.0.7"
   s.summary = "CDDL (Concise Data Definition Language) converters and miscellaneous tools"
   s.description = %q{edn-abnf implements converters and miscellaneous tools for CBOR EDN's ABNF}
   s.author = "Carsten Bormann"

data/lib/parser/edngrammar.rb

@@ -1931,19 +1931,31 @@ module EDNGRAMMAR
         r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
         r0 = r2
       else
-        if has_terminal?(@regexps[gr = '\A[0-􏿿]'] ||= Regexp.new(gr), :regexp, index)
+        if has_terminal?(@regexps[gr = '\A[0-퟿]'] ||= Regexp.new(gr), :regexp, index)
           r3 = true
           @index += 1
         else
-          terminal_parse_failure('[0-􏿿]')
+          terminal_parse_failure('[0-퟿]')
           r3 = nil
         end
         if r3
           r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
           r0 = r3
         else
-          @index = i0
-          r0 = nil
+          if has_terminal?(@regexps[gr = '\A[-􏿿]'] ||= Regexp.new(gr), :regexp, index)
+            r4 = true
+            @index += 1
+          else
+            terminal_parse_failure('[-􏿿]')
+            r4 = nil
+          end
+          if r4
+            r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
+            r0 = r4
+          else
+            @index = i0
+            r0 = nil
+          end
         end
       end
     end
@@ -1953,7 +1965,79 @@ module EDNGRAMMAR
     r0
   end
 
+  def _nt_non_lf
+    start_index = index
+    if node_cache[:non_lf].has_key?(index)
+      cached = node_cache[:non_lf][index]
+      if cached
+        node_cache[:non_lf][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?("\t", false, index))
+      r1 = true
+      @index += match_len
+    else
+      terminal_parse_failure('"\\t"')
+      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))
+        r2 = true
+        @index += match_len
+      else
+        terminal_parse_failure('"\\r"')
+        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)
+          r3 = true
+          @index += 1
+        else
+          terminal_parse_failure('[\\ -퟿]')
+          r3 = nil
+        end
+        if r3
+          r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
+          r0 = r3
+        else
+          if has_terminal?(@regexps[gr = '\A[-􏿿]'] ||= Regexp.new(gr), :regexp, index)
+            r4 = true
+            @index += 1
+          else
+            terminal_parse_failure('[-􏿿]')
+            r4 = nil
+          end
+          if r4
+            r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
+            r0 = r4
+          else
+            @index = i0
+            r0 = nil
+          end
+        end
+      end
+    end
+
+    node_cache[:non_lf][start_index] = r0
+
+    r0
+  end
+
   module S0
+    def comment
+      elements[0]
+    end
+
   end
 
   module S1
@@ -1986,18 +2070,12 @@ module EDNGRAMMAR
       s3, i3 = [], index
       loop do
         i4, s4 = index, []
-        if (match_len = has_terminal?("/", false, index))
-          r5 = true
-          @index += match_len
-        else
-          terminal_parse_failure('"/"')
-          r5 = nil
-        end
+        r5 = _nt_comment
         s4 << r5
         if r5
           s6, i6 = [], index
           loop do
-            r7 = _nt_non_slash
+            r7 = _nt_blank
             if r7
               s6 << r7
             else
@@ -2006,29 +2084,6 @@ module EDNGRAMMAR
           end
           r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
           s4 << r6
-          if r6
-            if (match_len = has_terminal?("/", false, index))
-              r8 = true
-              @index += match_len
-            else
-              terminal_parse_failure('"/"')
-              r8 = nil
-            end
-            s4 << r8
-            if r8
-              s9, i9 = [], index
-              loop do
-                r10 = _nt_blank
-                if r10
-                  s9 << r10
-                else
-                  break
-                end
-              end
-              r9 = instantiate_node(SyntaxNode,input, i9...index, s9)
-              s4 << r9
-            end
-          end
         end
         if s4.last
           r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
@@ -2059,6 +2114,120 @@ module EDNGRAMMAR
     r0
   end
 
+  module Comment0
+  end
+
+  module Comment1
+  end
+
+  def _nt_comment
+    start_index = index
+    if node_cache[:comment].has_key?(index)
+      cached = node_cache[:comment][index]
+      if cached
+        node_cache[:comment][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0 = index
+    i1, s1 = index, []
+    if (match_len = has_terminal?("/", false, index))
+      r2 = true
+      @index += match_len
+    else
+      terminal_parse_failure('"/"')
+      r2 = nil
+    end
+    s1 << r2
+    if r2
+      s3, i3 = [], index
+      loop do
+        r4 = _nt_non_slash
+        if r4
+          s3 << r4
+        else
+          break
+        end
+      end
+      r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
+      s1 << r3
+      if r3
+        if (match_len = has_terminal?("/", false, index))
+          r5 = true
+          @index += match_len
+        else
+          terminal_parse_failure('"/"')
+          r5 = nil
+        end
+        s1 << r5
+      end
+    end
+    if s1.last
+      r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
+      r1.extend(Comment0)
+    else
+      @index = i1
+      r1 = nil
+    end
+    if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
+      r0 = r1
+    else
+      i6, s6 = index, []
+      if (match_len = has_terminal?("#", false, index))
+        r7 = true
+        @index += match_len
+      else
+        terminal_parse_failure('"#"')
+        r7 = nil
+      end
+      s6 << r7
+      if r7
+        s8, i8 = [], index
+        loop do
+          r9 = _nt_non_lf
+          if r9
+            s8 << r9
+          else
+            break
+          end
+        end
+        r8 = instantiate_node(SyntaxNode,input, i8...index, s8)
+        s6 << r8
+        if r8
+          if (match_len = has_terminal?("\n", false, index))
+            r10 = true
+            @index += match_len
+          else
+            terminal_parse_failure('"\\n"')
+            r10 = nil
+          end
+          s6 << r10
+        end
+      end
+      if s6.last
+        r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
+        r6.extend(Comment1)
+      else
+        @index = i6
+        r6 = nil
+      end
+      if r6
+        r6 = SyntaxNode.new(input, (index-1)...index) if r6 == true
+        r0 = r6
+      else
+        @index = i0
+        r0 = nil
+      end
+    end
+
+    node_cache[:comment][start_index] = r0
+
+    r0
+  end
+
   module OC0
     def S
       elements[1]
@@ -2145,7 +2314,7 @@ module EDNGRAMMAR
       elements[1]
     end
 
-    def sqstr
+    def bstr
       elements[2]
     end
 
@@ -2159,7 +2328,7 @@ module EDNGRAMMAR
       elements[1]
     end
 
-    def sqstr
+    def bstr
       elements[2]
     end
 
@@ -2284,7 +2453,7 @@ module EDNGRAMMAR
         r16 = _nt_spec1
         s14 << r16
         if r16
-          r17 = _nt_sqstr
+          r17 = _nt_bstr
           s14 << r17
           if r17
             r18 = _nt_S
@@ -2305,7 +2474,7 @@ module EDNGRAMMAR
                   r22 = _nt_S
                   s20 << r22
                   if r22
-                    r23 = _nt_sqstr
+                    r23 = _nt_bstr
                     s20 << r23
                     if r23
                       r24 = _nt_S
@@ -3485,19 +3654,31 @@ module EDNGRAMMAR
               r5 = SyntaxNode.new(input, (index-1)...index) if r5 == true
               r0 = r5
             else
-              if has_terminal?(@regexps[gr = '\A[\\]-􏿿]'] ||= Regexp.new(gr), :regexp, index)
+              if has_terminal?(@regexps[gr = '\A[\\]-퟿]'] ||= Regexp.new(gr), :regexp, index)
                 r6 = true
                 @index += 1
               else
-                terminal_parse_failure('[\\]-􏿿]')
+                terminal_parse_failure('[\\]-퟿]')
                 r6 = nil
               end
               if r6
                 r6 = SyntaxNode.new(input, (index-1)...index) if r6 == true
                 r0 = r6
               else
-                @index = i0
-                r0 = nil
+                if has_terminal?(@regexps[gr = '\A[-􏿿]'] ||= Regexp.new(gr), :regexp, index)
+                  r7 = true
+                  @index += 1
+                else
+                  terminal_parse_failure('[-􏿿]')
+                  r7 = nil
+                end
+                if r7
+                  r7 = SyntaxNode.new(input, (index-1)...index) if r7 == true
+                  r0 = r7
+                else
+                  @index = i0
+                  r0 = nil
+                end
               end
             end
           end

metadata

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