edn-abnf 0.3.3 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7e57901f15e144386956e94dd3aaa6b808786e4d41b7ff5b5c1c5bc54c0df35
-  data.tar.gz: 35f7b7e937487e76f4f5f21ee265346099274eb62e87675912c28a49b57a68b1
+  metadata.gz: f27ae567e340f8f491fd48f61ffcf98080e5a7e25f73e48178ba716382976232
+  data.tar.gz: 911714cd26c0f5fc215d75bf29f95bb17bb8f7e20b1c89897e2bbdc919047366
 SHA512:
-  metadata.gz: aeba40ba7ed1e0c9e19da2b10e236fce5d15b1cead0c128050c9b40b0500787a0377126d83f413582bdc04199534b58830dd105ed3bb4944c57d8ba90ce808e3
-  data.tar.gz: c5cca7b60d9059f98956d1aa18eae7a039d5de44e623e296d59019d27ded411063eb9dc584f6e82391d7b0d1b20206e789dd62694e95c4827b3179138742a99c
+  metadata.gz: adf381d82f725bbcf8f2fcc67bdcf57d999ba236bc6d3f4aae062cc85c0c189770662bb38916134a4e0d5d7a73ed1fa1e0a604cfe39f9f0f29ca34a4102e423b
+  data.tar.gz: 4edde63c1bd6aac32b14d3c5bf118e43e8d26dd77cc7e4653ec5304699e6341b7e885e96b4afeb7dce3c8f628d07d2f405a85fff24aaa7dfc5324271264c42b3

data/edn-abnf.gemspec

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

@@ -13,10 +13,10 @@ class CBOR_DIAG::App_dt
     if !ast
       raise ArgumentError, "cbor-diagnostic: Parse Error in dt'#{s}':\n" << EDN.reason(parser, s)
     end
-    # ast.ast
+    frac = ast.has_frac != ""
 
     t = Time.iso8601(s)
-    tv = if t.subsec != 0
+    tv = if frac # t.subsec != 0
       t.to_f
     else
       t.to_i

data/lib/cbor-diagnostic-app/dtgrammar.rb

@@ -443,6 +443,10 @@ module DTGRAMMAR
 
   end
 
+  module PartialTime1
+    def has_frac; elements[5].text_value end
+  end
+
   def _nt_partial_time
     start_index = index
     if node_cache[:partial_time].has_key?(index)
@@ -497,6 +501,7 @@ module DTGRAMMAR
     if s0.last
       r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
       r0.extend(PartialTime0)
+      r0.extend(PartialTime1)
     else
       @index = i0
       r0 = nil
@@ -586,6 +591,10 @@ module DTGRAMMAR
     end
   end
 
+  module FullTime1
+    def has_frac; partial_time.has_frac end
+  end
+
   def _nt_full_time
     start_index = index
     if node_cache[:full_time].has_key?(index)
@@ -607,6 +616,7 @@ module DTGRAMMAR
     if s0.last
       r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
       r0.extend(FullTime0)
+      r0.extend(FullTime1)
     else
       @index = i0
       r0 = nil
@@ -627,6 +637,10 @@ module DTGRAMMAR
     end
   end
 
+  module DateTime1
+    def has_frac; full_time.has_frac end
+  end
+
   def _nt_date_time
     start_index = index
     if node_cache[:date_time].has_key?(index)
@@ -658,6 +672,7 @@ module DTGRAMMAR
     if s0.last
       r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
       r0.extend(DateTime0)
+      r0.extend(DateTime1)
     else
       @index = i0
       r0 = nil

data/lib/parser/edngrammar.rb

@@ -1757,6 +1757,13 @@ module EDNGRAMMAR
   end
 
   module Sqstr0
+    def SQUOTE1
+      elements[0]
+    end
+
+    def SQUOTE2
+      elements[2]
+    end
   end
 
   module Sqstr1
@@ -1777,13 +1784,7 @@ module EDNGRAMMAR
     end
 
     i0, s0 = index, []
-    if (match_len = has_terminal?("'", false, index))
-      r1 = true
-      @index += match_len
-    else
-      terminal_parse_failure('"\'"')
-      r1 = nil
-    end
+    r1 = _nt_SQUOTE
     s0 << r1
     if r1
       s2, i2 = [], index
@@ -1798,13 +1799,7 @@ module EDNGRAMMAR
       r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
       s0 << r2
       if r2
-        if (match_len = has_terminal?("'", false, index))
-          r4 = true
-          @index += match_len
-        else
-          terminal_parse_failure('"\'"')
-          r4 = nil
-        end
+        r4 = _nt_SQUOTE
         s0 << r4
       end
     end
@@ -3067,14 +3062,9 @@ module EDNGRAMMAR
       r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
       r0 = r1
     else
-      if (match_len = has_terminal?("'", false, index))
-        r2 = instantiate_node(SyntaxNode,input, index...(index + match_len))
-        r2.extend(DoubleQuoted1)
-        @index += match_len
-      else
-        terminal_parse_failure('"\'"')
-        r2 = nil
-      end
+      r2 = _nt_SQUOTE
+      r2.extend(DoubleQuoted1)
+      r2.extend(DoubleQuoted1)
       if r2
         r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
         r0 = r2
@@ -3150,6 +3140,9 @@ module EDNGRAMMAR
   end
 
   module SingleQuoted2
+    def SQUOTE
+      elements[1]
+    end
   end
 
   module SingleQuoted3
@@ -3202,13 +3195,7 @@ module EDNGRAMMAR
         end
         s3 << r4
         if r4
-          if (match_len = has_terminal?("'", false, index))
-            r5 = true
-            @index += match_len
-          else
-            terminal_parse_failure('"\'"')
-            r5 = nil
-          end
+          r5 = _nt_SQUOTE
           s3 << r5
         end
         if s3.last
@@ -4319,6 +4306,30 @@ module EDNGRAMMAR
     r0
   end
 
+  def _nt_SQUOTE
+    start_index = index
+    if node_cache[:SQUOTE].has_key?(index)
+      cached = node_cache[:SQUOTE][index]
+      if cached
+        node_cache[:SQUOTE][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    if (match_len = has_terminal?("'", false, index))
+      r0 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+      @index += match_len
+    else
+      terminal_parse_failure('"\'"')
+      r0 = nil
+    end
+
+    node_cache[:SQUOTE][start_index] = r0
+
+    r0
+  end
+
   def _nt_DIGIT
     start_index = index
     if node_cache[:DIGIT].has_key?(index)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edn-abnf
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.5
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-28 00:00:00.000000000 Z
+date: 2025-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler