cddlc 0.3.2 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a38ea6117afabc57b950af7598c2d497bb00f587ec937cbe41b45b33f3775dfe
-  data.tar.gz: f726477776dee7586f5f85909473cfb22acc38630cf45995c732d2df7a842ebf
+  metadata.gz: c3ebce64393cf5518aaaf97d1257771e4b0a7e0f3318f0c1ba7a2c0a3342de9f
+  data.tar.gz: 6dd472b20440724ce78aa6bc87a858b29d8b81b8137b7f583afed016285e0e2b
 SHA512:
-  metadata.gz: 332fcf064ebfc558cc82908832575a3fd4f77219f6f1ceb46ffab2270ee4f9273ecc7d83edcc5dc6dc574ef4ccefdbf9fd7c25d10a9f88466dc4e0ca7ae3dc32
-  data.tar.gz: 3bbb56ffb6853eaab2792e5518914128ecf734bff0db4651861227bd77eaf4241e29b11306e04937855e46d67c05f3dd55cdde91e86da5ef2d5cc9f7fd4edb96
+  metadata.gz: 31b74e7d6fc4fce123d2289c7323d8dcbc91704f16851c509938bc89d786a4850c8abd373247c931c1a5a078e310ab0b539900b514626d8dcaa24e5c33fb3067
+  data.tar.gz: a3c9e1683b8bf909cd4c946b2396794172fd1c6f8d66814af36bb209ab65524da4c5f61b920d0836b91d39d53bd7c784156b22989e99946c166b34c6b3dca0f3

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.4"
   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"
@@ -15,6 +15,6 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'bundler', '~>1'
   s.add_dependency 'treetop', '~>1'
-  s.add_dependency 'json', '~>2'
+#  s.add_dependency 'json', '~>2'
   s.add_dependency 'neatjson', '~>0.10'
 end

data/data/rfc9581.cddl

@@ -0,0 +1,118 @@
+Etime = #6.1001(etime-detailed)
+
+etime-framework = {
+  uint => any ; at least one base time
+  * (nint/text) => any ; elective supplementary information
+  * uint => any ; critical supplementary information
+}
+
+etime-detailed = ({
+  $$ETIME-BASETIME
+  ClockQuality-group
+  * $$ETIME-ELECTIVE
+  * $$ETIME-CRITICAL
+  * ((nint/text) .feature "etime-elective-extension") => any
+  * (uint .feature "etime-critical-extension") => any
+}) .within etime-framework
+
+
+$$ETIME-BASETIME //= (1: ~time)
+
+
+$$ETIME-BASETIME //= (4: ~decfrac)
+$$ETIME-BASETIME //= (5: ~bigfloat)
+
+
+$$ETIME-ELECTIVE //= (-3: uint)
+$$ETIME-ELECTIVE //= (-6: uint)
+$$ETIME-ELECTIVE //= (-9: uint)
+$$ETIME-ELECTIVE //= (-12: uint)
+$$ETIME-ELECTIVE //= (-15: uint)
+$$ETIME-ELECTIVE //= (-18: uint)
+
+
+$$ETIME-ELECTIVE //= (-1 => $ETIME-TIMESCALE)
+$$ETIME-ELECTIVE //= (-13 => $ETIME-TIMESCALE)
+$$ETIME-CRITICAL //= (13 => $ETIME-TIMESCALE)
+
+$ETIME-TIMESCALE /= &(etime-utc: 0)
+$ETIME-TIMESCALE /= &(etime-tai: 1)
+
+
+ClockQuality-group = (
+  ? &(ClockClass: -2) => uint .size 1 ; PTP/RFC8575
+  ? &(ClockAccuracy: -4) => uint .size 1 ; PTP/RFC8575
+  ? &(OffsetScaledLogVariance: -5) => uint .size 2 ; PTP/RFC8575
+  ? &(Uncertainty: -7) => ~time/~duration
+  ? &(Guarantee: -8) => ~time/~duration
+)
+
+
+$$ETIME-ELECTIVE //= (-10: time-zone-info)
+$$ETIME-CRITICAL //= (10: time-zone-info)
+
+time-zone-info = tstr .abnf
+                 ("time-zone-name / time-numoffset" .det IXDTFtz)
+IXDTFtz = '
+   time-hour       = 2DIGIT  ; 00-23
+   time-minute     = 2DIGIT  ; 00-59
+   time-numoffset  = ("+" / "-") time-hour ":" time-minute
+
+
+
+   time-zone-initial = ALPHA / "." / "_"
+   time-zone-char    = time-zone-initial / DIGIT / "-" / "+"
+   time-zone-part    = time-zone-initial *time-zone-char
+                       ; but not "." or ".."
+   time-zone-name    = time-zone-part *("/" time-zone-part)
+   ALPHA             =  %x41-5A / %x61-7A   ; A-Z / a-z
+   DIGIT             =  %x30-39 ; 0-9
+' ; extracted from [RFC9557] and [RFC3339]
+
+
+$$ETIME-ELECTIVE //= (-11: suffix-info-map)
+$$ETIME-CRITICAL //= (11: suffix-info-map)
+
+suffix-info-map = { * suffix-key => suffix-values }
+suffix-key = tstr .abnf ("suffix-key" .det IXDTF)
+suffix-values = one-or-more<suffix-value>
+one-or-more<T> = T / [ 2* T ]
+suffix-value = tstr .abnf ("suffix-value" .det IXDTF)
+
+IXDTF = '
+   key-initial       = lcalpha / "_"
+   key-char          = key-initial / DIGIT / "-"
+   suffix-key        = key-initial *key-char
+
+   suffix-value      = 1*alphanum
+   alphanum          = ALPHA / DIGIT
+   lcalpha           =  %x61-7A
+   ALPHA             =  %x41-5A / %x61-7A   ; A-Z / a-z
+   DIGIT             =  %x30-39 ; 0-9
+' ; extracted from [RFC9557]
+
+
+Duration = #6.1002(etime-detailed)
+
+
+simple-Period = #6.1003([
+  start: ~Etime / null
+  end: ~Etime / null
+  ? duration: ~Duration
+])
+
+
+Period = #6.1003([
+  (start: ~Etime,
+   ((end: ~Etime) //
+    (end: null,
+     duration: ~Duration))) //
+  (start: null,
+   end: ~Etime,
+   duration: ~Duration)
+])
+
+
+etime = #6.1001({* (int/tstr) => any})
+duration = #6.1002({* (int/tstr) => any})
+period = #6.1003([~etime/null, ~etime/null, ?~duration])

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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cddlc
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.4
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-06 00:00:00.000000000 Z
+date: 2024-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
 - !ruby/object:Gem::Dependency
   name: neatjson
   requirement: !ruby/object:Gem::Requirement
@@ -102,6 +88,7 @@ files:
 - data/rfc9393-sign1.cddl
 - data/rfc9393-tags.cddl
 - data/rfc9393.cddl
+- data/rfc9581.cddl
 - lib/cddlc.rb
 - lib/parser/cddl-util.rb
 - lib/parser/cddlgrammar.rb
@@ -130,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.14
 signing_key:
 specification_version: 4
 summary: CDDL (Concise Data Definition Language) converters and miscellaneous tools