cddlc 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ac6c49d6e3aae903f307b8ca75486ec8a0654bbf9bcb8ce77cfbc32d58b97a2
-  data.tar.gz: 04c26c80b59ca309c68d0a1ff7e1236f50ddcc10f2aab7d6eddc0c09d5a3f698
+  metadata.gz: 87f4f966e5f0937e393d3157c80d345295bd672d088ccc4587c04223c7ec5f94
+  data.tar.gz: 5be056668436fff6ab9835487326956461a98f748107fd7e0b8c4c7c6cd2dc7b
 SHA512:
-  metadata.gz: e99d700012b8c6211ee051e20399271ee9e765f92c835eb0c567880b3cf05f343f26c8ab4b28535641f98020916a2ea6b4ccb73f55c61375771f7fc68cbd69f9
-  data.tar.gz: fd110edebea03f2ebd07e3e670e2861c24caeff9758ecf40edefc4a73034933f22c17b183eff86babb2421472fe9fa10938710ac6965e36a9a1efa36dd7f30a9
+  metadata.gz: 46d27fe85391c66e58d9006391993eb44d14b828fe1254a1d9911d015a1ed0cd7675e5239cde4f9c90a11adfef78b97ca331d2b50eb1e53ba35808bc5f034164
+  data.tar.gz: 27be4a4c43b65d7a6e764fc9c66eff853b3b4d37a99dff56c3fc8a5fbe975c341d2709704d82ec03cf4525b1c5a8621ea5e082e412e2d5d432cbf7a8b50e090a

data/bin/cddlc

@@ -10,7 +10,7 @@ def named_keys(tree)
   # warn [:T, tree].inspect
   fail unless Array === tree
   case tree[0]
-  when "seq", "gcho", "tcho"
+  when "seq", "gcho", "gadd", "tcho", "tadd"
     tree[1..-1].flat_map {|x| named_keys(x)}
   when "rep"
     named_keys(tree[3])
@@ -44,7 +44,7 @@ require 'ostruct'
 $options = OpenStruct.new
 begin
   op = OptionParser.new do |opts|
-    opts.banner = "Usage: cddlc.rb [options] [file.cddl... | -]"
+    opts.banner = "Usage: cddlc.rb [options] [-e cddl | file.cddl... | -]"
 
     opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
       $options.verbose = v
@@ -70,6 +70,9 @@ begin
     opts.on("-sRULE", "--start=RULE", String, "Start rule name") do |v|
       $options.start = v
     end
+    opts.on("-eCDDL", "CDDL model on command line") do |v|
+      $options.model = v
+    end
     opts.on("-iIMPORT", "--import=IMPORT", String, "Import [namespace=]reference") do |v|
       $options.import ||= []
       $options.import << v
@@ -92,7 +95,10 @@ end
 
 cddl_file = ""
 if $options.start
-  cddl_file << "$.start.$ = #{$options.start}\n"
+  cddl_file << "@.start.@ = #{$options.start}\n"
+end
+if m = $options.model
+  cddl_file << m << "\n"
 end
 
 [[$options.include, "include"], [$options.import, "import"]].each do |arr, directive|

data/cddlc.gemspec

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

@@ -1,6 +1,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'
 
 class CDDL
   @@parser = CDDLGRAMMARParser.new
@@ -197,10 +198,18 @@ class CDDL
     end
   end
 
+  RULE_OP_TO_CHOICE = {"/=" => ["tcho", "tadd"], "//=" => ["gcho", "gadd"]}
+  CHOICERULES = RULE_OP_TO_CHOICE.values.flatten
+  RULE_OUTER_TO_CHOICE = {"tadd" => ["tcho", "tadd"], "gadd" => ["gcho", "gadd"]}
+
   def store_rule(k, v)
     if old = rules[k]
       if old != v
-        return old              # error
+        if cho = RULE_OUTER_TO_CHOICE[v[0]]
+          merge_to_rule(k, v, cho)
+        else
+          return old              # error
+        end
       end
     else
       rules[k] = v
@@ -225,8 +234,38 @@ class CDDL
     Marshal.load(Marshal.dump(self))
   end
 
-
-  RULE_OP_TO_CHOICE = {"/=" => "tcho", "//=" => "gcho"}
+  def merge_to_rule(name, val, cho)
+        @rules[name] = nv =
+          if (old = @rules[name]) && old != val
+            fail "overwriting #{write_rule(name, old)} ...with... #{write_rule(name, val)}" unless cho
+            if Array === old && cho.include?(old[0])
+              if cho.include?(val[0])
+                old.dup.append(*val[1..-1])
+              else
+                old.dup << val
+              end
+            else
+              #  can't put an old "g/tadd" into a new "t/gcho"
+              fail "can't add #{write_rule(name, [cho[1], val])} ...to... #{write_rule(name, old)}" if CHOICERULES.include?(old[0])
+              [cho[0], old, val] # old might need to be packaged for gcho
+            end
+          else
+            if cho
+              if val[0] == cho[0]
+                [cho[1], *val[1..-1]]
+              else
+                [cho[1], val]
+              end
+            else
+              val
+            end
+          end
+        if name[0..1] == "$$"
+          check_socket(name, nv, "gadd", "tadd", "tcho", "type", "group")
+        elsif name[0] == "$"
+          check_socket(name, nv, "tadd", "gadd", "gcho", "group", "type")
+        end
+  end
 
   def rules
     if @rules.nil?              # memoize
@@ -258,27 +297,27 @@ class CDDL
         else
           fail name
         end
-        @rules[name] =
-          if (old = @rules[name]) && old != val
-            fail "duplicate rule for name #{name} #{old.inspect} #{val.inspect}" unless cho
-            if Array === old && old[0] == cho
-              old.dup << val
-            else
-              [cho, old, val]
-            end
-          else
-            val
-          end
+        merge_to_rule(name, val, cho)
       end
       # warn "** rules #{rules.inspect}"
     end
     @rules
   end
 
+  def check_socket(name, nv, right, wrong, wrong_plain, wrong_kind, kind)
+    unless nv[0] == right
+      if nv[0] == wrong
+        flaw = "#{wrong_kind} choice #{write_rhs([wrong_plain, *nv[1..-1]], 2.1)} in"
+      else
+        flaw = "plain assignment of #{write_rhs(nv, 2.1)} to"
+      end
+      warn "** warning: #{flaw} #{kind} socket #{name}"
+    end
+  end
+
   def prelude
     if @prelude.nil?
       @prelude = CDDL.from_cddl(File.read(DATA_DIR + "prelude.cddl"))
-
     end
     @prelude
   end

data/lib/processor/cddl-visitor.rb

@@ -25,6 +25,10 @@ class CDDL
       ["gcho", *visit_all(prods, &block)]
     in ["tcho", *prods]
       ["tcho", *visit_all(prods, &block)]
+    in ["gadd", *prods]
+      ["gadd", *visit_all(prods, &block)]
+    in ["tadd", *prods]
+      ["tadd", *visit_all(prods, &block)]
     in ["seq", *prods]
       ["seq", *visit_all(prods, &block)]
     in ["enum", prod]

data/lib/writer/cddl-writer.rb

@@ -41,9 +41,9 @@ class CDDL
       [4, id]
     in ["gen", id, *parms]  # oops -- namep vs. namea; ouch
       [4, "#{id}<#{parms.map{write_rhs(_1, 2, indent, pn)}.join(", ")}>"]
-    in ["tcho", *types]
+    in ["tcho" | "tadd", *types]
       [2.1, types.map{write_rhs(_1, 3, indent, pn)}.join(" / ")]
-    in ["gcho", *groups]
+    in ["gcho" | "gadd", *groups]
       [0, groups.map{write_rhs(_1, 2, indent, pn)}.join(" // ")]
     in ["op", op, l, r]
       [3, "#{write_rhs(l, 4, indent, pn)} #{op} #{write_rhs(r, 4, indent, pn)}"]
@@ -111,15 +111,22 @@ class CDDL
     prec_check(ret, targetprec, prec, indent_s)
   end
 
-  def to_s
-    rules.map {|k, v|
+  def write_rule(k, v)
       parmnames = false
+      assign = "="
       case v
+      in ["tadd", *rest]
+        assign = "/="
+      in ["gadd", *rest]
+        assign = "//="
       in ["parm", parmnames, _type]
       else
       end
-      "#{write_lhs(k, parmnames)} = #{write_rhs(v, 2.1)}" # 2: parenthesize groups
-    }.join("\n")
+      "#{write_lhs(k, parmnames)} #{assign} #{write_rhs(v, 2.1)}" # 2: parenthesize groups
+  end
+
+  def to_s
+    rules.map {|k, v| write_rule(k, v) }.join("\n")
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cddlc
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-02 00:00:00.000000000 Z
+date: 2024-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler