edn-abnf 0.5.36 → 0.5.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 157806a4265773392a50ec9c5176afeab9230ed0dc099cf6ccff715bc7c4b40a
-  data.tar.gz: 431fdbcefd2390e1ecd12ca2d14054cccab591899a3f2c0cc2f3f88cc10ca59c
+  metadata.gz: e0f64289932889f6db2279a914988e7216a97977abaa03d7cf94ce185d7318c2
+  data.tar.gz: 619f9b5f1e029409c668eb5a43794523519f8a8789d69bc918264ab74f8cfe4f
 SHA512:
-  metadata.gz: 0f2452473677f916784c1460c7216259d9e1dee8ab8822a059ff0294b0f3092473558783afbcff441ba1d2ae7ea3be461f5222bdc651e4fa53ebb70a705afe75
-  data.tar.gz: 383d5417a02d35216bc4d5d609a2f99ce68c5dc36cc373dec34c32d63aaf1f5249438e014449975ba9183cbb4f1251ade30273335d06a5a78b55cff91b427059
+  metadata.gz: '05696d0f506625417e09b429819aee2c6905d6250b85f8e8df48b66922ccea56db6c5ecc0b6657bc383daa3c9170aa9b5b5c14bc59d32eab20d80f00ce8ad7fa'
+  data.tar.gz: dbdf3d08c3ad50af80f0285692fd655855419e38e88e0e6aab9561262fce195296f9c2c96465fd2a6fe8ad46df8f79f6478a28c1b54e7dfcb4c33e8bbe16f0f8

data/bin/edn-abnf

@@ -82,6 +82,25 @@ 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
@@ -93,7 +112,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

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.37"
   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

@@ -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}"

metadata

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