edn-abnf 0.4.1 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac4a0b1911b37bbabef257681aaeec94716aaac6b34f2719b3a33672bbeaef86
-  data.tar.gz: 6fd059837eac37459f8e18f5bfc921ef6ff10fc68a9dddc0e2d481b2a447b11b
+  metadata.gz: 4ddc4fd884d2eb5af3b0dd9b76ca452db54c42def393cd5d53867a70b98b4990
+  data.tar.gz: ba447dfe08051442194cfb9a991bd04ed6e7a9127b5c839ff85c7952d64bc430
 SHA512:
-  metadata.gz: e9c24d903f4b5e1bb7dfdef58f63c526d3f1c1ce445d27401e0db6b34829141b79b418f8ef769237b454d7e72d01dd0f931f895d229fdb59e5a9d8d808029200
-  data.tar.gz: 0cae09501f16449694856f6f152611b44c6d7b6153cb17a7f807f68f46b95658a0372031c10bb80aff0e9878bfe1d9d18bebec26873f24716635051e9c61ccb0
+  metadata.gz: cc8950aa2b619fc9482e030b12166f66a5cc091b73ba3802375bb80a8ab41b035a8b57e7c6a82ac785a7937fd4796aa824c47fd2933a47d25f5d434bb585450d
+  data.tar.gz: 410b389c142d948492492dbe37473b1fc78e91f8e057acf4276fc4a69a1d8b67edfc836ce86b563d6d006cc7239c7f97f6f090355dc58b2909a087471ddcb7a3

data/bin/edn-abnf

@@ -48,10 +48,19 @@ begin
       $options.edn = v
     end
     opts.on("-tFMT", "--to=FMT",
-            [:basic, :neat, :json, :yaml, :edn, :diag, :pretty],
+            [:basic, :neat, :json, :yaml, :edn, :diag, :pretty, :hex],
             "Target format (default: diag)") do |v|
       $options.target = v
     end
+    opts.on("-aAPP", "--app=APP", "Load application extension") do |v|
+      v.split(",") do |nm|
+        if nm =~ /\A[a-z][a-z0-9]*\z/
+          require "cbor-diagnostic-app/#{nm}"
+        else
+          raise ArgumentError.new("edn-abnf: app-extension name #{nm} not valid")
+        end
+      end
+    end
   end
   op.parse!
 rescue Exception => e
@@ -140,14 +149,18 @@ when :yaml
   puts result.to_yaml
 when :edn, :diag, nil
   puts result.cbor_diagnostic
-when :pretty
+when :pretty, :hex
   # XXX can't do Box yet
   enc = if CBOR::Sequence === result
           result.to_cborseq
         else
           result.to_cbor
         end
-  puts CBOR::pretty_seq(enc)
+  if $options.target == :pretty
+    puts CBOR::pretty_seq(enc)
+  else
+    puts enc.bytes.map{|x| "%02x" % x}.join
+  end
 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.4.1"
+  s.version = "0.5.1"
   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

@@ -1740,6 +1740,85 @@ module EDNGRAMMAR
     r0
   end
 
+  module AppSequence0
+    def app_prefix
+      elements[0]
+    end
+
+    def seq
+      elements[2]
+    end
+
+  end
+
+  module AppSequence1
+    def ast
+      args = seq.ast
+      app = app_prefix.text_value
+      # Find a better place to put a default initialization
+      EDNGRAMMAR.const_set(:APPS, Hash.new { |h, k|
+                             h[k] = begin ::CBOR_DIAG.const_get("App_#{k.downcase}")
+  
+                                    rescue NameError
+                                      raise ArgumentError, "cbor-diagnostic: Unknown application-oriented extension '#{k}'", caller
+                                    end
+                           }) unless ::EDNGRAMMAR.const_defined?(:APPS)
+      ::EDNGRAMMAR::APPS[app].decode(app, args)
+    end
+  end
+
+  def _nt_app_sequence
+    start_index = index
+    if node_cache[:app_sequence].has_key?(index)
+      cached = node_cache[:app_sequence][index]
+      if cached
+        node_cache[:app_sequence][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0, s0 = index, []
+    r1 = _nt_app_prefix
+    s0 << r1
+    if r1
+      if (match_len = has_terminal?("<<", false, index))
+        r2 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+        @index += match_len
+      else
+        terminal_parse_failure('"<<"')
+        r2 = nil
+      end
+      s0 << r2
+      if r2
+        r3 = _nt_seq
+        s0 << r3
+        if r3
+          if (match_len = has_terminal?(">>", false, index))
+            r4 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+            @index += match_len
+          else
+            terminal_parse_failure('">>"')
+            r4 = nil
+          end
+          s0 << r4
+        end
+      end
+    end
+    if s0.last
+      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+      r0.extend(AppSequence0)
+      r0.extend(AppSequence1)
+    else
+      @index = i0
+      r0 = nil
+    end
+
+    node_cache[:app_sequence][start_index] = r0
+
+    r0
+  end
+
   module Sqstr0
     def SQUOTE1
       elements[0]
@@ -1823,13 +1902,19 @@ module EDNGRAMMAR
         r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
         r0 = r2
       else
-        r3 = _nt_embedded
+        r3 = _nt_app_sequence
         if r3
           r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
           r0 = r3
         else
-          @index = i0
-          r0 = nil
+          r4 = _nt_embedded
+          if r4
+            r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
+            r0 = r4
+          else
+            @index = i0
+            r0 = nil
+          end
         end
       end
     end
@@ -5036,9 +5121,11 @@ module EDNGRAMMAR
     r0
   end
 
-end
 
-class EDNGRAMMARParser < Treetop::Runtime::CompiledParser
-  include EDNGRAMMAR
+  class Parser < Treetop::Runtime::CompiledParser
+    include EDNGRAMMAR
+  end
 end
 
+EDNGRAMMARParser = EDNGRAMMAR::Parser
+

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: edn-abnf
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.1
 platform: ruby
 authors:
 - Carsten Bormann
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-07 00:00:00.000000000 Z
+date: 2025-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -120,7 +119,6 @@ homepage: http://github.com/cabo/edn-abnf
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -135,8 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.14
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: CBOR Extended Diagnostic Notation (EDN) implemented in ABNF
 test_files: []