edn-abnf 0.5.4 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 922ecd2d704ac04d4e5528eb69a1f0db417783db1919f4da4defb1292639b4bb
-  data.tar.gz: bd1cc06141be181acd59f63b15496c390dd9f6e522fc8586f7f92a6b43a8f34e
+  metadata.gz: 3af63aa900f9f717d9f2d2a50a15ee315d7e6c08c6c1a25cf774b4ee2d9b1582
+  data.tar.gz: a3e7fccd19e0b3ce9858d023dc1217c65b624be46a88561078b32c9a3f626a9f
 SHA512:
-  metadata.gz: 85e253915ca89b58db123872902d38c208064d4f71b808381129ac6b177e3d603d1731dc86721b224388a9ab1de76af113dca1ce75147c84353ca14bdc1f310f
-  data.tar.gz: 78885798497255c6530f96fd048fb2f48fcbe4d6cadceaee2c8b8aa117a460bdba9041d6473a08382323d1fb1f2a084a75ac613df5eb3ead22322419336c32c9
+  metadata.gz: 9a1c93950df83082da957bfeb9b3989981615d15c48100af5f01682532496d93d5191e5ce435b0c747c7107c86a3d9cc072e3c4f6d08296ccfa6431d42d38322
+  data.tar.gz: 7f3feae2f8db35a1206527a8b4142dfa7f28e276a85b0cad8f1b931a8c3e713a622f6dd6b3e2f35d05a0e6e6db79225eb33f387e51f364e317b80ca0f67fe76a

data/bin/edn-abnf

@@ -34,6 +34,8 @@ require 'ostruct'
 
 $error = 0
 
+output_formats = [:basic, :neat, :json, :yaml, :edn, :diag, :pretty, :hex, :cbor]
+
 $options = OpenStruct.new
 begin
   op = OptionParser.new do |opts|
@@ -46,12 +48,15 @@ begin
       require 'csv'
       $options.lines = v
     end
+    opts.on("-i", "--[no-]integrated", "use integrated parsers where available") do |v|
+      $options.integrated = v
+    end
     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, :pretty, :hex],
-            "Target format (default: diag)") do |v|
+            output_formats,
+            "Target format (#{output_formats.join("/")}, default: diag)") do |v|
       $options.target = v
     end
     opts.on("-aAPP", "--app=APP", "Load application extension") do |v|
@@ -162,17 +167,23 @@ when :yaml
   puts result.to_yaml
 when :edn, :diag, nil
   puts result.cbor_diagnostic
-when :pretty, :hex
+when :pretty, :hex, :cbor
   # XXX can't do Box yet
   enc = if CBOR::Sequence === result
           result.to_cborseq
         else
           result.to_cbor
         end
-  if $options.target == :pretty
+  case $options.target
+  when :pretty
     puts CBOR::pretty_seq(enc)
-  else
+  when :hex
     puts enc.bytes.map{|x| "%02x" % x}.join
+  when :cbor
+    $stdout.binmode
+    print enc
+  else
+    fail "Cannot happen"
   end
 else
   warn ["Unknown target format: ", $options.target].inspect

data/edn-abnf.gemspec

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

@@ -1865,6 +1865,28 @@ module EDNGRAMMAR
     r0
   end
 
+  module Bstr0
+    def sq_app_string_h
+      elements[0]
+    end
+
+  end
+
+  module Bstr1
+    def ast; elements[0].ast end
+  end
+
+  module Bstr2
+    def sq_app_string_b64
+      elements[0]
+    end
+
+  end
+
+  module Bstr3
+    def ast; elements[0].ast end
+  end
+
   def _nt_bstr
     start_index = index
     if node_cache[:bstr].has_key?(index)
@@ -1877,35 +1899,85 @@ module EDNGRAMMAR
     end
 
     i0 = index
-    r1 = _nt_sq_app_string_h
+    i1, s1 = index, []
+    r2 = _nt_sq_app_string_h
+    s1 << r2
+    if r2
+      i3 = index
+      r4 = lambda {|x|$options.integrated}.call(s1)
+      if !r4
+        terminal_parse_failure("<semantic predicate>")
+      end
+      if r4
+        @index = i3
+        r3 = instantiate_node(SyntaxNode,input, index...index)
+      else
+        @index = i3
+        r3 = nil
+      end
+      s1 << r3
+    end
+    if s1.last
+      r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
+      r1.extend(Bstr0)
+      r1.extend(Bstr1)
+    else
+      @index = i1
+      r1 = nil
+    end
     if r1
       r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
       r0 = r1
     else
-      r2 = _nt_sq_app_string_b64
-      if r2
-        r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
-        r0 = r2
+      i5, s5 = index, []
+      r6 = _nt_sq_app_string_b64
+      s5 << r6
+      if r6
+        i7 = index
+        r8 = lambda {|x|$options.integrated}.call(s5)
+        if !r8
+          terminal_parse_failure("<semantic predicate>")
+        end
+        if r8
+          @index = i7
+          r7 = instantiate_node(SyntaxNode,input, index...index)
+        else
+          @index = i7
+          r7 = nil
+        end
+        s5 << r7
+      end
+      if s5.last
+        r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
+        r5.extend(Bstr2)
+        r5.extend(Bstr3)
       else
-        r3 = _nt_app_string
-        if r3
-          r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
-          r0 = r3
+        @index = i5
+        r5 = nil
+      end
+      if r5
+        r5 = SyntaxNode.new(input, (index-1)...index) if r5 == true
+        r0 = r5
+      else
+        r9 = _nt_app_string
+        if r9
+          r9 = SyntaxNode.new(input, (index-1)...index) if r9 == true
+          r0 = r9
         else
-          r4 = _nt_sqstr
-          if r4
-            r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
-            r0 = r4
+          r10 = _nt_sqstr
+          if r10
+            r10 = SyntaxNode.new(input, (index-1)...index) if r10 == true
+            r0 = r10
           else
-            r5 = _nt_app_sequence
-            if r5
-              r5 = SyntaxNode.new(input, (index-1)...index) if r5 == true
-              r0 = r5
+            r11 = _nt_app_sequence
+            if r11
+              r11 = SyntaxNode.new(input, (index-1)...index) if r11 == true
+              r0 = r11
             else
-              r6 = _nt_embedded
-              if r6
-                r6 = SyntaxNode.new(input, (index-1)...index) if r6 == true
-                r0 = r6
+              r12 = _nt_embedded
+              if r12
+                r12 = SyntaxNode.new(input, (index-1)...index) if r12 == true
+                r0 = r12
               else
                 @index = i0
                 r0 = nil
@@ -5913,7 +5985,7 @@ module EDNGRAMMAR
       r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
       r0 = r1
     else
-      r2 = _nt_lcalpha
+      r2 = _nt_ALPHA
       if r2
         r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
         r0 = r2
@@ -5923,14 +5995,8 @@ module EDNGRAMMAR
           r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
           r0 = r3
         else
-          r4 = _nt_ucalpha
-          if r4
-            r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
-            r0 = r4
-          else
-            @index = i0
-            r0 = nil
-          end
+          @index = i0
+          r0 = nil
         end
       end
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: edn-abnf
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.6
 platform: ruby
 authors:
 - Carsten Bormann
 bindir: bin
 cert_chain: []
-date: 2025-04-29 00:00:00.000000000 Z
+date: 2025-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler