edn-abnf 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 122c595b8bcc114dd460241dc52dbee57962508d969a9ac56b712c8c183c6838
-  data.tar.gz: 19c2c5dc9508495f8757b5497f8090a244f41f1d6798195c0b2cce65a2b057d4
+  metadata.gz: 4a6d50c20324f9915e90cb313aae08cb443bc60102e99eab1c40bd64744371d2
+  data.tar.gz: 4a90a0f27bc2fdb1827a0537a68bdd9a97968945aef23dc8fb94ba379719c4ef
 SHA512:
-  metadata.gz: 67ead5d54e2fb18292a07c2e6a52b7cedbc3d92e3d4325c9dfaacb3d14d3d61158353d32ea0c6e15ebb1f200b2033191afcb21643f168e7fbcb538bc6facbe18
-  data.tar.gz: 68d8e92c4a4764993e6132d777670bea452eeeabd39001ac3b81608e98a0e8bb0d9f0d1ff4997658adedac362174539b81bc315f8ccdb67a6239f86589b299a5
+  metadata.gz: cddfcc37da78d059dd33d771ec1759d19be1111512335c5a89fafc50402249ee9755197aed94628b2c5b7469e7b765f661ce0f26ba9c914e5665daa9efd8f9b8
+  data.tar.gz: 1bf62702cbb69f420832f24ec82cf42db7f13c15179adf519899aa2e2f655e0ea1d4f9250051c8305e7cf955421b37169a2bd147ead874f123ab470dc9abf4cc

data/edn-abnf.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "edn-abnf"
-  s.version = "0.1.4"
+  s.version = "0.1.6"
   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/cbor-diagnostic-app/hgrammar.rb

@@ -80,8 +80,8 @@ module HGRAMMAR
           curr = [el]
         end
       }
-      if out.size == 0 && String === curr[0]
-        curr.join # unpack_thread(curr)
+      if out.size == 0 && (curr.size == 0 || String === curr[0])
+        curr.join.b # unpack_thread(curr)
       else
         CBOR::Tagged.new(888, (out << curr).map {|x| unpack_thread(x)})
       end

data/lib/parser/edngrammar.rb

@@ -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
-        s6 << r7
-        if r7
-          s8, i8 = [], index
+        s8 << r9
+        if r9
+          s10, i10 = [], index
           loop do
-            r9 = _nt_DIGIT
-            if r9
-              s8 << r9
+            r11 = _nt_DIGIT
+            if r11
+              s10 << r11
             else
               break
             end
           end
-          if s8.empty?
-            @index = i8
-            r8 = nil
+          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
+        s12 << r13
+        if r13
+          s14, i14 = [], index
+          loop do
+            r15 = _nt_DIGIT
+            if r15
+              s14 << r15
+            else
+              break
+            end
+          end
+          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
@@ -916,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)
@@ -953,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
@@ -1001,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

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edn-abnf
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-27 00:00:00.000000000 Z
+date: 2024-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.4
 signing_key:
 specification_version: 4
 summary: CBOR Extended Diagnostic Notation (EDN) implemented in ABNF