edn-abnf 0.5.36 → 0.5.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 157806a4265773392a50ec9c5176afeab9230ed0dc099cf6ccff715bc7c4b40a
-  data.tar.gz: 431fdbcefd2390e1ecd12ca2d14054cccab591899a3f2c0cc2f3f88cc10ca59c
+  metadata.gz: 66e20181db646536c0fa4eabd1527ba580085825de03eb89e0e26f4437e215ed
+  data.tar.gz: 15e82108df4dede7ab0dc29bebbfc7c6fc5e6e028a3a16de86615d3691c6db9d
 SHA512:
-  metadata.gz: 0f2452473677f916784c1460c7216259d9e1dee8ab8822a059ff0294b0f3092473558783afbcff441ba1d2ae7ea3be461f5222bdc651e4fa53ebb70a705afe75
-  data.tar.gz: 383d5417a02d35216bc4d5d609a2f99ce68c5dc36cc373dec34c32d63aaf1f5249438e014449975ba9183cbb4f1251ade30273335d06a5a78b55cff91b427059
+  metadata.gz: a95ef3f7c9c857cdbff5b6d1e60854fc6c268afc3d98052c3f236686505cd10b62e6e52e8f320b35b0514039b0e77d1fb3ab09f4bc561dd4741654970fa1d4b0
+  data.tar.gz: 72ba10c6341a342dc2b19030fb0d0993094564fc398c24ec8673911ce9453eca0950e7a954829c413c348e71625481038612025a3a34cc506d346e99580b0776

data/bin/edn-abnf

@@ -82,9 +82,31 @@ begin
         end
       end
     end
+    opts.on("-AAPP", "--app-later=APP", "Handle application extension later") do |v|
+      v.split(",") do |nm|
+        if nm =~ /\A[a-z][a-z0-9]*\z/
+          code = <<-RUBY
+            class CBOR_DIAG::App_#{nm}
+              def self.decode(app_prefix, s)
+                CBOR::Tagged.new(999, [app_prefix, s])
+              end
+            end
+          RUBY
+          eval(code, TOPLEVEL_BINDING, "(app-extension #{nm})")
+        else
+          raise ArgumentError.new("edn-abnf: app-extension name #{nm} not supported")
+        end
+      end
+    end
+    opts.on("--[no-]app-now", "Handle postponed application extensions now") do |v|
+      $options.app_now = v
+    end
     opts.on("-f", "--[no-]fallback", "use tag 999 for unknown app-extensions") do |v|
       $options.fallback = v
     end
+    opts.on("-b", "--[no-]brace", "retry parsind with braces around added") do |v|
+      $options.brace = v
+    end
     opts.on("-wCOL", "--wrap=COL", Integer, "EDN: wrap at column COL") do |v|
       $options.wrap = v
     end
@@ -93,7 +115,11 @@ begin
     end
   end
   op.parse!
+rescue LoadError => e
+  warn "Unsupported application extension '#{e.message.split('/')[1]}'"
+  exit 1
 rescue Exception => e
+  warn e.inspect unless e.to_s == 'exit'
   warn op unless e.to_s == 'exit'
   exit 1
 end
@@ -177,7 +203,15 @@ begin
   if $options.cbor
     result = CBOR.decode(edn_file)
   else
-    edn = EDN.from_edn(edn_file)
+    if $options.brace
+      begin
+        edn = EDN.from_edn(edn_file)
+      rescue ArgumentError # Parse error
+        edn = EDN.from_edn("{\n" + edn_file + "}\n")
+      end
+    else
+      edn = EDN.from_edn(edn_file)
+    end
     result = edn.tree               # XXX .tree?
   end
 rescue CBOR_DIAG::AppParseError, ArgumentError => e

data/edn-abnf.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "edn-abnf"
-  s.version = "0.5.36"
+  s.version = "0.5.38"
   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-diag-support.rb

@@ -64,6 +64,8 @@ module CBOR
   end
 
   class Xbox < Box
+    def encoding; value.encoding end
+    def size; value.size end
     def to_cbor
       enc = CBOR.encode(value)
       if ei = options[:ei]

data/lib/parser/edngrammar.rb

@@ -1802,7 +1802,14 @@ module EDNGRAMMAR
 
   module Tagged1
     def ast
-      val = CBOR::Tagged.new(uint.text_value.to_i, item.ast)
+      tagnum = uint.text_value.to_i
+      tagval = item.ast
+      if tagnum == 999 && $options.app_now
+        app, args = tagval
+        val = ::EDNGRAMMAR::APPS[app].decode(app, *args)
+      else
+        val = CBOR::Tagged.new(tagnum, tagval)
+      end
       if ei = spec.text_value[1..-1]
         val = CBOR::Box.from_instance(val, {ei: ei})
         # warn "*** implementing encoding indicator #{ei.inspect} after tag number #{uint.text_value}"
@@ -4785,7 +4792,12 @@ module EDNGRAMMAR
       unless Set[*strings.map(&:encoding)].size == 1
         warn "*** mixed streamstring #{strings.cbor_diagnostic}"
       end
-      strings.join.cbor_stream!(strings.map(&:size))
+      strings.each do |s|
+        if CBOR::Xbox === s && (ei = s.options[:ei])
+          warn "*** unimplemented encoding indicator #{ei.inspect} for #{s.inspect}"
+        end
+      end
+      strings.join.cbor_stream!(strings.map(&:size)) # XXX loses EI
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: edn-abnf
 version: !ruby/object:Gem::Version
-  version: 0.5.36
+  version: 0.5.38
 platform: ruby
 authors:
 - Carsten Bormann