edn-abnf 0.3.6 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fb3a21c21375974f9e6c3b1f708f002b00aaeaff85e72d430a836ce3e0fd2f7
-  data.tar.gz: fcfc55d388ed1b62ab3ecb4503764cc7eb87c6f984d8082c746705091ad38569
+  metadata.gz: ac4a0b1911b37bbabef257681aaeec94716aaac6b34f2719b3a33672bbeaef86
+  data.tar.gz: 6fd059837eac37459f8e18f5bfc921ef6ff10fc68a9dddc0e2d481b2a447b11b
 SHA512:
-  metadata.gz: 329bf4e226c07a53b9103a3f9ef58a70d9c2c539ceb5f50a47c80427362dd7d6b4877c4bb53d11da1c0ce811cdd3fda7296e5994e05822b4a706869760819c34
-  data.tar.gz: 659cc80dc2d1013c6f2176982205c159e0359036888b50152228c52e0e10148109288f88e716191e6a9eeb104e98ec1a610b00f53d7f1546b64d0a6919f56674
+  metadata.gz: e9c24d903f4b5e1bb7dfdef58f63c526d3f1c1ce445d27401e0db6b34829141b79b418f8ef769237b454d7e72d01dd0f931f895d229fdb59e5a9d8d808029200
+  data.tar.gz: 0cae09501f16449694856f6f152611b44c6d7b6153cb17a7f807f68f46b95658a0372031c10bb80aff0e9878bfe1d9d18bebec26873f24716635051e9c61ccb0

data/bin/edn-abnf

@@ -141,6 +141,7 @@ when :yaml
 when :edn, :diag, nil
   puts result.cbor_diagnostic
 when :pretty
+  # XXX can't do Box yet
   enc = if CBOR::Sequence === result
           result.to_cborseq
         else

data/edn-abnf.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "edn-abnf"
-  s.version = "0.3.6"
+  s.version = "0.4.1"
   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

@@ -10,17 +10,13 @@ module EDNGRAMMAR
   end
 
   module Seq0
-    def OC
+    def MSC
       elements[0]
     end
 
     def item
       elements[1]
     end
-
-    def S
-      elements[2]
-    end
   end
 
   module Seq1
@@ -28,12 +24,8 @@ module EDNGRAMMAR
       elements[0]
     end
 
-    def S
-      elements[1]
-    end
-
-    def OC
-      elements[3]
+    def SOC
+      elements[2]
     end
   end
 
@@ -47,7 +39,7 @@ module EDNGRAMMAR
   module Seq3
     def ast
       r = if e = elements[1].elements
-            [e[0].ast] + e[2].elements.map {|x| x.item.ast }
+            [e[0].ast] + e[1].elements.map {|x| x.item.ast }
           else
             []
           end
@@ -78,42 +70,34 @@ module EDNGRAMMAR
       r4 = _nt_item
       s3 << r4
       if r4
-        r5 = _nt_S
-        s3 << r5
-        if r5
-          s6, i6 = [], index
-          loop do
-            i7, s7 = index, []
-            r8 = _nt_OC
-            s7 << r8
-            if r8
-              r9 = _nt_item
-              s7 << r9
-              if r9
-                r10 = _nt_S
-                s7 << r10
-              end
-            end
-            if s7.last
-              r7 = instantiate_node(SyntaxNode,input, i7...index, s7)
-              r7.extend(Seq0)
-            else
-              @index = i7
-              r7 = nil
-            end
-            if r7
-              s6 << r7
-            else
-              break
-            end
+        s5, i5 = [], index
+        loop do
+          i6, s6 = index, []
+          r7 = _nt_MSC
+          s6 << r7
+          if r7
+            r8 = _nt_item
+            s6 << r8
+          end
+          if s6.last
+            r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
+            r6.extend(Seq0)
+          else
+            @index = i6
+            r6 = nil
           end
-          r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
-          s3 << r6
           if r6
-            r11 = _nt_OC
-            s3 << r11
+            s5 << r6
+          else
+            break
           end
         end
+        r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
+        s3 << r5
+        if r5
+          r9 = _nt_SOC
+          s3 << r9
+        end
       end
       if s3.last
         r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
@@ -1983,21 +1967,17 @@ module EDNGRAMMAR
   end
 
   module Array0
-    def OC
+    def MSC
       elements[0]
     end
 
     def item
       elements[1]
     end
-
-    def S
-      elements[2]
-    end
   end
 
   module Array1
-    def item
+    def specms
       elements[0]
     end
 
@@ -2005,36 +1985,47 @@ module EDNGRAMMAR
       elements[1]
     end
 
-    def OC
-      elements[3]
+    def item
+      elements[2]
+    end
+
+    def SOC
+      elements[4]
     end
   end
 
   module Array2
     def spec
-      elements[1]
+      elements[0]
     end
 
     def S
-      elements[2]
+      elements[1]
     end
-
   end
 
   module Array3
+  end
+
+  module Array4
     def ast
-      r = if e = elements[3].elements
-            [e[0].ast] + e[2].elements.map {|x| x.item.ast }
-          else
-            []
-          end
-      if ei = spec.text_value[1..-1]
-         #       warn "** ei #{ei.inspect}"
-         if ei == ""
-           r.cbor_stream!
-         else
-           warn "*** ignoring unimplemented encoding indicator #{ei.inspect} after ["
-         end
+      e = elements[1] # alternative
+      ei = nil
+      if e.respond_to?(:specms)
+        if e.specms && e.specms.elements
+          ei = e.specms.elements[1].text_value
+        end
+        r = [e.item.ast] + e.elements[3].elements.map {|x| x.item.ast}
+      else
+        if e.spec && e.spec.elements
+          ei = e.spec.elements[1].text_value
+        end
+        r = []
+      end
+      if ei == ""
+        r.cbor_stream!
+      elsif ei
+        warn "*** ignoring unimplemented encoding indicator #{ei.inspect} after ["
       end
       r
     end
@@ -2061,83 +2052,97 @@ module EDNGRAMMAR
     end
     s0 << r1
     if r1
-      r2 = _nt_spec
-      s0 << r2
-      if r2
-        r3 = _nt_S
-        s0 << r3
-        if r3
-          i5, s5 = index, []
+      i2 = index
+      i3, s3 = index, []
+      r4 = _nt_specms
+      s3 << r4
+      if r4
+        r5 = _nt_S
+        s3 << r5
+        if r5
           r6 = _nt_item
-          s5 << r6
+          s3 << r6
           if r6
-            r7 = _nt_S
-            s5 << r7
-            if r7
-              s8, i8 = [], index
-              loop do
-                i9, s9 = index, []
-                r10 = _nt_OC
-                s9 << r10
-                if r10
-                  r11 = _nt_item
-                  s9 << r11
-                  if r11
-                    r12 = _nt_S
-                    s9 << r12
-                  end
-                end
-                if s9.last
-                  r9 = instantiate_node(SyntaxNode,input, i9...index, s9)
-                  r9.extend(Array0)
-                else
-                  @index = i9
-                  r9 = nil
-                end
-                if r9
-                  s8 << r9
-                else
-                  break
-                end
+            s7, i7 = [], index
+            loop do
+              i8, s8 = index, []
+              r9 = _nt_MSC
+              s8 << r9
+              if r9
+                r10 = _nt_item
+                s8 << r10
+              end
+              if s8.last
+                r8 = instantiate_node(SyntaxNode,input, i8...index, s8)
+                r8.extend(Array0)
+              else
+                @index = i8
+                r8 = nil
               end
-              r8 = instantiate_node(SyntaxNode,input, i8...index, s8)
-              s5 << r8
               if r8
-                r13 = _nt_OC
-                s5 << r13
+                s7 << r8
+              else
+                break
               end
             end
-          end
-          if s5.last
-            r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
-            r5.extend(Array1)
-          else
-            @index = i5
-            r5 = nil
-          end
-          if r5
-            r4 = r5
-          else
-            r4 = instantiate_node(SyntaxNode,input, index...index)
-          end
-          s0 << r4
-          if r4
-            if (match_len = has_terminal?("]", false, index))
-              r14 = true
-              @index += match_len
-            else
-              terminal_parse_failure('"]"')
-              r14 = nil
+            r7 = instantiate_node(SyntaxNode,input, i7...index, s7)
+            s3 << r7
+            if r7
+              r11 = _nt_SOC
+              s3 << r11
             end
-            s0 << r14
           end
         end
       end
+      if s3.last
+        r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
+        r3.extend(Array1)
+      else
+        @index = i3
+        r3 = nil
+      end
+      if r3
+        r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
+        r2 = r3
+      else
+        i12, s12 = index, []
+        r13 = _nt_spec
+        s12 << r13
+        if r13
+          r14 = _nt_S
+          s12 << r14
+        end
+        if s12.last
+          r12 = instantiate_node(SyntaxNode,input, i12...index, s12)
+          r12.extend(Array2)
+        else
+          @index = i12
+          r12 = nil
+        end
+        if r12
+          r12 = SyntaxNode.new(input, (index-1)...index) if r12 == true
+          r2 = r12
+        else
+          @index = i2
+          r2 = nil
+        end
+      end
+      s0 << r2
+      if r2
+        if (match_len = has_terminal?("]", false, index))
+          r15 = true
+          @index += match_len
+        else
+          terminal_parse_failure('"]"')
+          r15 = nil
+        end
+        s0 << r15
+      end
     end
     if s0.last
       r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-      r0.extend(Array2)
       r0.extend(Array3)
+      r0.extend(Array4)
     else
       @index = i0
       r0 = nil
@@ -2149,21 +2154,17 @@ module EDNGRAMMAR
   end
 
   module Map0
-    def OC
+    def MSC
       elements[0]
     end
 
-    def kp
+    def keyp
       elements[1]
     end
-
-    def S
-      elements[2]
-    end
   end
 
   module Map1
-    def kp
+    def specms
       elements[0]
     end
 
@@ -2171,35 +2172,47 @@ module EDNGRAMMAR
       elements[1]
     end
 
-    def OC
-      elements[3]
+    def keyp
+      elements[2]
+    end
+
+    def SOC
+      elements[4]
     end
   end
 
   module Map2
     def spec
-      elements[1]
+      elements[0]
     end
 
     def S
-      elements[2]
+      elements[1]
     end
-
   end
 
   module Map3
+  end
+
+  module Map4
     def ast
-      r = if e = elements[3].elements
-            Hash[ [e[0].ast] + e[2].elements.map {|x| x.kp.ast } ]
-          else
-            {}
-          end
-      if ei = spec.text_value[1..-1]
-         if ei == ""
-           r.cbor_stream!
-         else
-           warn "*** ignoring unimplemented encoding indicator #{ei.inspect} after \x7b"
-         end
+      e = elements[1] # alternative
+      ei = nil
+      if e.respond_to?(:specms)
+        if e.specms && e.specms.elements
+          ei = e.specms.elements[1].text_value
+        end
+        r = Hash[ [e.keyp.ast] + e.elements[3].elements.map {|x| x.keyp.ast } ]
+      else
+        if e.spec && e.spec.elements
+          ei = e.spec.elements[1].text_value
+        end
+        r = {}
+      end
+      if ei == ""
+        r.cbor_stream!
+      elsif ei
+        warn "*** ignoring unimplemented encoding indicator #{ei.inspect} after ["
       end
       r
     end
@@ -2226,83 +2239,97 @@ module EDNGRAMMAR
     end
     s0 << r1
     if r1
-      r2 = _nt_spec
-      s0 << r2
-      if r2
-        r3 = _nt_S
-        s0 << r3
-        if r3
-          i5, s5 = index, []
-          r6 = _nt_kp
-          s5 << r6
+      i2 = index
+      i3, s3 = index, []
+      r4 = _nt_specms
+      s3 << r4
+      if r4
+        r5 = _nt_S
+        s3 << r5
+        if r5
+          r6 = _nt_keyp
+          s3 << r6
           if r6
-            r7 = _nt_S
-            s5 << r7
-            if r7
-              s8, i8 = [], index
-              loop do
-                i9, s9 = index, []
-                r10 = _nt_OC
-                s9 << r10
-                if r10
-                  r11 = _nt_kp
-                  s9 << r11
-                  if r11
-                    r12 = _nt_S
-                    s9 << r12
-                  end
-                end
-                if s9.last
-                  r9 = instantiate_node(SyntaxNode,input, i9...index, s9)
-                  r9.extend(Map0)
-                else
-                  @index = i9
-                  r9 = nil
-                end
-                if r9
-                  s8 << r9
-                else
-                  break
-                end
+            s7, i7 = [], index
+            loop do
+              i8, s8 = index, []
+              r9 = _nt_MSC
+              s8 << r9
+              if r9
+                r10 = _nt_keyp
+                s8 << r10
+              end
+              if s8.last
+                r8 = instantiate_node(SyntaxNode,input, i8...index, s8)
+                r8.extend(Map0)
+              else
+                @index = i8
+                r8 = nil
               end
-              r8 = instantiate_node(SyntaxNode,input, i8...index, s8)
-              s5 << r8
               if r8
-                r13 = _nt_OC
-                s5 << r13
+                s7 << r8
+              else
+                break
               end
             end
-          end
-          if s5.last
-            r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
-            r5.extend(Map1)
-          else
-            @index = i5
-            r5 = nil
-          end
-          if r5
-            r4 = r5
-          else
-            r4 = instantiate_node(SyntaxNode,input, index...index)
-          end
-          s0 << r4
-          if r4
-            if (match_len = has_terminal?("}", false, index))
-              r14 = true
-              @index += match_len
-            else
-              terminal_parse_failure('"}"')
-              r14 = nil
+            r7 = instantiate_node(SyntaxNode,input, i7...index, s7)
+            s3 << r7
+            if r7
+              r11 = _nt_SOC
+              s3 << r11
             end
-            s0 << r14
           end
         end
       end
+      if s3.last
+        r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
+        r3.extend(Map1)
+      else
+        @index = i3
+        r3 = nil
+      end
+      if r3
+        r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
+        r2 = r3
+      else
+        i12, s12 = index, []
+        r13 = _nt_spec
+        s12 << r13
+        if r13
+          r14 = _nt_S
+          s12 << r14
+        end
+        if s12.last
+          r12 = instantiate_node(SyntaxNode,input, i12...index, s12)
+          r12.extend(Map2)
+        else
+          @index = i12
+          r12 = nil
+        end
+        if r12
+          r12 = SyntaxNode.new(input, (index-1)...index) if r12 == true
+          r2 = r12
+        else
+          @index = i2
+          r2 = nil
+        end
+      end
+      s0 << r2
+      if r2
+        if (match_len = has_terminal?("}", false, index))
+          r15 = true
+          @index += match_len
+        else
+          terminal_parse_failure('"}"')
+          r15 = nil
+        end
+        s0 << r15
+      end
     end
     if s0.last
       r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-      r0.extend(Map2)
       r0.extend(Map3)
+      r0.extend(Map4)
     else
       @index = i0
       r0 = nil
@@ -2313,7 +2340,7 @@ module EDNGRAMMAR
     r0
   end
 
-  module Kp0
+  module Keyp0
     def item1
       elements[0]
     end
@@ -2331,18 +2358,18 @@ module EDNGRAMMAR
     end
   end
 
-  module Kp1
+  module Keyp1
     def ast
       [elements[0].ast, elements[4].ast]
     end
   end
 
-  def _nt_kp
+  def _nt_keyp
     start_index = index
-    if node_cache[:kp].has_key?(index)
-      cached = node_cache[:kp][index]
+    if node_cache[:keyp].has_key?(index)
+      cached = node_cache[:keyp][index]
       if cached
-        node_cache[:kp][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:keyp][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -2375,14 +2402,14 @@ module EDNGRAMMAR
     end
     if s0.last
       r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-      r0.extend(Kp0)
-      r0.extend(Kp1)
+      r0.extend(Keyp0)
+      r0.extend(Keyp1)
     else
       @index = i0
       r0 = nil
     end
 
-    node_cache[:kp][start_index] = r0
+    node_cache[:keyp][start_index] = r0
 
     r0
   end
@@ -2585,91 +2612,10 @@ module EDNGRAMMAR
     r0
   end
 
-  module S0
-    def comment
-      elements[0]
-    end
+  module Comment0
+  end
 
-  end
-
-  module S1
-  end
-
-  def _nt_S
-    start_index = index
-    if node_cache[:S].has_key?(index)
-      cached = node_cache[:S][index]
-      if cached
-        node_cache[:S][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
-        @index = cached.interval.end
-      end
-      return cached
-    end
-
-    i0, s0 = index, []
-    s1, i1 = [], index
-    loop do
-      r2 = _nt_blank
-      if r2
-        s1 << r2
-      else
-        break
-      end
-    end
-    r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
-    s0 << r1
-    if r1
-      s3, i3 = [], index
-      loop do
-        i4, s4 = index, []
-        r5 = _nt_comment
-        s4 << r5
-        if r5
-          s6, i6 = [], index
-          loop do
-            r7 = _nt_blank
-            if r7
-              s6 << r7
-            else
-              break
-            end
-          end
-          r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
-          s4 << r6
-        end
-        if s4.last
-          r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
-          r4.extend(S0)
-        else
-          @index = i4
-          r4 = nil
-        end
-        if r4
-          s3 << r4
-        else
-          break
-        end
-      end
-      r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
-      s0 << r3
-    end
-    if s0.last
-      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-      r0.extend(S1)
-    else
-      @index = i0
-      r0 = nil
-    end
-
-    node_cache[:S][start_index] = r0
-
-    r0
-  end
-
-  module Comment0
-  end
-
-  module Comment1
+  module Comment1
   end
 
   def _nt_comment
@@ -2780,23 +2726,169 @@ module EDNGRAMMAR
     r0
   end
 
-  module OC0
+  module S0
+    def comment
+      elements[0]
+    end
+
+  end
+
+  module S1
+  end
+
+  def _nt_S
+    start_index = index
+    if node_cache[:S].has_key?(index)
+      cached = node_cache[:S][index]
+      if cached
+        node_cache[:S][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0, s0 = index, []
+    s1, i1 = [], index
+    loop do
+      r2 = _nt_blank
+      if r2
+        s1 << r2
+      else
+        break
+      end
+    end
+    r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
+    s0 << r1
+    if r1
+      s3, i3 = [], index
+      loop do
+        i4, s4 = index, []
+        r5 = _nt_comment
+        s4 << r5
+        if r5
+          s6, i6 = [], index
+          loop do
+            r7 = _nt_blank
+            if r7
+              s6 << r7
+            else
+              break
+            end
+          end
+          r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
+          s4 << r6
+        end
+        if s4.last
+          r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
+          r4.extend(S0)
+        else
+          @index = i4
+          r4 = nil
+        end
+        if r4
+          s3 << r4
+        else
+          break
+        end
+      end
+      r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
+      s0 << r3
+    end
+    if s0.last
+      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+      r0.extend(S1)
+    else
+      @index = i0
+      r0 = nil
+    end
+
+    node_cache[:S][start_index] = r0
+
+    r0
+  end
+
+  module MS0
+    def S
+      elements[1]
+    end
+  end
+
+  def _nt_MS
+    start_index = index
+    if node_cache[:MS].has_key?(index)
+      cached = node_cache[:MS][index]
+      if cached
+        node_cache[:MS][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_blank
+    if r2
+      r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
+      r1 = r2
+    else
+      r3 = _nt_comment
+      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_S
+      s0 << r4
+    end
+    if s0.last
+      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+      r0.extend(MS0)
+    else
+      @index = i0
+      r0 = nil
+    end
+
+    node_cache[:MS][start_index] = r0
+
+    r0
+  end
+
+  module MSC0
+    def S
+      elements[1]
+    end
+  end
+
+  module MSC1
     def S
       elements[1]
     end
   end
 
-  def _nt_OC
+  module MSC2
+    def MS
+      elements[0]
+    end
+
+  end
+
+  def _nt_MSC
     start_index = index
-    if node_cache[:OC].has_key?(index)
-      cached = node_cache[:OC][index]
+    if node_cache[:MSC].has_key?(index)
+      cached = node_cache[:MSC][index]
       if cached
-        node_cache[:OC][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:MSC][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
@@ -2812,38 +2904,147 @@ module EDNGRAMMAR
     end
     if s1.last
       r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
-      r1.extend(OC0)
+      r1.extend(MSC0)
     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)
+      i4, s4 = index, []
+      r5 = _nt_MS
+      s4 << r5
+      if r5
+        i7, s7 = index, []
+        if (match_len = has_terminal?(",", false, index))
+          r8 = true
+          @index += match_len
+        else
+          terminal_parse_failure('","')
+          r8 = nil
+        end
+        s7 << r8
+        if r8
+          r9 = _nt_S
+          s7 << r9
+        end
+        if s7.last
+          r7 = instantiate_node(SyntaxNode,input, i7...index, s7)
+          r7.extend(MSC1)
+        else
+          @index = i7
+          r7 = nil
+        end
+        if r7
+          r6 = r7
+        else
+          r6 = instantiate_node(SyntaxNode,input, index...index)
+        end
+        s4 << r6
+      end
+      if s4.last
+        r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
+        r4.extend(MSC2)
+      else
+        @index = i4
+        r4 = nil
+      end
+      if r4
+        r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
+        r0 = r4
+      else
+        @index = i0
+        r0 = nil
+      end
     end
 
-    node_cache[:OC][start_index] = r0
+    node_cache[:MSC][start_index] = r0
+
+    r0
+  end
+
+  module SOC0
+    def S
+      elements[1]
+    end
+  end
+
+  module SOC1
+    def S
+      elements[0]
+    end
+
+  end
+
+  def _nt_SOC
+    start_index = index
+    if node_cache[:SOC].has_key?(index)
+      cached = node_cache[:SOC][index]
+      if cached
+        node_cache[:SOC][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      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(SOC0)
+      else
+        @index = i3
+        r3 = nil
+      end
+      if r3
+        r2 = r3
+      else
+        r2 = instantiate_node(SyntaxNode,input, index...index)
+      end
+      s0 << r2
+    end
+    if s0.last
+      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+      r0.extend(SOC1)
+    else
+      @index = i0
+      r0 = nil
+    end
+
+    node_cache[:SOC][start_index] = r0
 
     r0
   end
 
   module Streamstring0
-    def OC
+    def MSC
       elements[0]
     end
 
     def string
       elements[1]
     end
-
-    def S
-      elements[2]
-    end
   end
 
   module Streamstring1
-    def S1
+    def MS
       elements[1]
     end
 
@@ -2851,19 +3052,15 @@ module EDNGRAMMAR
       elements[2]
     end
 
-    def S2
-      elements[3]
-    end
-
-    def OC
-      elements[5]
+    def SOC
+      elements[4]
     end
 
   end
 
   module Streamstring2
     def ast
-      strings = [elements[2].ast] + elements[4].elements.map {|x| x.string.ast }
+      strings = [elements[2].ast] + elements[3].elements.map {|x| x.string.ast }
       unless Set[*strings.map(&:encoding)].size == 1
         warn "*** mixed streamstring #{strings.cbor_diagnostic}"
       end
@@ -2892,56 +3089,48 @@ module EDNGRAMMAR
     end
     s0 << r1
     if r1
-      r2 = _nt_S
+      r2 = _nt_MS
       s0 << r2
       if r2
         r3 = _nt_string
         s0 << r3
         if r3
-          r4 = _nt_S
+          s4, i4 = [], index
+          loop do
+            i5, s5 = index, []
+            r6 = _nt_MSC
+            s5 << r6
+            if r6
+              r7 = _nt_string
+              s5 << r7
+            end
+            if s5.last
+              r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
+              r5.extend(Streamstring0)
+            else
+              @index = i5
+              r5 = nil
+            end
+            if r5
+              s4 << r5
+            else
+              break
+            end
+          end
+          r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
           s0 << r4
           if r4
-            s5, i5 = [], index
-            loop do
-              i6, s6 = index, []
-              r7 = _nt_OC
-              s6 << r7
-              if r7
-                r8 = _nt_string
-                s6 << r8
-                if r8
-                  r9 = _nt_S
-                  s6 << r9
-                end
-              end
-              if s6.last
-                r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
-                r6.extend(Streamstring0)
-              else
-                @index = i6
-                r6 = nil
-              end
-              if r6
-                s5 << r6
+            r8 = _nt_SOC
+            s0 << r8
+            if r8
+              if (match_len = has_terminal?(")", false, index))
+                r9 = true
+                @index += match_len
               else
-                break
-              end
-            end
-            r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
-            s0 << r5
-            if r5
-              r10 = _nt_OC
-              s0 << r10
-              if r10
-                if (match_len = has_terminal?(")", false, index))
-                  r11 = true
-                  @index += match_len
-                else
-                  terminal_parse_failure('")"')
-                  r11 = nil
-                end
-                s0 << r11
+                terminal_parse_failure('")"')
+                r9 = nil
               end
+              s0 << r9
             end
           end
         end
@@ -2964,6 +3153,10 @@ module EDNGRAMMAR
   module Spec0
   end
 
+  module Spec1
+    def ast; elements[0].elements[1].text_value end
+  end
+
   def _nt_spec
     start_index = index
     if node_cache[:spec].has_key?(index)
@@ -3015,6 +3208,71 @@ module EDNGRAMMAR
     r0
   end
 
+  module Specms0
+    def MS
+      elements[2]
+    end
+  end
+
+  module Specms1
+    def ast; elements[0].elements[1].text_value end
+  end
+
+  def _nt_specms
+    start_index = index
+    if node_cache[:specms].has_key?(index)
+      cached = node_cache[:specms][index]
+      if cached
+        node_cache[:specms][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    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
+        r5 = _nt_MS
+        s1 << r5
+      end
+    end
+    if s1.last
+      r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
+      r1.extend(Specms0)
+    else
+      @index = i1
+      r1 = nil
+    end
+    if r1
+      r0 = r1
+    else
+      r0 = instantiate_node(SyntaxNode,input, index...index)
+    end
+
+    node_cache[:specms][start_index] = r0
+
+    r0
+  end
+
   module DoubleQuoted0
     def ast; text_value.gsub("\r", "") end
   end

metadata

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