edn-abnf 0.0.6 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 119b776b0bf643c32c9c0c2481b654e3087d0a7747f0a3f9bf9ae2460837a67a
-  data.tar.gz: bc7545b0786eeae5f5d33c6b95b702fe383ccdc306ecc5370e932413e089838e
+  metadata.gz: ad6ca6781c8f1fab8f4be83db41604619f4a38049b13e934f4eea8ab3a2fe757
+  data.tar.gz: b8d503680fffa8e5a81232ce301026f9780df6c35aaec80598549fd81fea63ab
 SHA512:
-  metadata.gz: e5c9dd0f7c19367133392c803bdf4719d6e0ec45d49d74c3fc05bb59e2d38e6ce0ffe38f17c0610c454783b795d5528e3bb030f32b452df9a802cbd447fc4c13
-  data.tar.gz: 994b84d2f1e90643aacfb3ef117d150bafbbd2a28f63057f25b51d5a1222d5a222a5d7fd8c77c83232c28e7378084bfaccc0d04db3e0f60eafecca7ed2eecb86
+  metadata.gz: 50ad3b1462112822df91e51617ef5dc0ba704e896be060562d6a42cd6c7f67980121b250ccfd080f11be9f51e406c005b1e37133f41156d1684ba13f07c80e78
+  data.tar.gz: 28d52a6d4f5b1e55b85d4cc8534341de042834fb36bb5b6962609332ead01bd66629fc664d4e88adcc0eb6b74948d357be979c4b5266524b61af44a6feee26c4

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.8"
   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

@@ -187,52 +187,28 @@ module EDNGRAMMAR
           r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
           r0 = r3
         else
-          r4 = _nt_basenumber
+          r4 = _nt_number
           if r4
             r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
             r0 = r4
           else
-            r5 = _nt_decnumber
+            r5 = _nt_simple
             if r5
               r5 = SyntaxNode.new(input, (index-1)...index) if r5 == true
               r0 = r5
             else
-              r6 = _nt_infin
+              r6 = _nt_string
               if r6
                 r6 = SyntaxNode.new(input, (index-1)...index) if r6 == true
                 r0 = r6
               else
-                r7 = _nt_simple
+                r7 = _nt_streamstring
                 if r7
                   r7 = SyntaxNode.new(input, (index-1)...index) if r7 == true
                   r0 = r7
                 else
-                  r8 = _nt_tstr
-                  if r8
-                    r8 = SyntaxNode.new(input, (index-1)...index) if r8 == true
-                    r0 = r8
-                  else
-                    r9 = _nt_bstr
-                    if r9
-                      r9 = SyntaxNode.new(input, (index-1)...index) if r9 == true
-                      r0 = r9
-                    else
-                      r10 = _nt_embedded
-                      if r10
-                        r10 = SyntaxNode.new(input, (index-1)...index) if r10 == true
-                        r0 = r10
-                      else
-                        r11 = _nt_streamstring
-                        if r11
-                          r11 = SyntaxNode.new(input, (index-1)...index) if r11 == true
-                          r0 = r11
-                        else
-                          @index = i0
-                          r0 = nil
-                        end
-                      end
-                    end
-                  end
+                  @index = i0
+                  r0 = nil
                 end
               end
             end
@@ -246,6 +222,128 @@ module EDNGRAMMAR
     r0
   end
 
+  module Number0
+    def spec
+      elements[1]
+    end
+  end
+
+  module Number1
+    def ast
+      elements[0].ast
+    end
+  end
+
+  def _nt_number
+    start_index = index
+    if node_cache[:number].has_key?(index)
+      cached = node_cache[:number][index]
+      if cached
+        node_cache[:number][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0, s0 = index, []
+    i1 = index
+    r2 = _nt_basenumber
+    if r2
+      r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
+      r1 = r2
+    else
+      r3 = _nt_decnumber
+      if r3
+        r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
+        r1 = r3
+      else
+        r4 = _nt_infin
+        if r4
+          r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
+          r1 = r4
+        else
+          @index = i1
+          r1 = nil
+        end
+      end
+    end
+    s0 << r1
+    if r1
+      r5 = _nt_spec
+      s0 << r5
+    end
+    if s0.last
+      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+      r0.extend(Number0)
+      r0.extend(Number1)
+    else
+      @index = i0
+      r0 = nil
+    end
+
+    node_cache[:number][start_index] = r0
+
+    r0
+  end
+
+  module String0
+    def spec
+      elements[1]
+    end
+  end
+
+  module String1
+    def ast
+      elements[0].ast
+    end
+  end
+
+  def _nt_string
+    start_index = index
+    if node_cache[:string].has_key?(index)
+      cached = node_cache[:string][index]
+      if cached
+        node_cache[:string][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0, s0 = index, []
+    i1 = index
+    r2 = _nt_tstr
+    if r2
+      r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
+      r1 = r2
+    else
+      r3 = _nt_bstr
+      if r3
+        r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
+        r1 = r3
+      else
+        @index = i1
+        r1 = nil
+      end
+    end
+    s0 << r1
+    if r1
+      r4 = _nt_spec
+      s0 << r4
+    end
+    if s0.last
+      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+      r0.extend(String0)
+      r0.extend(String1)
+    else
+      @index = i0
+      r0 = nil
+    end
+
+    node_cache[:string][start_index] = r0
+
+    r0
+  end
+
   def _nt_sign
     start_index = index
     if node_cache[:sign].has_key?(index)
@@ -1026,16 +1124,20 @@ module EDNGRAMMAR
       elements[0]
     end
 
+    def spec
+      elements[1]
+    end
+
     def S1
-      elements[2]
+      elements[3]
     end
 
     def item
-      elements[3]
+      elements[4]
     end
 
     def S2
-      elements[4]
+      elements[5]
     end
 
   end
@@ -1061,32 +1163,36 @@ module EDNGRAMMAR
     r1 = _nt_uint
     s0 << r1
     if r1
-      if (match_len = has_terminal?("(", false, index))
-        r2 = true
-        @index += match_len
-      else
-        terminal_parse_failure('"("')
-        r2 = nil
-      end
+      r2 = _nt_spec
       s0 << r2
       if r2
-        r3 = _nt_S
+        if (match_len = has_terminal?("(", false, index))
+          r3 = true
+          @index += match_len
+        else
+          terminal_parse_failure('"("')
+          r3 = nil
+        end
         s0 << r3
         if r3
-          r4 = _nt_item
+          r4 = _nt_S
           s0 << r4
           if r4
-            r5 = _nt_S
+            r5 = _nt_item
             s0 << r5
             if r5
-              if (match_len = has_terminal?(")", false, index))
-                r6 = true
-                @index += match_len
-              else
-                terminal_parse_failure('")"')
-                r6 = nil
-              end
+              r6 = _nt_S
               s0 << r6
+              if r6
+                if (match_len = has_terminal?(")", false, index))
+                  r7 = true
+                  @index += match_len
+                else
+                  terminal_parse_failure('")"')
+                  r7 = nil
+                end
+                s0 << r7
+              end
             end
           end
         end
@@ -1298,8 +1404,14 @@ module EDNGRAMMAR
         r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
         r0 = r2
       else
-        @index = i0
-        r0 = nil
+        r3 = _nt_embedded
+        if r3
+          r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
+          r0 = r3
+        else
+          @index = i0
+          r0 = nil
+        end
       end
     end
 
@@ -1477,8 +1589,12 @@ module EDNGRAMMAR
           else
             []
           end
-      if spec.ast
-        r.cbor_stream!
+      if ei = spec.ast
+         if ei == ""
+           r.cbor_stream!
+         else
+           warn "*** ignoring unimplemented encoding indicator #{ei.inspect} after ["
+         end
       end
       r
     end
@@ -1640,8 +1756,12 @@ module EDNGRAMMAR
           else
             {}
           end
-      if spec.ast
-        r.cbor_stream!
+      if ei = spec.ast
+         if ei == ""
+           r.cbor_stream!
+         else
+           warn "*** ignoring unimplemented encoding indicator #{ei.inspect} after \x7b"
+         end
       end
       r
     end
@@ -1931,19 +2051,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 +2085,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 +2190,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 +2204,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,93 +2234,174 @@ module EDNGRAMMAR
     r0
   end
 
-  module OC0
-    def S
-      elements[1]
-    end
+  module Comment0
   end
 
-  def _nt_OC
+  module Comment1
+  end
+
+  def _nt_comment
     start_index = index
-    if node_cache[:OC].has_key?(index)
-      cached = node_cache[:OC][index]
+    if node_cache[:comment].has_key?(index)
+      cached = node_cache[:comment][index]
       if cached
-        node_cache[:OC][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        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))
+    if (match_len = has_terminal?("/", false, index))
       r2 = true
       @index += match_len
     else
-      terminal_parse_failure('","')
+      terminal_parse_failure('"/"')
       r2 = nil
     end
     s1 << r2
     if r2
-      r3 = _nt_S
-      s1 << r3
-    end
-    if s1.last
-      r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
-      r1.extend(OC0)
-    else
+      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
-      r0 = instantiate_node(SyntaxNode,input, index...index)
+      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[:OC][start_index] = r0
+    node_cache[:comment][start_index] = r0
 
     r0
   end
 
-  module Streamstring0
-    def S1
+  module OC0
+    def S
       elements[1]
     end
+  end
 
-    def tstr
-      elements[2]
+  def _nt_OC
+    start_index = index
+    if node_cache[:OC].has_key?(index)
+      cached = node_cache[:OC][index]
+      if cached
+        node_cache[:OC][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
     end
 
-    def S2
-      elements[3]
+    i1, s1 = index, []
+    if (match_len = has_terminal?(",", false, index))
+      r2 = true
+      @index += match_len
+    else
+      terminal_parse_failure('","')
+      r2 = nil
     end
-  end
-
-  module Streamstring1
-    def spec1
-      elements[1]
+    s1 << r2
+    if r2
+      r3 = _nt_S
+      s1 << r3
     end
-
-    def tstr
-      elements[2]
+    if s1.last
+      r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
+      r1.extend(OC0)
+    else
+      @index = i1
+      r1 = nil
     end
-
-    def S
-      elements[3]
+    if r1
+      r0 = r1
+    else
+      r0 = instantiate_node(SyntaxNode,input, index...index)
     end
 
-    def OC
-      elements[5]
-    end
+    node_cache[:OC][start_index] = r0
 
+    r0
   end
 
-  module Streamstring2
+  module Streamstring0
     def S1
       elements[1]
     end
 
-    def sqstr
+    def string
       elements[2]
     end
 
@@ -2154,12 +2410,12 @@ module EDNGRAMMAR
     end
   end
 
-  module Streamstring3
+  module Streamstring1
     def spec1
       elements[1]
     end
 
-    def sqstr
+    def string
       elements[2]
     end
 
@@ -2173,6 +2429,16 @@ module EDNGRAMMAR
 
   end
 
+  module Streamstring2
+    def ast
+      strings = [elements[2].ast] + elements[4].elements.map {|x| x.string.ast }
+      unless Set[*strings.map(&:encoding)].size == 1
+        warn "*** mixed streamstring #{strings.cbor_diagnostic}"
+      end
+      strings.join.cbor_stream!(strings.map(&:size))
+    end
+  end
+
   def _nt_streamstring
     start_index = index
     if node_cache[:streamstring].has_key?(index)
@@ -2184,182 +2450,88 @@ module EDNGRAMMAR
       return cached
     end
 
-    i0 = index
-    i1, s1 = index, []
+    i0, s0 = index, []
     if (match_len = has_terminal?("(", false, index))
-      r2 = true
+      r1 = true
       @index += match_len
     else
       terminal_parse_failure('"("')
-      r2 = nil
+      r1 = nil
     end
-    s1 << r2
-    if r2
-      r3 = _nt_spec1
-      s1 << r3
-      if r3
-        r4 = _nt_tstr
-        s1 << r4
-        if r4
-          r5 = _nt_S
-          s1 << r5
-          if r5
-            s6, i6 = [], index
+    s0 << r1
+    if r1
+      r2 = _nt_spec1
+      s0 << r2
+      if r2
+        r3 = _nt_string
+        s0 << r3
+        if r3
+          r4 = _nt_S
+          s0 << r4
+          if r4
+            s5, i5 = [], index
             loop do
-              i7, s7 = index, []
+              i6, s6 = index, []
               if (match_len = has_terminal?(",", false, index))
-                r8 = true
+                r7 = true
                 @index += match_len
               else
                 terminal_parse_failure('","')
-                r8 = nil
+                r7 = nil
               end
-              s7 << r8
-              if r8
-                r9 = _nt_S
-                s7 << r9
-                if r9
-                  r10 = _nt_tstr
-                  s7 << r10
-                  if r10
-                    r11 = _nt_S
-                    s7 << r11
+              s6 << r7
+              if r7
+                r8 = _nt_S
+                s6 << r8
+                if r8
+                  r9 = _nt_string
+                  s6 << r9
+                  if r9
+                    r10 = _nt_S
+                    s6 << r10
                   end
                 end
               end
-              if s7.last
-                r7 = instantiate_node(SyntaxNode,input, i7...index, s7)
-                r7.extend(Streamstring0)
+              if s6.last
+                r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
+                r6.extend(Streamstring0)
               else
-                @index = i7
-                r7 = nil
+                @index = i6
+                r6 = nil
               end
-              if r7
-                s6 << r7
+              if r6
+                s5 << r6
               else
                 break
               end
             end
-            r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
-            s1 << r6
-            if r6
-              r12 = _nt_OC
-              s1 << r12
-              if r12
+            r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
+            s0 << r5
+            if r5
+              r11 = _nt_OC
+              s0 << r11
+              if r11
                 if (match_len = has_terminal?(")", false, index))
-                  r13 = true
+                  r12 = true
                   @index += match_len
                 else
                   terminal_parse_failure('")"')
-                  r13 = nil
+                  r12 = nil
                 end
-                s1 << r13
+                s0 << r12
               end
             end
           end
         end
       end
     end
-    if s1.last
-      r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
-      r1.extend(Streamstring1)
-    else
-      @index = i1
-      r1 = nil
-    end
-    if r1
-      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
-      r0 = r1
+    if s0.last
+      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+      r0.extend(Streamstring1)
+      r0.extend(Streamstring2)
     else
-      i14, s14 = index, []
-      if (match_len = has_terminal?("(", false, index))
-        r15 = true
-        @index += match_len
-      else
-        terminal_parse_failure('"("')
-        r15 = nil
-      end
-      s14 << r15
-      if r15
-        r16 = _nt_spec1
-        s14 << r16
-        if r16
-          r17 = _nt_sqstr
-          s14 << r17
-          if r17
-            r18 = _nt_S
-            s14 << r18
-            if r18
-              s19, i19 = [], index
-              loop do
-                i20, s20 = index, []
-                if (match_len = has_terminal?(",", false, index))
-                  r21 = true
-                  @index += match_len
-                else
-                  terminal_parse_failure('","')
-                  r21 = nil
-                end
-                s20 << r21
-                if r21
-                  r22 = _nt_S
-                  s20 << r22
-                  if r22
-                    r23 = _nt_sqstr
-                    s20 << r23
-                    if r23
-                      r24 = _nt_S
-                      s20 << r24
-                    end
-                  end
-                end
-                if s20.last
-                  r20 = instantiate_node(SyntaxNode,input, i20...index, s20)
-                  r20.extend(Streamstring2)
-                else
-                  @index = i20
-                  r20 = nil
-                end
-                if r20
-                  s19 << r20
-                else
-                  break
-                end
-              end
-              r19 = instantiate_node(SyntaxNode,input, i19...index, s19)
-              s14 << r19
-              if r19
-                r25 = _nt_OC
-                s14 << r25
-                if r25
-                  if (match_len = has_terminal?(")", false, index))
-                    r26 = true
-                    @index += match_len
-                  else
-                    terminal_parse_failure('")"')
-                    r26 = nil
-                  end
-                  s14 << r26
-                end
-              end
-            end
-          end
-        end
-      end
-      if s14.last
-        r14 = instantiate_node(SyntaxNode,input, i14...index, s14)
-        r14.extend(Streamstring3)
-      else
-        @index = i14
-        r14 = nil
-      end
-      if r14
-        r14 = SyntaxNode.new(input, (index-1)...index) if r14 == true
-        r0 = r14
-      else
-        @index = i0
-        r0 = nil
-      end
+      @index = i0
+      r0 = nil
     end
 
     node_cache[:streamstring][start_index] = r0
@@ -2369,19 +2541,16 @@ module EDNGRAMMAR
 
   module Spec0
     def S
-      elements[1]
+      elements[2]
     end
   end
 
   module Spec1
-    def S
-      elements[0]
-    end
-
-  end
-
-  module Spec2
-    def ast; (e1 = elements[1].elements) && !e1[0].empty? end
+    def ast;
+                        if (e1 = elements[1].elements) && !e1[0].empty?
+                          e1[1].text_value
+                        end
+                      end
   end
 
   def _nt_spec
@@ -2395,44 +2564,43 @@ module EDNGRAMMAR
       return cached
     end
 
-    i0, s0 = index, []
-    r1 = _nt_S
-    s0 << r1
-    if r1
-      i3, s3 = index, []
-      if (match_len = has_terminal?("_", false, index))
-        r4 = true
-        @index += match_len
-      else
-        terminal_parse_failure('"_"')
-        r4 = nil
-      end
-      s3 << r4
-      if r4
-        r5 = _nt_S
-        s3 << r5
-      end
-      if s3.last
-        r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
-        r3.extend(Spec0)
-      else
-        @index = i3
-        r3 = nil
+    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_wordchar
+        if r4
+          s3 << r4
+        else
+          break
+        end
       end
+      r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
+      s1 << r3
       if r3
-        r2 = r3
-      else
-        r2 = instantiate_node(SyntaxNode,input, index...index)
+        r5 = _nt_S
+        s1 << r5
       end
-      s0 << r2
     end
-    if s0.last
-      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-      r0.extend(Spec1)
-      r0.extend(Spec2)
+    if s1.last
+      r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
+      r1.extend(Spec0)
     else
-      @index = i0
-      r0 = nil
+      @index = i1
+      r1 = nil
+    end
+    if r1
+      r0 = r1
+    else
+      r0 = instantiate_node(SyntaxNode,input, index...index)
     end
 
     node_cache[:spec][start_index] = r0
@@ -2441,12 +2609,8 @@ module EDNGRAMMAR
   end
 
   module Spec10
-    def S1
-      elements[0]
-    end
-
-    def S2
-      elements[2]
+    def S
+      elements[1]
     end
   end
 
@@ -2462,21 +2626,17 @@ module EDNGRAMMAR
     end
 
     i0, s0 = index, []
-    r1 = _nt_S
+    if (match_len = has_terminal?("_", false, index))
+      r1 = true
+      @index += match_len
+    else
+      terminal_parse_failure('"_"')
+      r1 = nil
+    end
     s0 << r1
     if r1
-      if (match_len = has_terminal?("_", false, index))
-        r2 = true
-        @index += match_len
-      else
-        terminal_parse_failure('"_"')
-        r2 = nil
-      end
+      r2 = _nt_S
       s0 << r2
-      if r2
-        r3 = _nt_S
-        s0 << r3
-      end
     end
     if s0.last
       r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
@@ -3485,19 +3645,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
@@ -3784,6 +3956,56 @@ module EDNGRAMMAR
     r0
   end
 
+  def _nt_wordchar
+    start_index = index
+    if node_cache[:wordchar].has_key?(index)
+      cached = node_cache[:wordchar][index]
+      if cached
+        node_cache[:wordchar][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?("_", false, index))
+      r1 = true
+      @index += match_len
+    else
+      terminal_parse_failure('"_"')
+      r1 = nil
+    end
+    if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
+      r0 = r1
+    else
+      r2 = _nt_lcalnum
+      if r2
+        r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
+        r0 = r2
+      else
+        if has_terminal?(@regexps[gr = '\A[A-Z]'] ||= Regexp.new(gr), :regexp, index)
+          r3 = true
+          @index += 1
+        else
+          terminal_parse_failure('[A-Z]')
+          r3 = nil
+        end
+        if r3
+          r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
+          r0 = r3
+        else
+          @index = i0
+          r0 = nil
+        end
+      end
+    end
+
+    node_cache[:wordchar][start_index] = r0
+
+    r0
+  end
+
 end
 
 class EDNGRAMMARParser < Treetop::Runtime::CompiledParser

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edn-abnf
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-01 00:00:00.000000000 Z
+date: 2023-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler