edn-abnf 0.4.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a8d8e0005557dfe97a3bafed94b9d9f9248694c28268527d0d5adbb225b211d
-  data.tar.gz: 1b0fcd3b150766dc00ac0e1ec720657dbbce38b75bf92946f5f5b7940187ea28
+  metadata.gz: 993acf6aae5ce078aec90f346fa8a0a313b33d3af4ef16661fdc6c3d31def17c
+  data.tar.gz: a8504ae9093db0b806ecaec245a8ddee7d9cdabbdace99e12ee9e7240ea35fbe
 SHA512:
-  metadata.gz: cbdc0c754d07d90efab6af82a8c8545163a40709b454af44a8dfda2c6c065c6c72a298361b4292a6b309fd1fbfb986ebac6bbbf674e7c8c68e7f5143ec947f0e
-  data.tar.gz: f5c31c0a84d80d81da93d6c3a04c7e3e2b3c6082fcd1eaaf7053a1558054b9ebd5e66249872dd4bd7d4b8009e67012d7e796cfaaecd31eb1bf015b1d89033390
+  metadata.gz: 41632492c3f64d9bec1f80db81318d7b0efa35fd9f57e2e12e5bb3f57ced8877a7bb453f1d9d8fd3aea7bb6cd40a95a35ae205f21ec89fa6ebe47a5d01b6daf0
+  data.tar.gz: e0ecb22948210d10f00782f94d4e558b3acdd1f9c63625643cffaad17f8b02e1863d1578e13f5b67ca0abcfa44c0f41f951ed622a86033aaf9aa2dd6942bf63b

data/bin/edn-abnf

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# coding: utf-8-hfs
+# coding: utf-8
 require 'pp'
 require 'yaml'
 require 'treetop'
@@ -32,6 +32,8 @@ Encoding.default_external = Encoding::UTF_8
 require 'optparse'
 require 'ostruct'
 
+$error = 0
+
 $options = OpenStruct.new
 begin
   op = OptionParser.new do |opts|
@@ -52,6 +54,15 @@ begin
             "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
@@ -91,6 +102,7 @@ if $options.lines
         else
           puts "** x / #{ednin.inspect} / #{out} ≠ #{result_diag.inspect} / #{result_hex}"
         end
+        $error += 1
       end
       next
     end
@@ -101,17 +113,20 @@ if $options.lines
       diag = result.cbor_diagnostic
       if out == diag && !ok
           puts "** ≠ / #{diag.inspect} / #{out.inspect}"
+          $error += 1
       end
       if out != diag && ok
         outdiag = tree_from_edn_possibly_hex(out || "").cbor_diagnostic
         if outdiag != diag
           puts "** ≡ / #{ednin.inspect} #{diag.inspect} / #{out.inspect} #{outdiag.inspect}"
+          $error += 1
         end
         puts "reparsed / #{diag.inspect} / #{out.inspect}" if $options.verbose
       end
     rescue ArgumentError => e
       if ok
         puts "** #{e} / #{result.inspect} / #{out.inspect}"
+        $error += 1
       else
         if $options.verbose
           puts "expected failure #{e}"
@@ -119,7 +134,14 @@ if $options.lines
       end
     end
   end
-  exit
+  if $error > 0
+    puts
+    puts "*** #$error errors!"
+    puts
+    exit 1
+  else
+    exit
+  end
 end
 
 begin

data/edn-abnf.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "edn-abnf"
-  s.version = "0.4.2"
+  s.version = "0.5.3"
   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/edn-util.rb

@@ -5,6 +5,15 @@ end
 require 'treetop'
 require_relative './edngrammar'
 
+module 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 const_defined?(:APPS)
+end
+
 class Treetop::Runtime::SyntaxNode
   def ast
     fail "undefined_ast #{inspect}"