edn-abnf 0.5.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ddc4fd884d2eb5af3b0dd9b76ca452db54c42def393cd5d53867a70b98b4990
-  data.tar.gz: ba447dfe08051442194cfb9a991bd04ed6e7a9127b5c839ff85c7952d64bc430
+  metadata.gz: 993acf6aae5ce078aec90f346fa8a0a313b33d3af4ef16661fdc6c3d31def17c
+  data.tar.gz: a8504ae9093db0b806ecaec245a8ddee7d9cdabbdace99e12ee9e7240ea35fbe
 SHA512:
-  metadata.gz: cc8950aa2b619fc9482e030b12166f66a5cc091b73ba3802375bb80a8ab41b035a8b57e7c6a82ac785a7937fd4796aa824c47fd2933a47d25f5d434bb585450d
-  data.tar.gz: 410b389c142d948492492dbe37473b1fc78e91f8e057acf4276fc4a69a1d8b67edfc836ce86b563d6d006cc7239c7f97f6f090355dc58b2909a087471ddcb7a3
+  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|
@@ -100,6 +102,7 @@ if $options.lines
         else
           puts "** x / #{ednin.inspect} / #{out} ≠ #{result_diag.inspect} / #{result_hex}"
         end
+        $error += 1
       end
       next
     end
@@ -110,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}"
@@ -128,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.5.1"
+  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}"