edn-abnf 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad6ca6781c8f1fab8f4be83db41604619f4a38049b13e934f4eea8ab3a2fe757
-  data.tar.gz: b8d503680fffa8e5a81232ce301026f9780df6c35aaec80598549fd81fea63ab
+  metadata.gz: 1e4580b57714274ff5eb197811b5584c38537e43bf95b7a0add51171ed108db5
+  data.tar.gz: fc0240e0e1ef858a1f341c14e28bbba97f7108fef336f77e689a9369dc6aa5ea
 SHA512:
-  metadata.gz: 50ad3b1462112822df91e51617ef5dc0ba704e896be060562d6a42cd6c7f67980121b250ccfd080f11be9f51e406c005b1e37133f41156d1684ba13f07c80e78
-  data.tar.gz: 28d52a6d4f5b1e55b85d4cc8534341de042834fb36bb5b6962609332ead01bd66629fc664d4e88adcc0eb6b74948d357be979c4b5266524b61af44a6feee26c4
+  metadata.gz: ec376dbe72f63df3dcb2f34509e434b1d8f644369ac7a4e8e957072324b75146e50f4dd035669ec29c3f8199d2ae39a774751d1ac1657a7eccc36a801a483fb5
+  data.tar.gz: f603be649a4410de915c88109a7d3f5250868cb8ba02d4f2ca059358cdfd9a9bb93e76127c0b39344a3fceed326515d47b3dbc006821467645bef17551a18e0c

data/edn-abnf.gemspec

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

@@ -230,6 +230,9 @@ module EDNGRAMMAR
 
   module Number1
     def ast
+      if ei = spec.text_value[1..-1]
+         warn "*** ignoring unimplemented encoding indicator #{ei.inspect} for #{elements[0].text_value}"
+      end
       elements[0].ast
     end
   end
@@ -294,6 +297,9 @@ module EDNGRAMMAR
 
   module String1
     def ast
+      if ei = spec.text_value[1..-1]
+         warn "*** ignoring unimplemented encoding indicator #{ei.inspect} for #{elements[0].text_value}"
+      end
       elements[0].ast
     end
   end
@@ -1144,6 +1150,9 @@ module EDNGRAMMAR
 
   module Tagged1
     def ast
+      if ei = spec.text_value[1..-1]
+         warn "*** ignoring unimplemented encoding indicator #{ei.inspect} after tag number #{uint.text_value}"
+      end
       CBOR::Tagged.new(uint.text_value.to_i, item.ast)
     end
   end
@@ -1580,16 +1589,21 @@ module EDNGRAMMAR
       elements[1]
     end
 
+    def S
+      elements[2]
+    end
+
   end
 
   module Array3
     def ast
-      r = if e = elements[2].elements
+      r = if e = elements[3].elements
             [e[0].ast] + e[2].elements.map {|x| x.item.ast }
           else
             []
           end
-      if ei = spec.ast
+      if ei = spec.text_value[1..-1]
+         #       warn "** ei #{ei.inspect}"
          if ei == ""
            r.cbor_stream!
          else
@@ -1624,79 +1638,83 @@ module EDNGRAMMAR
       r2 = _nt_spec
       s0 << r2
       if r2
-        i4, s4 = index, []
-        r5 = _nt_item
-        s4 << r5
-        if r5
-          r6 = _nt_S
-          s4 << r6
+        r3 = _nt_S
+        s0 << r3
+        if r3
+          i5, s5 = index, []
+          r6 = _nt_item
+          s5 << r6
           if r6
-            s7, i7 = [], index
-            loop do
-              i8, s8 = index, []
-              if (match_len = has_terminal?(",", false, index))
-                r9 = true
-                @index += match_len
-              else
-                terminal_parse_failure('","')
-                r9 = nil
-              end
-              s8 << r9
-              if r9
-                r10 = _nt_S
-                s8 << r10
+            r7 = _nt_S
+            s5 << r7
+            if r7
+              s8, i8 = [], index
+              loop do
+                i9, s9 = index, []
+                if (match_len = has_terminal?(",", false, index))
+                  r10 = true
+                  @index += match_len
+                else
+                  terminal_parse_failure('","')
+                  r10 = nil
+                end
+                s9 << r10
                 if r10
-                  r11 = _nt_item
-                  s8 << r11
+                  r11 = _nt_S
+                  s9 << r11
                   if r11
-                    r12 = _nt_S
-                    s8 << r12
+                    r12 = _nt_item
+                    s9 << r12
+                    if r12
+                      r13 = _nt_S
+                      s9 << r13
+                    end
                   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
               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
-                s7 << r8
-              else
-                break
+                r14 = _nt_OC
+                s5 << r14
               end
             end
-            r7 = instantiate_node(SyntaxNode,input, i7...index, s7)
-            s4 << r7
-            if r7
-              r13 = _nt_OC
-              s4 << r13
-            end
           end
-        end
-        if s4.last
-          r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
-          r4.extend(Array1)
-        else
-          @index = i4
-          r4 = nil
-        end
-        if r4
-          r3 = r4
-        else
-          r3 = instantiate_node(SyntaxNode,input, index...index)
-        end
-        s0 << r3
-        if r3
-          if (match_len = has_terminal?("]", false, index))
-            r14 = true
-            @index += match_len
+          if s5.last
+            r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
+            r5.extend(Array1)
           else
-            terminal_parse_failure('"]"')
-            r14 = nil
+            @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))
+              r15 = true
+              @index += match_len
+            else
+              terminal_parse_failure('"]"')
+              r15 = nil
+            end
+            s0 << r15
           end
-          s0 << r14
         end
       end
     end
@@ -1747,16 +1765,20 @@ module EDNGRAMMAR
       elements[1]
     end
 
+    def S
+      elements[2]
+    end
+
   end
 
   module Map3
     def ast
-      r = if e = elements[2].elements
+      r = if e = elements[3].elements
             Hash[ [e[0].ast] + e[2].elements.map {|x| x.kp.ast } ]
           else
             {}
           end
-      if ei = spec.ast
+      if ei = spec.text_value[1..-1]
          if ei == ""
            r.cbor_stream!
          else
@@ -1791,79 +1813,83 @@ module EDNGRAMMAR
       r2 = _nt_spec
       s0 << r2
       if r2
-        i4, s4 = index, []
-        r5 = _nt_kp
-        s4 << r5
-        if r5
-          r6 = _nt_S
-          s4 << r6
+        r3 = _nt_S
+        s0 << r3
+        if r3
+          i5, s5 = index, []
+          r6 = _nt_kp
+          s5 << r6
           if r6
-            s7, i7 = [], index
-            loop do
-              i8, s8 = index, []
-              if (match_len = has_terminal?(",", false, index))
-                r9 = true
-                @index += match_len
-              else
-                terminal_parse_failure('","')
-                r9 = nil
-              end
-              s8 << r9
-              if r9
-                r10 = _nt_S
-                s8 << r10
+            r7 = _nt_S
+            s5 << r7
+            if r7
+              s8, i8 = [], index
+              loop do
+                i9, s9 = index, []
+                if (match_len = has_terminal?(",", false, index))
+                  r10 = true
+                  @index += match_len
+                else
+                  terminal_parse_failure('","')
+                  r10 = nil
+                end
+                s9 << r10
                 if r10
-                  r11 = _nt_kp
-                  s8 << r11
+                  r11 = _nt_S
+                  s9 << r11
                   if r11
-                    r12 = _nt_S
-                    s8 << r12
+                    r12 = _nt_kp
+                    s9 << r12
+                    if r12
+                      r13 = _nt_S
+                      s9 << r13
+                    end
                   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
               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
-                s7 << r8
-              else
-                break
+                r14 = _nt_OC
+                s5 << r14
               end
             end
-            r7 = instantiate_node(SyntaxNode,input, i7...index, s7)
-            s4 << r7
-            if r7
-              r13 = _nt_OC
-              s4 << r13
-            end
           end
-        end
-        if s4.last
-          r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
-          r4.extend(Map1)
-        else
-          @index = i4
-          r4 = nil
-        end
-        if r4
-          r3 = r4
-        else
-          r3 = instantiate_node(SyntaxNode,input, index...index)
-        end
-        s0 << r3
-        if r3
-          if (match_len = has_terminal?("}", false, index))
-            r14 = true
-            @index += match_len
+          if s5.last
+            r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
+            r5.extend(Map1)
           else
-            terminal_parse_failure('"}"')
-            r14 = nil
+            @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))
+              r15 = true
+              @index += match_len
+            else
+              terminal_parse_failure('"}"')
+              r15 = nil
+            end
+            s0 << r15
           end
-          s0 << r14
         end
       end
     end
@@ -2411,7 +2437,7 @@ module EDNGRAMMAR
   end
 
   module Streamstring1
-    def spec1
+    def S1
       elements[1]
     end
 
@@ -2419,7 +2445,7 @@ module EDNGRAMMAR
       elements[2]
     end
 
-    def S
+    def S2
       elements[3]
     end
 
@@ -2451,16 +2477,16 @@ module EDNGRAMMAR
     end
 
     i0, s0 = index, []
-    if (match_len = has_terminal?("(", false, index))
-      r1 = true
+    if (match_len = has_terminal?("(_", false, index))
+      r1 = instantiate_node(SyntaxNode,input, index...(index + match_len))
       @index += match_len
     else
-      terminal_parse_failure('"("')
+      terminal_parse_failure('"(_"')
       r1 = nil
     end
     s0 << r1
     if r1
-      r2 = _nt_spec1
+      r2 = _nt_S
       s0 << r2
       if r2
         r3 = _nt_string
@@ -2540,17 +2566,6 @@ module EDNGRAMMAR
   end
 
   module Spec0
-    def S
-      elements[2]
-    end
-  end
-
-  module Spec1
-    def ast;
-                        if (e1 = elements[1].elements) && !e1[0].empty?
-                          e1[1].text_value
-                        end
-                      end
   end
 
   def _nt_spec
@@ -2585,10 +2600,6 @@ module EDNGRAMMAR
       end
       r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
       s1 << r3
-      if r3
-        r5 = _nt_S
-        s1 << r5
-      end
     end
     if s1.last
       r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
@@ -2608,49 +2619,6 @@ module EDNGRAMMAR
     r0
   end
 
-  module Spec10
-    def S
-      elements[1]
-    end
-  end
-
-  def _nt_spec1
-    start_index = index
-    if node_cache[:spec1].has_key?(index)
-      cached = node_cache[:spec1][index]
-      if cached
-        node_cache[:spec1][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?("_", false, index))
-      r1 = true
-      @index += match_len
-    else
-      terminal_parse_failure('"_"')
-      r1 = nil
-    end
-    s0 << r1
-    if r1
-      r2 = _nt_S
-      s0 << r2
-    end
-    if s0.last
-      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-      r0.extend(Spec10)
-    else
-      @index = i0
-      r0 = nil
-    end
-
-    node_cache[:spec1][start_index] = r0
-
-    r0
-  end
-
   module DoubleQuoted0
     def ast; text_value end
   end

metadata

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