cddlc 0.4.3 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95eae361039777040d1a588dbb9ada107b6e747e4a164381be1fe49368b121e0
-  data.tar.gz: 53420da6a203324093d55b2a31e2b36f0ad069403ae163369c81899ff0f4780a
+  metadata.gz: 1dfe2802ae8527a4b38a7c0c91f62a6aff4fa17043281b0593d40ba1c428a77f
+  data.tar.gz: 445a6efba2bf00ac88331e2703da21a5f1a61411bb864d766955f17054509fa5
 SHA512:
-  metadata.gz: 79e2cb555fce8db52ad7657914c7bc2535683a7190609df6ddee83340e5aecde3122cb5cf1cea9144eb3c9abca3dbaff2abb0553eb9cc9baa71dae35c4eefbb6
-  data.tar.gz: dedba1afd3df98b54d1c0ceeb584798c67ffe8a8fd414dbb1b80c516bee161d33f45711c44bf11075bbf85253d90a428312bf9f39d9a5936e55b6d97c28c1b0c
+  metadata.gz: 3306065f415d657586a793ce342db43d9dc1a10d90b6af3bb281368da386226284a5301214831064ec2b7c0a378bd0a7f2f9f4e51a989f1e6ddc8bb9812b0f1b
+  data.tar.gz: 3debf194ffee5bf0bb31e9bcf37f1c8c5fe1deb4526be1187cb1ba5fe2afaae044fdc322f64d4e4221406e3a6bdd32d0473a0a066c9d76ea4fa9bf577bc60eb3

data/bin/cddlc

@@ -42,6 +42,8 @@ require 'optparse'
 require 'ostruct'
 
 $options = OpenStruct.new
+$options.auto_choices = {}
+
 begin
   op = OptionParser.new do |opts|
     opts.banner = "Usage: cddlc [options] [-e cddl | file.cddl... | -]"
@@ -86,6 +88,10 @@ begin
     opts.on("-sRULE", "--start=RULE", String, "Start rule name") do |v|
       $options.start = v
     end
+    opts.on("-SRULE", "--start-and-import=RULE", String, "Start rule name and just import from input") do |v|
+      $options.start = v
+      $options.input = true
+    end
     opts.on("-eCDDL", "CDDL model on command line") do |v|
       $options.model = v
     end
@@ -100,6 +106,12 @@ begin
       $options.include ||= []
       $options.include << v
     end
+    opts.on("-TRULE", "--type-choice=RULE", String, "Treat multiple assignments to RULE as type choice") do |v|
+      $options.auto_choices[v] = ["tcho", "tadd"]
+    end
+    opts.on("-GRULE", "--group-choice=RULE", String, "Treat multiple assignments to RULE as group choice") do |v|
+      $options.auto_choices[v] = ["gcho", "gadd"]
+    end
   end
   op.parse!
 rescue StandardError => e
@@ -117,6 +129,10 @@ end
 cddl_file = ""
 if $options.start
   cddl_file << "@.start.@ = #{$options.start}\n"
+  if $options.input
+    $options.input = ARGF.read
+    cddl_file << ";# import /\n"
+  end
 end
 if m = $options.model
   cddl_file << m << "\n"

data/cddlc.gemspec

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

data/lib/cddlc.rb

@@ -2,6 +2,7 @@ require_relative "parser/cddl-util.rb"
 require_relative "processor/cddl-visitor.rb"
 require_relative 'processor/cddl-undefined.rb'
 require_relative 'writer/cddl-writer.rb'
+require 'stringio'
 
 class CDDL
   @@parser = CDDLGRAMMARParser.new
@@ -42,6 +43,9 @@ class CDDL
 
   def self.read_from_include_path(fn)
     io = nil
+    if fn == "/.cddl"            # XXX hack in importing from command line files
+      return StringIO.new($options.input)
+    end
     CDDL::cddl_include_path.each do |path|
       begin
         io = (path + fn).open
@@ -53,7 +57,7 @@ class CDDL
     io
   end
 
-  SAFE_FN = /\A[-._a-zA-Z0-9]+\z/
+  SAFE_FN = /\A[-._a-zA-Z0-9]+|\/\z/ # XXX
   IMPINC = /\A(?:import|include)\z/
   IDENTIFIER_RE = /\A[A-Za-z@_$]([-.]*[A-Za-z@_$0-9])*\z/
   INT_RE = /\A0|[-]?[1-9][0-9]*\z/
@@ -280,6 +284,7 @@ class CDDL
         when "name"
           fail unless name.size == 2
           name = name[1]
+          cho ||= $options.auto_choices[name] if @rules[name]
         when "gen"
           parmnames = name[2..-1]
           name = name[1]        # XXX update val with parm/arg

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cddlc
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.5
 platform: ruby
 authors:
 - Carsten Bormann
@@ -130,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 4.0.8
 specification_version: 4
 summary: CDDL (Concise Data Definition Language) converters and miscellaneous tools
 test_files: []