cddlc 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 119d5084051bfbc6889d6a9b36e22308cbb580c9d71b738e4c99ea2f908496cb
-  data.tar.gz: 33fafda14412916c5883260cb64bea2793785e359d833e6d9cee37cf76260186
+  metadata.gz: ed5e9bd6c8caace67d29c6549fd30d59fc2c17c06b671f63868d2ecb6ea0031b
+  data.tar.gz: 03d6d40e1ebf19da17117ca725ba09c60c33867606953d2566fd86ace2805e9a
 SHA512:
-  metadata.gz: c5936c13d4bca770fbcd628851f14a604e27a95e5c1c76329eb81932e7d9c7e72edf898d4989176baffa1d99a88f827e981fad338bb731560eb5547dba69342b
-  data.tar.gz: d3fe1f230d47841385cc12dd7cf3092c0feae0326ca6889eefb889ceb55903cac6919075cfaf2879961c185adf695df218cb2e1df418a781e6098bf4269d4d49
+  metadata.gz: 2b1790d8845935f61f7c12070dbb95f223a6e1914c813dbf85e4ae3979b1fbcbf37abd5730a3a471c1a5777464a8fc966d36835e20df41d3e19a17203e0969f8
+  data.tar.gz: f0884c20358c0a7edaf9df050c79d93f3df7dfb42ceb44ee59b3cc0cb8f318a5ad5efa08964dd259d3a211dd6bcc8a1b2eed5f636cae4ca5a80b524c3a40fdab

data/bin/cddlc

@@ -58,6 +58,9 @@ begin
     opts.on("-u", "--[no-]undefined", "Note undefined names") do |v|
       $options.note_undefined = v
     end
+    opts.on("-2", "--[no-]cddl2", "Perform some CDDL 2.0 processing") do |v|
+      $options.cddl2 = v
+    end
     opts.on("-tFMT", "--to=FMT", [:basic, :neat, :json, :yaml, :enum, :cddl], "Target format") do |v|
       $options.target = v
     end
@@ -116,32 +119,10 @@ when :enum
 when :cddl
   require_relative '../lib/writer/cddl-writer.rb'
   if $options.note_undefined
-    require_relative "../lib/processor/cddl-visitor.rb"
-    used = {}
-    gen_used = {}
-    def_gen = {}
-    cddl.rules.each do |k, v|
-      def_gen[k[0]] = true if Array === k
-      cddl.visit(v) do |p, &block|
-        case p
-        in ["gen", name, *_gen_args]
-          gen_used[name] = true
-        in ["name", name]
-          used[name] = true
-        else
-          false
-        end
-      end
-    end
-    used.each do |k, v|
-      unless cddl.rules[k] || cddl.prelude.rules[k]
-        puts ";;; *** undefined: #{k}"
-      end
-    end
-    gen_used.each do |k, v|
-      unless def_gen[k]
-        puts ";;; *** undefined: #{k}<>"
-      end
+    require_relative '../lib/processor/cddl-undefined.rb'
+    undef_rule = cddl.cddl_undefined
+    undef_rule.each do |k|
+      puts ";;; *** undefined: #{k}"
     end
   end
   puts cddl.to_s

data/cddlc.gemspec

@@ -1,13 +1,13 @@
 Gem::Specification.new do |s|
   s.name = "cddlc"
-  s.version = "0.1.0"
+  s.version = "0.1.2"
   s.summary = "CDDL (Concise Data Definition Language) converters and miscellaneous tools"
   s.description = %q{cddlc implements converters and miscellaneous tools for CDDL, RFC 8610}
   s.author = "Carsten Bormann"
   s.email = "cabo@tzi.org"
   s.license = "MIT"
   s.homepage = "http://github.com/cabo/cddlc"
-  s.files = Dir['lib/**/*.rb'] + %w(cddlc.gemspec data/prelude.cddl) + Dir['bin/**/*.rb']
+  s.files = Dir['lib/**/*.rb'] + %w(cddlc.gemspec) + Dir['data/*.cddl'] + Dir['bin/**/*.rb']
   s.executables = Dir['bin/*'].map {|x| File.basename(x)}
   s.required_ruby_version = '>= 1.9.2'