edn-abnf 0.1.7 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fddd16926a1e5bfe04391f6d13697fbc6efae2f10aa8760c302a166392b0f219
-  data.tar.gz: 366deb2e42f3ae5260ca3be9e8c8fa9badd95013338534d856f467635d7128bf
+  metadata.gz: a0ccd3540b2b3966eb739a688fd22322c2e0a7300e315d647b583ce5960f33f6
+  data.tar.gz: 98cdfdc738e65e68970cc9efec4d1616f54d8bfc2bcb296ec3d72c0f0363aa82
 SHA512:
-  metadata.gz: 1f752e65f80dcd12430c8add3976d5166689701a4e25892c7c2e4ae6d9f6447cdb7840c59e0294dbe010318e553402e565d24854a461cbdb7063d2d65ea71911
-  data.tar.gz: dfbe082491e4601b2b59fa6ec2c4304ae24bf7f47f1dbb9b152e2de535afd9c49caa215a537e575162a1b62da10cb722da1cad4b844a34114d9f317d7818f7b4
+  metadata.gz: 3e3ee53333c99241e2e9c4f29b06df4b2fd148dbedece4d6287058891e299fefffa8724c914a7931f51b0a8f879449afd1264dcc2dbe3301ccd7eb007418e0bb
+  data.tar.gz: 73b08bd9557d8780e63ab65b21c71bd573f429ef1c3b29fab03773c61601d9f9ab474d8e8afdd97ac8a232cd815a57900b495ab100e0f38f85dd663a76c9d705

data/bin/edn-abnf

@@ -56,22 +56,26 @@ end
 edn_file = $options.edn
 
 if $options.lines
-  CSV.parse(edn_file) do |ok, edn, out|
+  CSV.parse(edn_file) do |ok, ednin, out|
     if ok[0] == "#"
-      puts "# #{ok}, #{edn.inspect}, #{out}" if $options.verbose
+      puts "# #{ok}, #{ednin.inspect}, #{out}" if $options.verbose
       next
     end
     begin
       ok = ok == "="
-      puts "➔ #{ok}, #{edn}, #{out}" if $options.verbose
-      edn = EDN.from_edn(edn)
+      puts "➔ #{ok}, #{ednin}, #{out}" if $options.verbose
+      edn = EDN.from_edn(ednin)
       result = edn.tree
       diag = result.cbor_diagnostic
       if out == diag && !ok
           puts "** ≠ / #{diag.inspect} / #{out.inspect}"
       end
       if out != diag && ok
-          puts "** ≡ / #{diag.inspect} / #{out.inspect}"
+        outdiag = EDN.from_edn(out).tree.cbor_diagnostic
+        if outdiag != diag
+          puts "** ≡ / #{ednin.inspect} #{diag.inspect} / #{out.inspect} #{outdiag.inspect}"
+        end
+        puts "reparsed / #{diag.inspect} / #{out.inspect}" if $options.verbose
       end
     rescue ArgumentError => e
       if ok

data/edn-abnf.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "edn-abnf"
-  s.version = "0.1.7"
+  s.version = "0.2.3"
   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,16 +10,16 @@ module EDNGRAMMAR
   end
 
   module Seq0
-    def S1
-      elements[1]
+    def OC
+      elements[0]
     end
 
     def item
-      elements[2]
+      elements[1]
     end
 
-    def S2
-      elements[3]
+    def S
+      elements[2]
     end
   end
 
@@ -84,24 +84,14 @@ module EDNGRAMMAR
           s6, i6 = [], index
           loop do
             i7, s7 = index, []
-            if (match_len = has_terminal?(",", false, index))
-              r8 = true
-              @index += match_len
-            else
-              terminal_parse_failure('","')
-              r8 = nil
-            end
+            r8 = _nt_OC
             s7 << r8
             if r8
-              r9 = _nt_S
+              r9 = _nt_item
               s7 << r9
               if r9
-                r10 = _nt_item
+                r10 = _nt_S
                 s7 << r10
-                if r10
-                  r11 = _nt_S
-                  s7 << r11
-                end
               end
             end
             if s7.last
@@ -120,8 +110,8 @@ module EDNGRAMMAR
           r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
           s3 << r6
           if r6
-            r12 = _nt_OC
-            s3 << r12
+            r11 = _nt_OC
+            s3 << r11
           end
         end
       end
@@ -353,12 +343,16 @@ module EDNGRAMMAR
   end
 
   module String0
-    def S
+    def S1
       elements[0]
     end
 
+    def S2
+      elements[2]
+    end
+
     def string1e
-      elements[1]
+      elements[3]
     end
   end
 
@@ -384,7 +378,7 @@ module EDNGRAMMAR
       end
     end
     def ast
-      arr = [elements[0].ast] + elements[1].elements.map {|x| x.elements[1].ast}
+      arr = [elements[0].ast] + elements[1].elements.map {|x| x.elements[3].ast}
       charr = arr.chunk(&:class).to_a
       if charr.size == 1
         unpack_chunk(*charr.first)
@@ -415,8 +409,22 @@ module EDNGRAMMAR
         r4 = _nt_S
         s3 << r4
         if r4
-          r5 = _nt_string1e
+          if (match_len = has_terminal?("+", false, index))
+            r5 = true
+            @index += match_len
+          else
+            terminal_parse_failure('"+"')
+            r5 = nil
+          end
           s3 << r5
+          if r5
+            r6 = _nt_S
+            s3 << r6
+            if r6
+              r7 = _nt_string1e
+              s3 << r7
+            end
+          end
         end
         if s3.last
           r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
@@ -476,30 +484,48 @@ module EDNGRAMMAR
 
     i0, s0 = index, []
     i1 = index
-    r2 = _nt_basenumber
+    r2 = _nt_hexfloat
     if r2
       r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
       r1 = r2
     else
-      r3 = _nt_decnumber
+      r3 = _nt_hexint
       if r3
         r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
         r1 = r3
       else
-        r4 = _nt_infin
+        r4 = _nt_octint
         if r4
           r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
           r1 = r4
         else
-          @index = i1
-          r1 = nil
+          r5 = _nt_binint
+          if r5
+            r5 = SyntaxNode.new(input, (index-1)...index) if r5 == true
+            r1 = r5
+          else
+            r6 = _nt_decnumber
+            if r6
+              r6 = SyntaxNode.new(input, (index-1)...index) if r6 == true
+              r1 = r6
+            else
+              r7 = _nt_nonfin
+              if r7
+                r7 = SyntaxNode.new(input, (index-1)...index) if r7 == true
+                r1 = r7
+              else
+                @index = i1
+                r1 = nil
+              end
+            end
+          end
         end
       end
     end
     s0 << r1
     if r1
-      r5 = _nt_spec
-      s0 << r5
+      r8 = _nt_spec
+      s0 << r8
     end
     if s0.last
       r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
@@ -783,37 +809,28 @@ module EDNGRAMMAR
     r0
   end
 
-  module Basenumber0
-  end
-
-  module Basenumber1
-  end
-
-  module Basenumber2
+  module Hexfloat0
   end
 
-  module Basenumber3
+  module Hexfloat1
   end
 
-  module Basenumber4
+  module Hexfloat2
   end
 
-  module Basenumber5
+  module Hexfloat3
   end
 
-  module Basenumber6
+  module Hexfloat4
+    def ast; Float(text_value.sub(/x\./i, "x0.").sub(/\.p/i, ".0p")) end
   end
 
-  module Basenumber7
-    def ast; /p/i =~ text_value ? Float(text_value.sub(/x\./i, "x0.").sub(/\.p/i, ".0p")) : Integer(text_value) end
-  end
-
-  def _nt_basenumber
+  def _nt_hexfloat
     start_index = index
-    if node_cache[:basenumber].has_key?(index)
-      cached = node_cache[:basenumber][index]
+    if node_cache[:hexfloat].has_key?(index)
+      cached = node_cache[:hexfloat][index]
       if cached
-        node_cache[:basenumber][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:hexfloat][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -828,134 +845,73 @@ module EDNGRAMMAR
     end
     s0 << r1
     if r1
-      if (match_len = has_terminal?("0", false, index))
-        r3 = true
+      if (match_len = has_terminal?("0x", :insens, index))
+        r3 = instantiate_node(SyntaxNode,input, index...(index + match_len))
         @index += match_len
       else
-        terminal_parse_failure('"0"')
+        terminal_parse_failure('"0x"')
         r3 = nil
       end
       s0 << r3
       if r3
         i4 = index
         i5, s5 = index, []
-        if (match_len = has_terminal?("x", :insens, index))
-          r6 = instantiate_node(SyntaxNode,input, index...(index + match_len))
-          @index += match_len
-        else
-          terminal_parse_failure('"x"')
+        s6, i6 = [], index
+        loop do
+          r7 = _nt_HEXDIG
+          if r7
+            s6 << r7
+          else
+            break
+          end
+        end
+        if s6.empty?
+          @index = i6
           r6 = nil
+        else
+          r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
         end
         s5 << r6
         if r6
-          s7, i7 = [], index
-          loop do
-            r8 = _nt_HEXDIG
-            if r8
-              s7 << r8
-            else
-              break
-            end
-          end
-          if s7.empty?
-            @index = i7
-            r7 = nil
+          i9, s9 = index, []
+          if (match_len = has_terminal?(".", false, index))
+            r10 = true
+            @index += match_len
           else
-            r7 = instantiate_node(SyntaxNode,input, i7...index, s7)
+            terminal_parse_failure('"."')
+            r10 = nil
           end
-          s5 << r7
-          if r7
-            i10, s10 = index, []
-            i12, s12 = index, []
-            if (match_len = has_terminal?(".", false, index))
-              r13 = true
-              @index += match_len
-            else
-              terminal_parse_failure('"."')
-              r13 = nil
-            end
-            s12 << r13
-            if r13
-              s14, i14 = [], index
-              loop do
-                r15 = _nt_HEXDIG
-                if r15
-                  s14 << r15
-                else
-                  break
-                end
-              end
-              r14 = instantiate_node(SyntaxNode,input, i14...index, s14)
-              s12 << r14
-            end
-            if s12.last
-              r12 = instantiate_node(SyntaxNode,input, i12...index, s12)
-              r12.extend(Basenumber0)
-            else
-              @index = i12
-              r12 = nil
-            end
-            if r12
-              r11 = r12
-            else
-              r11 = instantiate_node(SyntaxNode,input, index...index)
-            end
-            s10 << r11
-            if r11
-              if (match_len = has_terminal?("p", :insens, index))
-                r16 = instantiate_node(SyntaxNode,input, index...(index + match_len))
-                @index += match_len
+          s9 << r10
+          if r10
+            s11, i11 = [], index
+            loop do
+              r12 = _nt_HEXDIG
+              if r12
+                s11 << r12
               else
-                terminal_parse_failure('"p"')
-                r16 = nil
-              end
-              s10 << r16
-              if r16
-                r18 = _nt_sign
-                if r18
-                  r17 = r18
-                else
-                  r17 = instantiate_node(SyntaxNode,input, index...index)
-                end
-                s10 << r17
-                if r17
-                  s19, i19 = [], index
-                  loop do
-                    r20 = _nt_DIGIT
-                    if r20
-                      s19 << r20
-                    else
-                      break
-                    end
-                  end
-                  if s19.empty?
-                    @index = i19
-                    r19 = nil
-                  else
-                    r19 = instantiate_node(SyntaxNode,input, i19...index, s19)
-                  end
-                  s10 << r19
-                end
+                break
               end
             end
-            if s10.last
-              r10 = instantiate_node(SyntaxNode,input, i10...index, s10)
-              r10.extend(Basenumber1)
-            else
-              @index = i10
-              r10 = nil
-            end
-            if r10
-              r9 = r10
-            else
-              r9 = instantiate_node(SyntaxNode,input, index...index)
-            end
-            s5 << r9
+            r11 = instantiate_node(SyntaxNode,input, i11...index, s11)
+            s9 << r11
+          end
+          if s9.last
+            r9 = instantiate_node(SyntaxNode,input, i9...index, s9)
+            r9.extend(Hexfloat0)
+          else
+            @index = i9
+            r9 = nil
+          end
+          if r9
+            r8 = r9
+          else
+            r8 = instantiate_node(SyntaxNode,input, index...index)
           end
+          s5 << r8
         end
         if s5.last
           r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
-          r5.extend(Basenumber2)
+          r5.extend(Hexfloat1)
         else
           @index = i5
           r5 = nil
@@ -964,208 +920,324 @@ module EDNGRAMMAR
           r5 = SyntaxNode.new(input, (index-1)...index) if r5 == true
           r4 = r5
         else
-          i21, s21 = index, []
-          if (match_len = has_terminal?("x", :insens, index))
-            r22 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+          i13, s13 = index, []
+          if (match_len = has_terminal?(".", false, index))
+            r14 = true
             @index += match_len
           else
-            terminal_parse_failure('"x"')
-            r22 = nil
+            terminal_parse_failure('"."')
+            r14 = nil
           end
-          s21 << r22
-          if r22
-            if (match_len = has_terminal?(".", false, index))
-              r23 = true
-              @index += match_len
-            else
-              terminal_parse_failure('"."')
-              r23 = nil
-            end
-            s21 << r23
-            if r23
-              s24, i24 = [], index
-              loop do
-                r25 = _nt_HEXDIG
-                if r25
-                  s24 << r25
-                else
-                  break
-                end
-              end
-              if s24.empty?
-                @index = i24
-                r24 = nil
+          s13 << r14
+          if r14
+            s15, i15 = [], index
+            loop do
+              r16 = _nt_HEXDIG
+              if r16
+                s15 << r16
               else
-                r24 = instantiate_node(SyntaxNode,input, i24...index, s24)
-              end
-              s21 << r24
-              if r24
-                if (match_len = has_terminal?("p", :insens, index))
-                  r26 = instantiate_node(SyntaxNode,input, index...(index + match_len))
-                  @index += match_len
-                else
-                  terminal_parse_failure('"p"')
-                  r26 = nil
-                end
-                s21 << r26
-                if r26
-                  r28 = _nt_sign
-                  if r28
-                    r27 = r28
-                  else
-                    r27 = instantiate_node(SyntaxNode,input, index...index)
-                  end
-                  s21 << r27
-                  if r27
-                    s29, i29 = [], index
-                    loop do
-                      r30 = _nt_DIGIT
-                      if r30
-                        s29 << r30
-                      else
-                        break
-                      end
-                    end
-                    if s29.empty?
-                      @index = i29
-                      r29 = nil
-                    else
-                      r29 = instantiate_node(SyntaxNode,input, i29...index, s29)
-                    end
-                    s21 << r29
-                  end
-                end
+                break
               end
             end
+            if s15.empty?
+              @index = i15
+              r15 = nil
+            else
+              r15 = instantiate_node(SyntaxNode,input, i15...index, s15)
+            end
+            s13 << r15
           end
-          if s21.last
-            r21 = instantiate_node(SyntaxNode,input, i21...index, s21)
-            r21.extend(Basenumber3)
+          if s13.last
+            r13 = instantiate_node(SyntaxNode,input, i13...index, s13)
+            r13.extend(Hexfloat2)
           else
-            @index = i21
-            r21 = nil
+            @index = i13
+            r13 = nil
           end
-          if r21
-            r21 = SyntaxNode.new(input, (index-1)...index) if r21 == true
-            r4 = r21
+          if r13
+            r13 = SyntaxNode.new(input, (index-1)...index) if r13 == true
+            r4 = r13
           else
-            i31, s31 = index, []
-            if (match_len = has_terminal?("o", :insens, index))
-              r32 = instantiate_node(SyntaxNode,input, index...(index + match_len))
-              @index += match_len
+            @index = i4
+            r4 = nil
+          end
+        end
+        s0 << r4
+        if r4
+          if (match_len = has_terminal?("p", :insens, index))
+            r17 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+            @index += match_len
+          else
+            terminal_parse_failure('"p"')
+            r17 = nil
+          end
+          s0 << r17
+          if r17
+            r19 = _nt_sign
+            if r19
+              r18 = r19
             else
-              terminal_parse_failure('"o"')
-              r32 = nil
+              r18 = instantiate_node(SyntaxNode,input, index...index)
             end
-            s31 << r32
-            if r32
-              s33, i33 = [], index
+            s0 << r18
+            if r18
+              s20, i20 = [], index
               loop do
-                r34 = _nt_ODIGIT
-                if r34
-                  s33 << r34
+                r21 = _nt_DIGIT
+                if r21
+                  s20 << r21
                 else
                   break
                 end
               end
-              if s33.empty?
-                @index = i33
-                r33 = nil
-              else
-                r33 = instantiate_node(SyntaxNode,input, i33...index, s33)
-              end
-              s31 << r33
-            end
-            if s31.last
-              r31 = instantiate_node(SyntaxNode,input, i31...index, s31)
-              r31.extend(Basenumber4)
-            else
-              @index = i31
-              r31 = nil
-            end
-            if r31
-              r31 = SyntaxNode.new(input, (index-1)...index) if r31 == true
-              r4 = r31
-            else
-              i35, s35 = index, []
-              if (match_len = has_terminal?("b", :insens, index))
-                r36 = instantiate_node(SyntaxNode,input, index...(index + match_len))
-                @index += match_len
-              else
-                terminal_parse_failure('"b"')
-                r36 = nil
-              end
-              s35 << r36
-              if r36
-                s37, i37 = [], index
-                loop do
-                  r38 = _nt_BDIGIT
-                  if r38
-                    s37 << r38
-                  else
-                    break
-                  end
-                end
-                if s37.empty?
-                  @index = i37
-                  r37 = nil
-                else
-                  r37 = instantiate_node(SyntaxNode,input, i37...index, s37)
-                end
-                s35 << r37
-              end
-              if s35.last
-                r35 = instantiate_node(SyntaxNode,input, i35...index, s35)
-                r35.extend(Basenumber5)
+              if s20.empty?
+                @index = i20
+                r20 = nil
               else
-                @index = i35
-                r35 = nil
-              end
-              if r35
-                r35 = SyntaxNode.new(input, (index-1)...index) if r35 == true
-                r4 = r35
-              else
-                @index = i4
-                r4 = nil
+                r20 = instantiate_node(SyntaxNode,input, i20...index, s20)
               end
+              s0 << r20
             end
           end
         end
+      end
+    end
+    if s0.last
+      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+      r0.extend(Hexfloat3)
+      r0.extend(Hexfloat4)
+    else
+      @index = i0
+      r0 = nil
+    end
+
+    node_cache[:hexfloat][start_index] = r0
+
+    r0
+  end
+
+  module Hexint0
+  end
+
+  module Hexint1
+    def ast; Integer(text_value) end
+  end
+
+  def _nt_hexint
+    start_index = index
+    if node_cache[:hexint].has_key?(index)
+      cached = node_cache[:hexint][index]
+      if cached
+        node_cache[:hexint][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0, s0 = index, []
+    r2 = _nt_sign
+    if r2
+      r1 = r2
+    else
+      r1 = instantiate_node(SyntaxNode,input, index...index)
+    end
+    s0 << r1
+    if r1
+      if (match_len = has_terminal?("0x", :insens, index))
+        r3 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+        @index += match_len
+      else
+        terminal_parse_failure('"0x"')
+        r3 = nil
+      end
+      s0 << r3
+      if r3
+        s4, i4 = [], index
+        loop do
+          r5 = _nt_HEXDIG
+          if r5
+            s4 << r5
+          else
+            break
+          end
+        end
+        if s4.empty?
+          @index = i4
+          r4 = nil
+        else
+          r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
+        end
+        s0 << r4
+      end
+    end
+    if s0.last
+      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+      r0.extend(Hexint0)
+      r0.extend(Hexint1)
+    else
+      @index = i0
+      r0 = nil
+    end
+
+    node_cache[:hexint][start_index] = r0
+
+    r0
+  end
+
+  module Octint0
+  end
+
+  module Octint1
+    def ast; Integer(text_value) end
+  end
+
+  def _nt_octint
+    start_index = index
+    if node_cache[:octint].has_key?(index)
+      cached = node_cache[:octint][index]
+      if cached
+        node_cache[:octint][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0, s0 = index, []
+    r2 = _nt_sign
+    if r2
+      r1 = r2
+    else
+      r1 = instantiate_node(SyntaxNode,input, index...index)
+    end
+    s0 << r1
+    if r1
+      if (match_len = has_terminal?("0o", :insens, index))
+        r3 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+        @index += match_len
+      else
+        terminal_parse_failure('"0o"')
+        r3 = nil
+      end
+      s0 << r3
+      if r3
+        s4, i4 = [], index
+        loop do
+          r5 = _nt_ODIGIT
+          if r5
+            s4 << r5
+          else
+            break
+          end
+        end
+        if s4.empty?
+          @index = i4
+          r4 = nil
+        else
+          r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
+        end
         s0 << r4
       end
     end
     if s0.last
       r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-      r0.extend(Basenumber6)
-      r0.extend(Basenumber7)
+      r0.extend(Octint0)
+      r0.extend(Octint1)
     else
       @index = i0
       r0 = nil
     end
 
-    node_cache[:basenumber][start_index] = r0
+    node_cache[:octint][start_index] = r0
 
     r0
   end
 
-  module Infin0
+  module Binint0
+  end
+
+  module Binint1
+    def ast; Integer(text_value) end
+  end
+
+  def _nt_binint
+    start_index = index
+    if node_cache[:binint].has_key?(index)
+      cached = node_cache[:binint][index]
+      if cached
+        node_cache[:binint][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0, s0 = index, []
+    r2 = _nt_sign
+    if r2
+      r1 = r2
+    else
+      r1 = instantiate_node(SyntaxNode,input, index...index)
+    end
+    s0 << r1
+    if r1
+      if (match_len = has_terminal?("0b", :insens, index))
+        r3 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+        @index += match_len
+      else
+        terminal_parse_failure('"0b"')
+        r3 = nil
+      end
+      s0 << r3
+      if r3
+        s4, i4 = [], index
+        loop do
+          r5 = _nt_BDIGIT
+          if r5
+            s4 << r5
+          else
+            break
+          end
+        end
+        if s4.empty?
+          @index = i4
+          r4 = nil
+        else
+          r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
+        end
+        s0 << r4
+      end
+    end
+    if s0.last
+      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+      r0.extend(Binint0)
+      r0.extend(Binint1)
+    else
+      @index = i0
+      r0 = nil
+    end
+
+    node_cache[:binint][start_index] = r0
+
+    r0
+  end
+
+  module Nonfin0
     def ast; Float::INFINITY end
   end
 
-  module Infin1
+  module Nonfin1
     def ast; -Float::INFINITY end
   end
 
-  module Infin2
+  module Nonfin2
     def ast; Float::NAN end
   end
 
-  def _nt_infin
+  def _nt_nonfin
     start_index = index
-    if node_cache[:infin].has_key?(index)
-      cached = node_cache[:infin][index]
+    if node_cache[:nonfin].has_key?(index)
+      cached = node_cache[:nonfin][index]
       if cached
-        node_cache[:infin][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:nonfin][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -1174,7 +1246,7 @@ module EDNGRAMMAR
     i0 = index
     if (match_len = has_terminal?("Infinity", false, index))
       r1 = instantiate_node(SyntaxNode,input, index...(index + match_len))
-      r1.extend(Infin0)
+      r1.extend(Nonfin0)
       @index += match_len
     else
       terminal_parse_failure('"Infinity"')
@@ -1186,7 +1258,7 @@ module EDNGRAMMAR
     else
       if (match_len = has_terminal?("-Infinity", false, index))
         r2 = instantiate_node(SyntaxNode,input, index...(index + match_len))
-        r2.extend(Infin1)
+        r2.extend(Nonfin1)
         @index += match_len
       else
         terminal_parse_failure('"-Infinity"')
@@ -1198,7 +1270,7 @@ module EDNGRAMMAR
       else
         if (match_len = has_terminal?("NaN", false, index))
           r3 = instantiate_node(SyntaxNode,input, index...(index + match_len))
-          r3.extend(Infin2)
+          r3.extend(Nonfin2)
           @index += match_len
         else
           terminal_parse_failure('"NaN"')
@@ -1214,7 +1286,7 @@ module EDNGRAMMAR
       end
     end
 
-    node_cache[:infin][start_index] = r0
+    node_cache[:nonfin][start_index] = r0
 
     r0
   end
@@ -1913,16 +1985,16 @@ module EDNGRAMMAR
   end
 
   module Array0
-    def S1
-      elements[1]
+    def OC
+      elements[0]
     end
 
     def item
-      elements[2]
+      elements[1]
     end
 
-    def S2
-      elements[3]
+    def S
+      elements[2]
     end
   end
 
@@ -2007,24 +2079,14 @@ module EDNGRAMMAR
               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
+                r10 = _nt_OC
                 s9 << r10
                 if r10
-                  r11 = _nt_S
+                  r11 = _nt_item
                   s9 << r11
                   if r11
-                    r12 = _nt_item
+                    r12 = _nt_S
                     s9 << r12
-                    if r12
-                      r13 = _nt_S
-                      s9 << r13
-                    end
                   end
                 end
                 if s9.last
@@ -2043,8 +2105,8 @@ module EDNGRAMMAR
               r8 = instantiate_node(SyntaxNode,input, i8...index, s8)
               s5 << r8
               if r8
-                r14 = _nt_OC
-                s5 << r14
+                r13 = _nt_OC
+                s5 << r13
               end
             end
           end
@@ -2063,13 +2125,13 @@ module EDNGRAMMAR
           s0 << r4
           if r4
             if (match_len = has_terminal?("]", false, index))
-              r15 = true
+              r14 = true
               @index += match_len
             else
               terminal_parse_failure('"]"')
-              r15 = nil
+              r14 = nil
             end
-            s0 << r15
+            s0 << r14
           end
         end
       end
@@ -2089,16 +2151,16 @@ module EDNGRAMMAR
   end
 
   module Map0
-    def S1
-      elements[1]
+    def OC
+      elements[0]
     end
 
     def kp
-      elements[2]
+      elements[1]
     end
 
-    def S2
-      elements[3]
+    def S
+      elements[2]
     end
   end
 
@@ -2182,24 +2244,14 @@ module EDNGRAMMAR
               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
+                r10 = _nt_OC
                 s9 << r10
                 if r10
-                  r11 = _nt_S
+                  r11 = _nt_kp
                   s9 << r11
                   if r11
-                    r12 = _nt_kp
+                    r12 = _nt_S
                     s9 << r12
-                    if r12
-                      r13 = _nt_S
-                      s9 << r13
-                    end
                   end
                 end
                 if s9.last
@@ -2218,8 +2270,8 @@ module EDNGRAMMAR
               r8 = instantiate_node(SyntaxNode,input, i8...index, s8)
               s5 << r8
               if r8
-                r14 = _nt_OC
-                s5 << r14
+                r13 = _nt_OC
+                s5 << r13
               end
             end
           end
@@ -2238,13 +2290,13 @@ module EDNGRAMMAR
           s0 << r4
           if r4
             if (match_len = has_terminal?("}", false, index))
-              r15 = true
+              r14 = true
               @index += match_len
             else
               terminal_parse_failure('"}"')
-              r15 = nil
+              r14 = nil
             end
-            s0 << r15
+            s0 << r14
           end
         end
       end
@@ -2779,16 +2831,16 @@ module EDNGRAMMAR
   end
 
   module Streamstring0
-    def S1
-      elements[1]
+    def OC
+      elements[0]
     end
 
     def string
-      elements[2]
+      elements[1]
     end
 
-    def S2
-      elements[3]
+    def S
+      elements[2]
     end
   end
 
@@ -2854,24 +2906,14 @@ module EDNGRAMMAR
             s5, i5 = [], index
             loop do
               i6, s6 = index, []
-              if (match_len = has_terminal?(",", false, index))
-                r7 = true
-                @index += match_len
-              else
-                terminal_parse_failure('","')
-                r7 = nil
-              end
+              r7 = _nt_OC
               s6 << r7
               if r7
-                r8 = _nt_S
+                r8 = _nt_string
                 s6 << r8
                 if r8
-                  r9 = _nt_string
+                  r9 = _nt_S
                   s6 << r9
-                  if r9
-                    r10 = _nt_S
-                    s6 << r10
-                  end
                 end
               end
               if s6.last
@@ -2890,17 +2932,17 @@ module EDNGRAMMAR
             r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
             s0 << r5
             if r5
-              r11 = _nt_OC
-              s0 << r11
-              if r11
+              r10 = _nt_OC
+              s0 << r10
+              if r10
                 if (match_len = has_terminal?(")", false, index))
-                  r12 = true
+                  r11 = true
                   @index += match_len
                 else
                   terminal_parse_failure('")"')
-                  r12 = nil
+                  r11 = nil
                 end
-                s0 << r12
+                s0 << r11
               end
             end
           end
@@ -2976,7 +3018,7 @@ module EDNGRAMMAR
   end
 
   module DoubleQuoted0
-    def ast; text_value end
+    def ast; text_value.gsub("\r", "") end
   end
 
   module DoubleQuoted1
@@ -3097,7 +3139,7 @@ module EDNGRAMMAR
   end
 
   module SingleQuoted0
-    def ast; text_value end
+    def ast; text_value.gsub("\r", "") end
   end
 
   module SingleQuoted1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edn-abnf
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.3
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-12 00:00:00.000000000 Z
+date: 2024-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -85,12 +85,10 @@ description: edn-abnf implements converters and miscellaneous tools for CBOR EDN
 email: cabo@tzi.org
 executables:
 - edn-abnf
-- edn-abnf~
 extensions: []
 extra_rdoc_files: []
 files:
 - bin/edn-abnf
-- bin/edn-abnf~
 - edn-abnf.gemspec
 - lib/cbor-diagnostic-app/b64.rb
 - lib/cbor-diagnostic-app/b64grammar.rb
@@ -122,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.5.14
 signing_key:
 specification_version: 4
 summary: CBOR Extended Diagnostic Notation (EDN) implemented in ABNF

data/bin/edn-abnf~

@@ -1,57 +0,0 @@
-#!/usr/bin/env ruby
-require 'pp'
-require 'yaml'
-require 'treetop'
-require 'json'
-
-require_relative '../lib/edn-abnf.rb'
-
-def snaky(name)
-  name.gsub(/-/, "_")
-end
- 
-Encoding.default_external = Encoding::UTF_8
-require 'optparse'
-require 'ostruct'
-
-$options = OpenStruct.new
-begin
-  op = OptionParser.new do |opts|
-    opts.banner = "Usage: edn-abnf.rb [options] [file.edn... | -]"
-
-    opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
-      $options.verbose = v
-    end
-    opts.on("-tFMT", "--to=FMT", [:basic, :neat, :json, :yaml, :edn, :diag], "Target format") do |v|
-      $options.target = v
-    end
-  end
-  op.parse!
-rescue Exception => e
-  warn e
-  exit 1
-end
-
-if ARGV == []
-  puts op
-  exit 1
-end
-
-edn_file = ARGF.read
-
-edn = EDN.from_edn(edn_file)
-result = edn.tree               # XXX .tree?
-
-case $options.target
-when :basic, nil
-  pp result
-when :neat, :json
-  require 'neatjson'
-  puts JSON.neat_generate(result, after_comma: 1, after_colon: 1)
-when :yaml
-  puts result.to_yaml
-when :edn, :diag
-  puts result.cbor_diagnostic
-else
-  warn ["Unknown target format: ", $options.target].inspect
-end