edn-abnf 0.0.11 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4dd67fd4813a8adf98e4bbffd069e9d9e40a9c8d4c51c9f1ef1226497d3e7e9b
-  data.tar.gz: 524e68b7bb39b5acb883ddcbbbf3afd6531dfbc3892abfdf7346e8a97452e51d
+  metadata.gz: 2894bfba4af4dbd61e9c9c10431713446360aba2962a99f3729b22d13ebdf52a
+  data.tar.gz: 7222fd2e9723cb4221283eaf6c06083718a8884d840c9709ca9673f4dfd0678f
 SHA512:
-  metadata.gz: 132445c4a4c05bd1ce60d552c0c6809df5c92cb850c79243cd26fd5552f5db73e3a1b93dbce1585cddec77ff764d33b1bfb7a868d1907dfa37145a1762530729
-  data.tar.gz: e399041d7bf61d00d80fe824daeb72e8d008927cd8cd5958aedce23f100e53ecef2887393d0aca753bafc9fed1c4330bd8696ffdcd6a6e69829331efd28e8e22
+  metadata.gz: 8c1f9277ebcf2028c2abe48723e0ed3a9c326caf6629d4ce610f81ea1c96880ef2e83b0b2c2150b0b5c364befab7d94d3d7665636a5d3cc15594675db96fb7f3
+  data.tar.gz: 204d4de2c92eda0009a1214f9db0982561584f28bcfa2d30a7917c44477f0263dec3c490ebe7ac31743c4eae8ad4e4b2abe906bc75401378b6a86655613bc72b

data/bin/edn-abnf

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# coding: utf-8-hfs
 require 'pp'
 require 'yaml'
 require 'treetop'
@@ -22,6 +23,13 @@ begin
     opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
       $options.verbose = v
     end
+    opts.on("-l", "--[no-]lines", "multi-line mode") do |v|
+      require 'csv'
+      $options.lines = v
+    end
+    opts.on("-eEDN", "--e=EDN", "supply EDN on command line") do |v|
+      $options.edn = v
+    end
     opts.on("-tFMT", "--to=FMT", [:basic, :neat, :json, :yaml, :edn, :diag], "Target format") do |v|
       $options.target = v
     end
@@ -32,12 +40,51 @@ rescue Exception => e
   exit 1
 end
 
-if ARGV == []
-  puts op
-  exit 1
+
+if !$options.edn
+  if ARGV == []
+    puts op
+    exit 1
+  end
+  $options.edn = ARGF.read
+else
+  if ARGV != []
+    warn "*** file names #{ARGV.join(", ")} ignored due to -e given"
+  end
 end
 
-edn_file = ARGF.read
+edn_file = $options.edn
+
+if $options.lines
+  CSV.parse(edn_file) do |ok, edn, out|
+    if ok[0] == "#"
+      puts "# #{ok}, #{edn}, #{out}" if $options.verbose
+      next
+    end
+    begin
+      ok = ok == "="
+      puts "➔ #{ok}, #{edn}, #{out}" if $options.verbose
+      edn = EDN.from_edn(edn)
+      result = edn.tree
+      diag = result.cbor_diagnostic
+      if out == diag && !ok
+          puts "** ≠ / #{diag.inspect} / #{out.inspect}"
+      end
+      if out != diag && ok
+          puts "** ≡ / #{diag.inspect} / #{out.inspect}"
+      end
+    rescue ArgumentError => e
+      if ok
+        puts "** #{e} / #{result.inspect} / #{out.inspect}"
+      else
+        if $options.verbose
+          puts "expected failure #{e}"
+        end
+      end
+    end
+  end
+  exit
+end
 
 begin
   edn = EDN.from_edn(edn_file)

data/edn-abnf.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "edn-abnf"
-  s.version = "0.0.11"
+  s.version = "0.1.0"
   s.summary = "CDDL (Concise Data Definition Language) converters and miscellaneous tools"
   s.description = %q{edn-abnf implements converters and miscellaneous tools for CBOR EDN's ABNF}
   s.author = "Carsten Bormann"

data/lib/cbor-diagnostic-app/dt.rb

@@ -0,0 +1,33 @@
+require_relative "dtgrammar.rb"
+require 'time'
+
+# Using Time#iso8601 creates the following bugs:
+# * dt'1970-01-01T10:00:00' is accepted and gives local time
+# * dt'1970-01-01T10:00:00.0Z' gives an integer instead of a float
+# Probably should copy over Time#xmlschema and fix that for us.
+
+class CBOR_DIAG::App_dt
+  def self.decode(app_prefix, s)
+    parser = DTGRAMMARParser.new
+    ast = parser.parse(s)
+    if !ast
+      raise ArgumentError, "cbor-diagnostic: Parse Error in dt'#{s}':\n" << EDN.reason(parser, s)
+    end
+    # ast.ast
+
+    t = Time.iso8601(s)
+    tv = if t.subsec != 0
+      t.to_f
+    else
+      t.to_i
+    end
+    case app_prefix
+    when 'dt'
+      tv
+    when 'DT'
+      CBOR::Tagged.new(1, tv)
+    else
+      fail app_prefix
+    end
+  end
+end