cddlc 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a38ea6117afabc57b950af7598c2d497bb00f587ec937cbe41b45b33f3775dfe
-  data.tar.gz: f726477776dee7586f5f85909473cfb22acc38630cf45995c732d2df7a842ebf
+  metadata.gz: 87f4f966e5f0937e393d3157c80d345295bd672d088ccc4587c04223c7ec5f94
+  data.tar.gz: 5be056668436fff6ab9835487326956461a98f748107fd7e0b8c4c7c6cd2dc7b
 SHA512:
-  metadata.gz: 332fcf064ebfc558cc82908832575a3fd4f77219f6f1ceb46ffab2270ee4f9273ecc7d83edcc5dc6dc574ef4ccefdbf9fd7c25d10a9f88466dc4e0ca7ae3dc32
-  data.tar.gz: 3bbb56ffb6853eaab2792e5518914128ecf734bff0db4651861227bd77eaf4241e29b11306e04937855e46d67c05f3dd55cdde91e86da5ef2d5cc9f7fd4edb96
+  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])
@@ -95,7 +95,7 @@ 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"

data/cddlc.gemspec

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

@@ -198,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
@@ -226,9 +234,38 @@ class CDDL
     Marshal.load(Marshal.dump(self))
   end
 
-
-  RULE_OP_TO_CHOICE = {"/=" => ["tcho", "tadd"], "//=" => ["gcho", "gadd"]}
-  CHOICERULES = RULE_OP_TO_CHOICE.values.flatten
+  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
@@ -260,36 +297,7 @@ class CDDL
         else
           fail name
         end
-        @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
+        merge_to_rule(name, val, cho)
       end
       # warn "** rules #{rules.inspect}"
     end

data/lib/processor/cddl-visitor.rb

@@ -27,8 +27,8 @@ class CDDL
       ["tcho", *visit_all(prods, &block)]
     in ["gadd", *prods]
       ["gadd", *visit_all(prods, &block)]
-    in ["tcho", *prods]
-      ["tcho", *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)}"]
@@ -117,10 +117,8 @@ class CDDL
       case v
       in ["tadd", *rest]
         assign = "/="
-        v = ["tcho", *rest]
       in ["gadd", *rest]
         assign = "//="
-        v = ["gcho", *rest]
       in ["parm", parmnames, _type]
       else
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cddlc
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Carsten Bormann