edn-abnf 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc5ceebd31ab8dcb7737436c41348a218438eb914ac7090e85015fb6ecbda313
-  data.tar.gz: 8859e52ce3b6154d0d409e01a1d4d279c1f60f589121eeb749f7d171b60c2452
+  metadata.gz: 65315f840b92a39b734580ff2050ff4e92329048046c9d24ed1d1246858ae8fd
+  data.tar.gz: 1949f58b8fe44914999cc91a78c14f87d28865cd753d749c0752333448d676a2
 SHA512:
-  metadata.gz: 350cb3b5cf59fc45721f626e2a6eb2cf5b936da60952aa4d758b14f8152f98e2f08afe490d2c3e063a2db6900ac1323f59c2e8f6248a11e8f9ff7ac440020130
-  data.tar.gz: 75c3ff4a6948ac326e1b60b9e49a4f440f2e18fd2dc910fc3a7b915244fc95be4edecf843cdcde6d408cc8d74df321200ef93762c3e15228c4c947ea41d600f0
+  metadata.gz: 9a559663ff8b81dcccecb561c8226dc5184276f119e08b23195578ead701a92fc1068e7067416a352c41596bbe733f503df7c554dbcb13ba36541da2661f4fd9
+  data.tar.gz: 6429e1496befd64f71a17e933132c39bfb960e342d40d8616ee4f272d47feafef1f9d5323e075a02007a854990c23e1881e691851cca8545a51a069d10cde171

data/edn-abnf.gemspec

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

data/lib/parser/edngrammar.rb

@@ -469,7 +469,13 @@ module EDNGRAMMAR
   end
 
   module Basenumber4
-    def ast; Integer(text_value) end
+  end
+
+  module Basenumber5
+  end
+
+  module Basenumber6
+    def ast; /p/i =~ text_value ? Float(text_value) : Integer(text_value) end
   end
 
   def _nt_basenumber
@@ -528,10 +534,98 @@ module EDNGRAMMAR
             r7 = instantiate_node(SyntaxNode,input, i7...index, s7)
           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
+              if s14.empty?
+                @index = i14
+                r14 = nil
+              else
+                r14 = instantiate_node(SyntaxNode,input, i14...index, s14)
+              end
+              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
+              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
+                  r19 = instantiate_node(SyntaxNode,input, i19...index, s19)
+                  s10 << r19
+                end
+              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
+          end
         end
         if s5.last
           r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
-          r5.extend(Basenumber0)
+          r5.extend(Basenumber2)
         else
           @index = i5
           r5 = nil
@@ -540,81 +634,81 @@ module EDNGRAMMAR
           r5 = SyntaxNode.new(input, (index-1)...index) if r5 == true
           r4 = r5
         else
-          i9, s9 = index, []
+          i21, s21 = index, []
           if (match_len = has_terminal?("o", :insens, index))
-            r10 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+            r22 = instantiate_node(SyntaxNode,input, index...(index + match_len))
             @index += match_len
           else
             terminal_parse_failure('"o"')
-            r10 = nil
+            r22 = nil
           end
-          s9 << r10
-          if r10
-            s11, i11 = [], index
+          s21 << r22
+          if r22
+            s23, i23 = [], index
             loop do
-              r12 = _nt_ODIGIT
-              if r12
-                s11 << r12
+              r24 = _nt_ODIGIT
+              if r24
+                s23 << r24
               else
                 break
               end
             end
-            if s11.empty?
-              @index = i11
-              r11 = nil
+            if s23.empty?
+              @index = i23
+              r23 = nil
             else
-              r11 = instantiate_node(SyntaxNode,input, i11...index, s11)
+              r23 = instantiate_node(SyntaxNode,input, i23...index, s23)
             end
-            s9 << r11
+            s21 << r23
           end
-          if s9.last
-            r9 = instantiate_node(SyntaxNode,input, i9...index, s9)
-            r9.extend(Basenumber1)
+          if s21.last
+            r21 = instantiate_node(SyntaxNode,input, i21...index, s21)
+            r21.extend(Basenumber3)
           else
-            @index = i9
-            r9 = nil
+            @index = i21
+            r21 = nil
           end
-          if r9
-            r9 = SyntaxNode.new(input, (index-1)...index) if r9 == true
-            r4 = r9
+          if r21
+            r21 = SyntaxNode.new(input, (index-1)...index) if r21 == true
+            r4 = r21
           else
-            i13, s13 = index, []
+            i25, s25 = index, []
             if (match_len = has_terminal?("b", :insens, index))
-              r14 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+              r26 = instantiate_node(SyntaxNode,input, index...(index + match_len))
               @index += match_len
             else
               terminal_parse_failure('"b"')
-              r14 = nil
+              r26 = nil
             end
-            s13 << r14
-            if r14
-              s15, i15 = [], index
+            s25 << r26
+            if r26
+              s27, i27 = [], index
               loop do
-                r16 = _nt_BDIGIT
-                if r16
-                  s15 << r16
+                r28 = _nt_BDIGIT
+                if r28
+                  s27 << r28
                 else
                   break
                 end
               end
-              if s15.empty?
-                @index = i15
-                r15 = nil
+              if s27.empty?
+                @index = i27
+                r27 = nil
               else
-                r15 = instantiate_node(SyntaxNode,input, i15...index, s15)
+                r27 = instantiate_node(SyntaxNode,input, i27...index, s27)
               end
-              s13 << r15
+              s25 << r27
             end
-            if s13.last
-              r13 = instantiate_node(SyntaxNode,input, i13...index, s13)
-              r13.extend(Basenumber2)
+            if s25.last
+              r25 = instantiate_node(SyntaxNode,input, i25...index, s25)
+              r25.extend(Basenumber4)
             else
-              @index = i13
-              r13 = nil
+              @index = i25
+              r25 = nil
             end
-            if r13
-              r13 = SyntaxNode.new(input, (index-1)...index) if r13 == true
-              r4 = r13
+            if r25
+              r25 = SyntaxNode.new(input, (index-1)...index) if r25 == true
+              r4 = r25
             else
               @index = i4
               r4 = nil
@@ -626,8 +720,8 @@ module EDNGRAMMAR
     end
     if s0.last
       r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-      r0.extend(Basenumber3)
-      r0.extend(Basenumber4)
+      r0.extend(Basenumber5)
+      r0.extend(Basenumber6)
     else
       @index = i0
       r0 = nil
@@ -1837,19 +1931,31 @@ module EDNGRAMMAR
         r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
         r0 = r2
       else
-        if has_terminal?(@regexps[gr = '\A[0-􏿿]'] ||= Regexp.new(gr), :regexp, index)
+        if has_terminal?(@regexps[gr = '\A[0-퟿]'] ||= Regexp.new(gr), :regexp, index)
           r3 = true
           @index += 1
         else
-          terminal_parse_failure('[0-􏿿]')
+          terminal_parse_failure('[0-퟿]')
           r3 = nil
         end
         if r3
           r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
           r0 = r3
         else
-          @index = i0
-          r0 = nil
+          if has_terminal?(@regexps[gr = '\A[-􏿿]'] ||= Regexp.new(gr), :regexp, index)
+            r4 = true
+            @index += 1
+          else
+            terminal_parse_failure('[-􏿿]')
+            r4 = nil
+          end
+          if r4
+            r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
+            r0 = r4
+          else
+            @index = i0
+            r0 = nil
+          end
         end
       end
     end
@@ -1859,7 +1965,79 @@ module EDNGRAMMAR
     r0
   end
 
+  def _nt_non_lf
+    start_index = index
+    if node_cache[:non_lf].has_key?(index)
+      cached = node_cache[:non_lf][index]
+      if cached
+        node_cache[:non_lf][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0 = index
+    if (match_len = has_terminal?("\t", false, index))
+      r1 = true
+      @index += match_len
+    else
+      terminal_parse_failure('"\\t"')
+      r1 = nil
+    end
+    if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
+      r0 = r1
+    else
+      if (match_len = has_terminal?("\r", false, index))
+        r2 = true
+        @index += match_len
+      else
+        terminal_parse_failure('"\\r"')
+        r2 = nil
+      end
+      if r2
+        r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
+        r0 = r2
+      else
+        if has_terminal?(@regexps[gr = '\A[\\ -퟿]'] ||= Regexp.new(gr), :regexp, index)
+          r3 = true
+          @index += 1
+        else
+          terminal_parse_failure('[\\ -퟿]')
+          r3 = nil
+        end
+        if r3
+          r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
+          r0 = r3
+        else
+          if has_terminal?(@regexps[gr = '\A[-􏿿]'] ||= Regexp.new(gr), :regexp, index)
+            r4 = true
+            @index += 1
+          else
+            terminal_parse_failure('[-􏿿]')
+            r4 = nil
+          end
+          if r4
+            r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
+            r0 = r4
+          else
+            @index = i0
+            r0 = nil
+          end
+        end
+      end
+    end
+
+    node_cache[:non_lf][start_index] = r0
+
+    r0
+  end
+
   module S0
+    def comment
+      elements[0]
+    end
+
   end
 
   module S1
@@ -1892,18 +2070,12 @@ module EDNGRAMMAR
       s3, i3 = [], index
       loop do
         i4, s4 = index, []
-        if (match_len = has_terminal?("/", false, index))
-          r5 = true
-          @index += match_len
-        else
-          terminal_parse_failure('"/"')
-          r5 = nil
-        end
+        r5 = _nt_comment
         s4 << r5
         if r5
           s6, i6 = [], index
           loop do
-            r7 = _nt_non_slash
+            r7 = _nt_blank
             if r7
               s6 << r7
             else
@@ -1912,29 +2084,6 @@ module EDNGRAMMAR
           end
           r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
           s4 << r6
-          if r6
-            if (match_len = has_terminal?("/", false, index))
-              r8 = true
-              @index += match_len
-            else
-              terminal_parse_failure('"/"')
-              r8 = nil
-            end
-            s4 << r8
-            if r8
-              s9, i9 = [], index
-              loop do
-                r10 = _nt_blank
-                if r10
-                  s9 << r10
-                else
-                  break
-                end
-              end
-              r9 = instantiate_node(SyntaxNode,input, i9...index, s9)
-              s4 << r9
-            end
-          end
         end
         if s4.last
           r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
@@ -1965,6 +2114,120 @@ module EDNGRAMMAR
     r0
   end
 
+  module Comment0
+  end
+
+  module Comment1
+  end
+
+  def _nt_comment
+    start_index = index
+    if node_cache[:comment].has_key?(index)
+      cached = node_cache[:comment][index]
+      if cached
+        node_cache[:comment][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0 = index
+    i1, s1 = index, []
+    if (match_len = has_terminal?("/", false, index))
+      r2 = true
+      @index += match_len
+    else
+      terminal_parse_failure('"/"')
+      r2 = nil
+    end
+    s1 << r2
+    if r2
+      s3, i3 = [], index
+      loop do
+        r4 = _nt_non_slash
+        if r4
+          s3 << r4
+        else
+          break
+        end
+      end
+      r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
+      s1 << r3
+      if r3
+        if (match_len = has_terminal?("/", false, index))
+          r5 = true
+          @index += match_len
+        else
+          terminal_parse_failure('"/"')
+          r5 = nil
+        end
+        s1 << r5
+      end
+    end
+    if s1.last
+      r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
+      r1.extend(Comment0)
+    else
+      @index = i1
+      r1 = nil
+    end
+    if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
+      r0 = r1
+    else
+      i6, s6 = index, []
+      if (match_len = has_terminal?("#", false, index))
+        r7 = true
+        @index += match_len
+      else
+        terminal_parse_failure('"#"')
+        r7 = nil
+      end
+      s6 << r7
+      if r7
+        s8, i8 = [], index
+        loop do
+          r9 = _nt_non_lf
+          if r9
+            s8 << r9
+          else
+            break
+          end
+        end
+        r8 = instantiate_node(SyntaxNode,input, i8...index, s8)
+        s6 << r8
+        if r8
+          if (match_len = has_terminal?("\n", false, index))
+            r10 = true
+            @index += match_len
+          else
+            terminal_parse_failure('"\\n"')
+            r10 = nil
+          end
+          s6 << r10
+        end
+      end
+      if s6.last
+        r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
+        r6.extend(Comment1)
+      else
+        @index = i6
+        r6 = nil
+      end
+      if r6
+        r6 = SyntaxNode.new(input, (index-1)...index) if r6 == true
+        r0 = r6
+      else
+        @index = i0
+        r0 = nil
+      end
+    end
+
+    node_cache[:comment][start_index] = r0
+
+    r0
+  end
+
   module OC0
     def S
       elements[1]
@@ -2051,7 +2314,7 @@ module EDNGRAMMAR
       elements[1]
     end
 
-    def sqstr
+    def bstr
       elements[2]
     end
 
@@ -2065,7 +2328,7 @@ module EDNGRAMMAR
       elements[1]
     end
 
-    def sqstr
+    def bstr
       elements[2]
     end
 
@@ -2190,7 +2453,7 @@ module EDNGRAMMAR
         r16 = _nt_spec1
         s14 << r16
         if r16
-          r17 = _nt_sqstr
+          r17 = _nt_bstr
           s14 << r17
           if r17
             r18 = _nt_S
@@ -2211,7 +2474,7 @@ module EDNGRAMMAR
                   r22 = _nt_S
                   s20 << r22
                   if r22
-                    r23 = _nt_sqstr
+                    r23 = _nt_bstr
                     s20 << r23
                     if r23
                       r24 = _nt_S
@@ -3391,19 +3654,31 @@ module EDNGRAMMAR
               r5 = SyntaxNode.new(input, (index-1)...index) if r5 == true
               r0 = r5
             else
-              if has_terminal?(@regexps[gr = '\A[\\]-􏿿]'] ||= Regexp.new(gr), :regexp, index)
+              if has_terminal?(@regexps[gr = '\A[\\]-퟿]'] ||= Regexp.new(gr), :regexp, index)
                 r6 = true
                 @index += 1
               else
-                terminal_parse_failure('[\\]-􏿿]')
+                terminal_parse_failure('[\\]-퟿]')
                 r6 = nil
               end
               if r6
                 r6 = SyntaxNode.new(input, (index-1)...index) if r6 == true
                 r0 = r6
               else
-                @index = i0
-                r0 = nil
+                if has_terminal?(@regexps[gr = '\A[-􏿿]'] ||= Regexp.new(gr), :regexp, index)
+                  r7 = true
+                  @index += 1
+                else
+                  terminal_parse_failure('[-􏿿]')
+                  r7 = nil
+                end
+                if r7
+                  r7 = SyntaxNode.new(input, (index-1)...index) if r7 == true
+                  r0 = r7
+                else
+                  @index = i0
+                  r0 = nil
+                end
               end
             end
           end
@@ -3690,44 +3965,6 @@ module EDNGRAMMAR
     r0
   end
 
-  def _nt_ALPHA
-    start_index = index
-    if node_cache[:ALPHA].has_key?(index)
-      cached = node_cache[:ALPHA][index]
-      if cached
-        node_cache[:ALPHA][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
-        @index = cached.interval.end
-      end
-      return cached
-    end
-
-    i0 = index
-    if has_terminal?(@regexps[gr = '\A[A-Z]'] ||= Regexp.new(gr), :regexp, index)
-      r1 = true
-      @index += 1
-    else
-      terminal_parse_failure('[A-Z]')
-      r1 = nil
-    end
-    if r1
-      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
-      r0 = r1
-    else
-      r2 = _nt_lcalpha
-      if r2
-        r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
-        r0 = r2
-      else
-        @index = i0
-        r0 = nil
-      end
-    end
-
-    node_cache[:ALPHA][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.5
+  version: 0.0.7
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-26 00:00:00.000000000 Z
+date: 2023-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler