RubyGems - edn-abnf - Versions diffs - 0.1.3 → 0.1.5 - Mend

edn-abnf 0.1.3 → 0.1.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85b82b93fb1a2682e147c29fc1012e178c48f8eae6d60243a7d87abd82c15a3f
-  data.tar.gz: d87f8ca88bc659c58629540a5f7fdefab86c53b09662e64e0851dbaadb8525cd
+  metadata.gz: a595a62b037a2f01e97e65a81ded57ab06f7bb8644b13b154ec0cff3bc10024c
+  data.tar.gz: 9e08a40602ace456c0f354dd9c0faa377bfa5dc45e8f457210808d0933cb49ab
 SHA512:
-  metadata.gz: dc9cedb1fb36395595382a787268954d887bcf240a92379be884224dd383331750ebcbb3e97b6966364476cb26563357e9e15bc2f443936ee9d6cda6835ff77c
-  data.tar.gz: ae270987f189617657a5484824b44ef4468dfcd3911dc345492e0c2a56c9710af74086145fe55b5f4291c6373f5b0744a8c4ad4e637a426473a13866c189d042
+  metadata.gz: af634c12b0f15f52f1693e5ffc341bdb3c212cb162fbb34b912183d525069029a2c946a8b09143da497fda2726407d22f46e1ebce3f75bbe70550bceb6ac9566
+  data.tar.gz: d17d1bb4da4943e31d2670a21e05b7a0ce4f74bbb202e5732f7f93bef469301b4c600168e48615a4458cab1c7d84b60dcd7b9ba4bc331ef6ed7ff63cb84080a9

data/edn-abnf.gemspec CHANGED Viewed

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

@@ -576,14 +576,21 @@ module EDNGRAMMAR
   end
   module Decnumber3
+  end
+  module Decnumber4
+  end
+  module Decnumber5
     def ast
-      ip = elements[0].text_value + elements[1].text_value
-      dp = elements[2].text_value
-      ep = elements[3].text_value
-      if dp.empty? && ep.empty?
-        ip.to_i
+      tv = text_value
+      if /[.e]/i =~ tv
+        sp = elements[0].text_value
+        mp = elements[1].text_value.sub(/\A\./, "0.").sub(/\.\z/, ".0")
+        ep = elements[2].text_value
+        (sp + mp + ep).to_f
       else
-        (ip + dp + ep).to_f
+        tv.to_i
       end
     end
   end
@@ -608,120 +615,171 @@ module EDNGRAMMAR
     end
     s0 << r1
     if r1
-      s3, i3 = [], index
+      i3 = index
+      i4, s4 = index, []
+      s5, i5 = [], index
       loop do
-        r4 = _nt_DIGIT
-        if r4
-          s3 << r4
+        r6 = _nt_DIGIT
+        if r6
+          s5 << r6
         else
           break
         end
       end
-      if s3.empty?
-        @index = i3
-        r3 = nil
+      if s5.empty?
+        @index = i5
+        r5 = nil
       else
-        r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
+        r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
       end
-      s0 << r3
-      if r3
-        i6, s6 = index, []
+      s4 << r5
+      if r5
+        i8, s8 = index, []
         if (match_len = has_terminal?(".", false, index))
-          r7 = true
+          r9 = true
           @index += match_len
         else
           terminal_parse_failure('"."')
-          r7 = nil
+          r9 = nil
+        end
+        s8 << r9
+        if r9
+          s10, i10 = [], index
+          loop do
+            r11 = _nt_DIGIT
+            if r11
+              s10 << r11
+            else
+              break
+            end
+          end
+          r10 = instantiate_node(SyntaxNode,input, i10...index, s10)
+          s8 << r10
+        end
+        if s8.last
+          r8 = instantiate_node(SyntaxNode,input, i8...index, s8)
+          r8.extend(Decnumber0)
+        else
+          @index = i8
+          r8 = nil
+        end
+        if r8
+          r7 = r8
+        else
+          r7 = instantiate_node(SyntaxNode,input, index...index)
+        end
+        s4 << r7
+      end
+      if s4.last
+        r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
+        r4.extend(Decnumber1)
+      else
+        @index = i4
+        r4 = nil
+      end
+      if r4
+        r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
+        r3 = r4
+      else
+        i12, s12 = index, []
+        if (match_len = has_terminal?(".", false, index))
+          r13 = true
+          @index += match_len
+        else
+          terminal_parse_failure('"."')
+          r13 = nil
         end
-        s6 << r7
-        if r7
-          s8, i8 = [], index
+        s12 << r13
+        if r13
+          s14, i14 = [], index
           loop do
-            r9 = _nt_DIGIT
-            if r9
-              s8 << r9
+            r15 = _nt_DIGIT
+            if r15
+              s14 << r15
             else
               break
             end
           end
-          if s8.empty?
-            @index = i8
-            r8 = nil
+          if s14.empty?
+            @index = i14
+            r14 = nil
           else
-            r8 = instantiate_node(SyntaxNode,input, i8...index, s8)
+            r14 = instantiate_node(SyntaxNode,input, i14...index, s14)
           end
-          s6 << r8
+          s12 << r14
         end
-        if s6.last
-          r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
-          r6.extend(Decnumber0)
+        if s12.last
+          r12 = instantiate_node(SyntaxNode,input, i12...index, s12)
+          r12.extend(Decnumber2)
         else
-          @index = i6
-          r6 = nil
+          @index = i12
+          r12 = nil
         end
-        if r6
-          r5 = r6
+        if r12
+          r12 = SyntaxNode.new(input, (index-1)...index) if r12 == true
+          r3 = r12
         else
-          r5 = instantiate_node(SyntaxNode,input, index...index)
+          @index = i3
+          r3 = nil
         end
-        s0 << r5
-        if r5
-          i11, s11 = index, []
-          if (match_len = has_terminal?("e", :insens, index))
-            r12 = instantiate_node(SyntaxNode,input, index...(index + match_len))
-            @index += match_len
+      end
+      s0 << r3
+      if r3
+        i17, s17 = index, []
+        if (match_len = has_terminal?("e", :insens, index))
+          r18 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+          @index += match_len
+        else
+          terminal_parse_failure('"e"')
+          r18 = nil
+        end
+        s17 << r18
+        if r18
+          r20 = _nt_sign
+          if r20
+            r19 = r20
           else
-            terminal_parse_failure('"e"')
-            r12 = nil
+            r19 = instantiate_node(SyntaxNode,input, index...index)
           end
-          s11 << r12
-          if r12
-            r14 = _nt_sign
-            if r14
-              r13 = r14
-            else
-              r13 = instantiate_node(SyntaxNode,input, index...index)
-            end
-            s11 << r13
-            if r13
-              s15, i15 = [], index
-              loop do
-                r16 = _nt_DIGIT
-                if r16
-                  s15 << r16
-                else
-                  break
-                end
-              end
-              if s15.empty?
-                @index = i15
-                r15 = nil
+          s17 << r19
+          if r19
+            s21, i21 = [], index
+            loop do
+              r22 = _nt_DIGIT
+              if r22
+                s21 << r22
               else
-                r15 = instantiate_node(SyntaxNode,input, i15...index, s15)
+                break
               end
-              s11 << r15
             end
+            if s21.empty?
+              @index = i21
+              r21 = nil
+            else
+              r21 = instantiate_node(SyntaxNode,input, i21...index, s21)
+            end
+            s17 << r21
           end
-          if s11.last
-            r11 = instantiate_node(SyntaxNode,input, i11...index, s11)
-            r11.extend(Decnumber1)
-          else
-            @index = i11
-            r11 = nil
-          end
-          if r11
-            r10 = r11
-          else
-            r10 = instantiate_node(SyntaxNode,input, index...index)
-          end
-          s0 << r10
         end
+        if s17.last
+          r17 = instantiate_node(SyntaxNode,input, i17...index, s17)
+          r17.extend(Decnumber3)
+        else
+          @index = i17
+          r17 = nil
+        end
+        if r17
+          r16 = r17
+        else
+          r16 = instantiate_node(SyntaxNode,input, index...index)
+        end
+        s0 << r16
       end
     end
     if s0.last
       r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-      r0.extend(Decnumber2)
-      r0.extend(Decnumber3)
+      r0.extend(Decnumber4)
+      r0.extend(Decnumber5)
     else
       @index = i0
       r0 = nil
@@ -751,7 +809,10 @@ module EDNGRAMMAR
   end
   module Basenumber6
-    def ast; /p/i =~ text_value ? Float(text_value) : Integer(text_value) 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
@@ -831,12 +892,7 @@ module EDNGRAMMAR
                   break
                 end
               end
-              if s14.empty?
-                @index = i14
-                r14 = nil
-              else
-                r14 = instantiate_node(SyntaxNode,input, i14...index, s14)
-              end
+              r14 = instantiate_node(SyntaxNode,input, i14...index, s14)
               s12 << r14
             end
             if s12.last
@@ -879,7 +935,12 @@ module EDNGRAMMAR
                       break
                     end
                   end
-                  r19 = instantiate_node(SyntaxNode,input, i19...index, s19)
+                  if s19.empty?
+                    @index = i19
+                    r19 = nil
+                  else
+                    r19 = instantiate_node(SyntaxNode,input, i19...index, s19)
+                  end
                   s10 << r19
                 end
               end
@@ -911,31 +972,78 @@ module EDNGRAMMAR
           r4 = r5
         else
           i21, s21 = index, []
-          if (match_len = has_terminal?("o", :insens, index))
+          if (match_len = has_terminal?("x", :insens, index))
             r22 = instantiate_node(SyntaxNode,input, index...(index + match_len))
             @index += match_len
           else
-            terminal_parse_failure('"o"')
+            terminal_parse_failure('"x"')
             r22 = nil
           end
           s21 << r22
           if r22
-            s23, i23 = [], index
-            loop do
-              r24 = _nt_ODIGIT
-              if r24
-                s23 << r24
-              else
-                break
-              end
-            end
-            if s23.empty?
-              @index = i23
-              r23 = nil
+            if (match_len = has_terminal?(".", false, index))
+              r23 = true
+              @index += match_len
             else
-              r23 = instantiate_node(SyntaxNode,input, i23...index, s23)
+              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
+              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
+              end
+            end
           end
           if s21.last
             r21 = instantiate_node(SyntaxNode,input, i21...index, s21)
@@ -948,46 +1056,85 @@ module EDNGRAMMAR
             r21 = SyntaxNode.new(input, (index-1)...index) if r21 == true
             r4 = r21
           else
-            i25, s25 = index, []
-            if (match_len = has_terminal?("b", :insens, index))
-              r26 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+            i31, s31 = index, []
+            if (match_len = has_terminal?("o", :insens, index))
+              r32 = instantiate_node(SyntaxNode,input, index...(index + match_len))
               @index += match_len
             else
-              terminal_parse_failure('"b"')
-              r26 = nil
+              terminal_parse_failure('"o"')
+              r32 = nil
             end
-            s25 << r26
-            if r26
-              s27, i27 = [], index
+            s31 << r32
+            if r32
+              s33, i33 = [], index
               loop do
-                r28 = _nt_BDIGIT
-                if r28
-                  s27 << r28
+                r34 = _nt_ODIGIT
+                if r34
+                  s33 << r34
                 else
                   break
                 end
               end
-              if s27.empty?
-                @index = i27
-                r27 = nil
+              if s33.empty?
+                @index = i33
+                r33 = nil
               else
-                r27 = instantiate_node(SyntaxNode,input, i27...index, s27)
+                r33 = instantiate_node(SyntaxNode,input, i33...index, s33)
               end
-              s25 << r27
+              s31 << r33
             end
-            if s25.last
-              r25 = instantiate_node(SyntaxNode,input, i25...index, s25)
-              r25.extend(Basenumber4)
+            if s31.last
+              r31 = instantiate_node(SyntaxNode,input, i31...index, s31)
+              r31.extend(Basenumber4)
             else
-              @index = i25
-              r25 = nil
+              @index = i31
+              r31 = nil
             end
-            if r25
-              r25 = SyntaxNode.new(input, (index-1)...index) if r25 == true
-              r4 = r25
+            if r31
+              r31 = SyntaxNode.new(input, (index-1)...index) if r31 == true
+              r4 = r31
             else
-              @index = i4
-              r4 = nil
+              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)
+              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
+              end
             end
           end
         end
@@ -996,8 +1143,8 @@ module EDNGRAMMAR
     end
     if s0.last
       r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-      r0.extend(Basenumber5)
       r0.extend(Basenumber6)
+      r0.extend(Basenumber7)
     else
       @index = i0
       r0 = nil

metadata CHANGED Viewed

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