edn-abnf 0.3.4 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be3442eabfe91c73cff8572576b27a53fb84ac50e55e3063c883de6016b11a1a
-  data.tar.gz: 163f0500284e03ec64631fe608c2664b6450056b954d8d9a59b8531dad30274a
+  metadata.gz: 5fb3a21c21375974f9e6c3b1f708f002b00aaeaff85e72d430a836ce3e0fd2f7
+  data.tar.gz: fcfc55d388ed1b62ab3ecb4503764cc7eb87c6f984d8082c746705091ad38569
 SHA512:
-  metadata.gz: 514a619e123731703f5a8e126583c5d6ba6d501b25932dd049379f3328aba79f07be153df04a0a8aec7fd82f694dc60b57fb4d0d41e4f888a442ac74bbb2f563
-  data.tar.gz: 0cf73998452ca7f667003079252bd85c2a3f549eb33ec4a1b4a259be63b92e9cce9da01c738994cf99d0968d71845d737ef530abb2d157243106b72133050092
+  metadata.gz: 329bf4e226c07a53b9103a3f9ef58a70d9c2c539ceb5f50a47c80427362dd7d6b4877c4bb53d11da1c0ce811cdd3fda7296e5994e05822b4a706869760819c34
+  data.tar.gz: 659cc80dc2d1013c6f2176982205c159e0359036888b50152228c52e0e10148109288f88e716191e6a9eeb104e98ec1a610b00f53d7f1546b64d0a6919f56674

data/bin/edn-abnf

@@ -4,6 +4,7 @@ require 'pp'
 require 'yaml'
 require 'treetop'
 require 'json'
+require 'cbor-pretty'
 
 require_relative '../lib/edn-abnf.rb'
 
@@ -46,7 +47,9 @@ begin
     opts.on("-eEDN", "--e=EDN", "supply EDN on command line") do |v|
       $options.edn = v
     end
-    opts.on("-tFMT", "--to=FMT", [:basic, :neat, :json, :yaml, :edn, :diag], "Target format (default: diag)") do |v|
+    opts.on("-tFMT", "--to=FMT",
+            [:basic, :neat, :json, :yaml, :edn, :diag, :pretty],
+            "Target format (default: diag)") do |v|
       $options.target = v
     end
   end
@@ -137,6 +140,13 @@ when :yaml
   puts result.to_yaml
 when :edn, :diag, nil
   puts result.cbor_diagnostic
+when :pretty
+  enc = if CBOR::Sequence === result
+          result.to_cborseq
+        else
+          result.to_cbor
+        end
+  puts CBOR::pretty_seq(enc)
 else
   warn ["Unknown target format: ", $options.target].inspect
 end

data/edn-abnf.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "edn-abnf"
-  s.version = "0.3.4"
+  s.version = "0.3.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/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.4
+  version: 0.3.6
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-05 00:00:00.000000000 Z
+date: 2025-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler