cddlc 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 446e27ac8733454e0a3a9a9e2f24a43f600f60a414400419287fe147649a7a1f
-  data.tar.gz: 1a4e7b41949419befd15479d0373bf3c316e22c62a6796c6453db6c3467f2b5d
+  metadata.gz: ed5e9bd6c8caace67d29c6549fd30d59fc2c17c06b671f63868d2ecb6ea0031b
+  data.tar.gz: 03d6d40e1ebf19da17117ca725ba09c60c33867606953d2566fd86ace2805e9a
 SHA512:
-  metadata.gz: 5fce60c859d8b361973c52a9e4d0a4e18908a7978d938a91c0e50125d64db3a5d704a9cc7f6ad8d17fb7f242bed3f31bb5df2107459d9fdacc57afae9f8df53e
-  data.tar.gz: 2c8a8e5f3653125cb719d6aeb7f46642643b561702824a4fcdd404dd40bcdf3ae362ca5cda5323b97f6da521dc555677d8f5139774a12ef9b2f599539b08850e
+  metadata.gz: 2b1790d8845935f61f7c12070dbb95f223a6e1914c813dbf85e4ae3979b1fbcbf37abd5730a3a471c1a5777464a8fc966d36835e20df41d3e19a17203e0969f8
+  data.tar.gz: f0884c20358c0a7edaf9df050c79d93f3df7dfb42ceb44ee59b3cc0cb8f318a5ad5efa08964dd259d3a211dd6bcc8a1b2eed5f636cae4ca5a80b524c3a40fdab

data/bin/cddlc

@@ -91,46 +91,6 @@ result = if $options.rules
 
 warn "** can't note undefined for target != cddl" if $options.note_undefined && $options.target != :cddl
 
-if $options.cddl2
-  require_relative '../lib/processor/cddl-undefined.rb'
-  directives = cddl_file.lines.grep(/^;# /).map(&:chomp).map{|l| l.sub(/^;#\s+/, '')}
-  # puts "** Directives: <<"
-  # puts directives
-  directives.each do |di|
-    case di
-    when /\Ainclude\s+([-._a-zA-Z0-9]+)(?:\s+as\s+([-._a-zA-Z0-9]+))?\s*\z/
-      docref = $1
-      explicit_preferred_tag = $2
-      preferred_tag = explicit_preferred_tag || docref
-      puts "PREFERRED_TAG #{preferred_tag}" if $options.verbose
-      puts "DOCREF #{docref}" if $options.verbose
-      fn = docref.downcase << ".cddl"
-      io = File.open(fn) rescue File.open(CDDL::DATA_DIR + fn) # XXX CDDL_PATH
-      include_file = io.read
-      # XXX: processing directives recursively!
-      included_cddl = CDDL.from_cddl(include_file)
-      # XXX: Should namespace that thing now! all names -> preferred_tag.name
-      p included_cddl.rules.keys
-      # XXX: do once, first, to rename COSE_Key to RFC9052.COSE_Key
-      loop do
-        undef_rule, _undef_gen = cddl.cddl_undefined # ignore undef_gen for now
-        # p undef_rule
-        got_more = false
-        undef_rule.each do |name|
-          if rule = included_cddl.rules[name]
-            cddl.rules[name] = rule                     # XXX must be namespaced!
-            puts "IMPORTED #{name} from #{fn}" # ...: #{rule}... if $options.verbose
-            got_more = true
-          end
-        end
-        break unless got_more
-      end
-    else
-      warn "** unknown directive '#{di}' ignored"
-    end
-  end
-end
-
 case $options.target
 when :basic, nil
   pp result
@@ -160,13 +120,10 @@ when :cddl
   require_relative '../lib/writer/cddl-writer.rb'
   if $options.note_undefined
     require_relative '../lib/processor/cddl-undefined.rb'
-    undef_rule, undef_gen = cddl.cddl_undefined
+    undef_rule = cddl.cddl_undefined
     undef_rule.each do |k|
       puts ";;; *** undefined: #{k}"
     end
-    undef_gen.each do |k|
-      puts ";;; *** undefined: #{k}<>"
-    end
   end
   puts cddl.to_s
 else

data/cddlc.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "cddlc"
-  s.version = "0.1.1"
+  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"