cddlc 0.2.7 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9b2369e311571fc7dd58410f31098071ff75e8d53c144d3a478bc957945d7ae
-  data.tar.gz: 326423811614449c38fb1af24e5a2fae1fa1cb4e467084f024e62c9cd514ac62
+  metadata.gz: a38ea6117afabc57b950af7598c2d497bb00f587ec937cbe41b45b33f3775dfe
+  data.tar.gz: f726477776dee7586f5f85909473cfb22acc38630cf45995c732d2df7a842ebf
 SHA512:
-  metadata.gz: 0eac4ccf86acb957e9abf0eba253a61e07de25a84aea3f6a34e547a9e77b80e8d22f9ecbf106404d272920be114dea28074e65aa59eb2081e72dde942b28a8b3
-  data.tar.gz: 03f7f303c48ae86ab3d99ecff74f9ddf7c07d23ec60660611aec0b734f62790f7f1a26f1b8f758950f7ae2414d5b734f30bd97352df4f1b6782b046f3117a0de
+  metadata.gz: 332fcf064ebfc558cc82908832575a3fd4f77219f6f1ceb46ffab2270ee4f9273ecc7d83edcc5dc6dc574ef4ccefdbf9fd7c25d10a9f88466dc4e0ca7ae3dc32
+  data.tar.gz: 3bbb56ffb6853eaab2792e5518914128ecf734bff0db4651861227bd77eaf4241e29b11306e04937855e46d67c05f3dd55cdde91e86da5ef2d5cc9f7fd4edb96

data/bin/cddlc

@@ -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
@@ -94,6 +97,9 @@ cddl_file = ""
 if $options.start
   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|
   if arr

data/cddlc.gemspec

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

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
@@ -226,7 +227,8 @@ class CDDL
   end
 
 
-  RULE_OP_TO_CHOICE = {"/=" => "tcho", "//=" => "gcho"}
+  RULE_OP_TO_CHOICE = {"/=" => ["tcho", "tadd"], "//=" => ["gcho", "gadd"]}
+  CHOICERULES = RULE_OP_TO_CHOICE.values.flatten
 
   def rules
     if @rules.nil?              # memoize
@@ -258,27 +260,56 @@ class CDDL
         else
           fail name
         end
-        @rules[name] =
+        @rules[name] = nv =
           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
+            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
-              [cho, old, val]
+              #  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
-            val
+            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
       # 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/parser/cddlgrammar.rb

@@ -947,7 +947,7 @@ module CDDLGRAMMAR
   end
 
   module Type214
-    def tag_number
+    def head_number
       elements[1]
     end
   end
@@ -975,26 +975,42 @@ module CDDLGRAMMAR
   end
 
   module Type217
-    def uint
+    def head_number
       elements[1]
     end
   end
 
   module Type218
+  end
+
+  module Type219
+    def ast
+              el = elements[2].elements
+              ["prim", 7, *el && [el[1].ast]]
+            end
+  end
+
+  module Type220
+    def uint
+      elements[1]
+    end
+  end
+
+  module Type221
     def DIGIT
       elements[1]
     end
 
   end
 
-  module Type219
+  module Type222
     def ast
               ["prim", elements[1].text_value.to_i,
                *(el = elements[2].elements) ? [el[1].text_value.to_i] : []]
             end
   end
 
-  module Type220
+  module Type223
     def ast() ["prim"] end
   end
 
@@ -1330,7 +1346,7 @@ module CDDLGRAMMAR
                         end
                         s48 << r49
                         if r49
-                          r50 = _nt_tag_number
+                          r50 = _nt_head_number
                           s48 << r50
                         end
                         if s48.last
@@ -1402,7 +1418,13 @@ module CDDLGRAMMAR
                       end
                       s56 << r57
                       if r57
-                        r58 = _nt_DIGIT
+                        if (match_len = has_terminal?("7", false, index))
+                          r58 = true
+                          @index += match_len
+                        else
+                          terminal_parse_failure('"7"')
+                          r58 = nil
+                        end
                         s56 << r58
                         if r58
                           i60, s60 = index, []
@@ -1415,7 +1437,7 @@ module CDDLGRAMMAR
                           end
                           s60 << r61
                           if r61
-                            r62 = _nt_uint
+                            r62 = _nt_head_number
                             s60 << r62
                           end
                           if s60.last
@@ -1445,20 +1467,74 @@ module CDDLGRAMMAR
                         r56 = SyntaxNode.new(input, (index-1)...index) if r56 == true
                         r0 = r56
                       else
+                        i63, s63 = index, []
                         if (match_len = has_terminal?("#", false, index))
-                          r63 = instantiate_node(SyntaxNode,input, index...(index + match_len))
-                          r63.extend(Type220)
+                          r64 = true
                           @index += match_len
                         else
                           terminal_parse_failure('"#"')
+                          r64 = nil
+                        end
+                        s63 << r64
+                        if r64
+                          r65 = _nt_DIGIT
+                          s63 << r65
+                          if r65
+                            i67, s67 = index, []
+                            if (match_len = has_terminal?(".", false, index))
+                              r68 = true
+                              @index += match_len
+                            else
+                              terminal_parse_failure('"."')
+                              r68 = nil
+                            end
+                            s67 << r68
+                            if r68
+                              r69 = _nt_uint
+                              s67 << r69
+                            end
+                            if s67.last
+                              r67 = instantiate_node(SyntaxNode,input, i67...index, s67)
+                              r67.extend(Type220)
+                            else
+                              @index = i67
+                              r67 = nil
+                            end
+                            if r67
+                              r66 = r67
+                            else
+                              r66 = instantiate_node(SyntaxNode,input, index...index)
+                            end
+                            s63 << r66
+                          end
+                        end
+                        if s63.last
+                          r63 = instantiate_node(SyntaxNode,input, i63...index, s63)
+                          r63.extend(Type221)
+                          r63.extend(Type222)
+                        else
+                          @index = i63
                           r63 = nil
                         end
                         if r63
                           r63 = SyntaxNode.new(input, (index-1)...index) if r63 == true
                           r0 = r63
                         else
-                          @index = i0
-                          r0 = nil
+                          if (match_len = has_terminal?("#", false, index))
+                            r70 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+                            r70.extend(Type223)
+                            @index += match_len
+                          else
+                            terminal_parse_failure('"#"')
+                            r70 = nil
+                          end
+                          if r70
+                            r70 = SyntaxNode.new(input, (index-1)...index) if r70 == true
+                            r0 = r70
+                          else
+                            @index = i0
+                            r0 = nil
+                          end
                         end
                       end
                     end
@@ -1476,27 +1552,27 @@ module CDDLGRAMMAR
     r0
   end
 
-  module TagNumber0
+  module HeadNumber0
     def ast() text_value.to_i end
   end
 
-  module TagNumber1
+  module HeadNumber1
     def type
       elements[1]
     end
 
   end
 
-  module TagNumber2
+  module HeadNumber2
     def ast() elements[1].ast end
   end
 
-  def _nt_tag_number
+  def _nt_head_number
     start_index = index
-    if node_cache[:tag_number].has_key?(index)
-      cached = node_cache[:tag_number][index]
+    if node_cache[:head_number].has_key?(index)
+      cached = node_cache[:head_number][index]
       if cached
-        node_cache[:tag_number][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:head_number][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -1504,8 +1580,8 @@ module CDDLGRAMMAR
 
     i0 = index
     r1 = _nt_uint
-    r1.extend(TagNumber0)
-    r1.extend(TagNumber0)
+    r1.extend(HeadNumber0)
+    r1.extend(HeadNumber0)
     if r1
       r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
       r0 = r1
@@ -1535,8 +1611,8 @@ module CDDLGRAMMAR
       end
       if s2.last
         r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
-        r2.extend(TagNumber1)
-        r2.extend(TagNumber2)
+        r2.extend(HeadNumber1)
+        r2.extend(HeadNumber2)
       else
         @index = i2
         r2 = nil
@@ -1550,7 +1626,7 @@ module CDDLGRAMMAR
       end
     end
 
-    node_cache[:tag_number][start_index] = r0
+    node_cache[:head_number][start_index] = r0
 
     r0
   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 ["tcho", *prods]
+      ["tcho", *visit_all(prods, &block)]
     in ["seq", *prods]
       ["seq", *visit_all(prods, &block)]
     in ["enum", prod]

data/lib/writer/cddl-writer.rb

@@ -64,8 +64,10 @@ class CDDL
       [4, "#"]
     in ["prim", maj]
       [4, "##{maj}"]
-    in ["prim", maj, min]
+    in ["prim", maj, Integer => min]
       [4, "##{maj}.#{min}"]
+    in ["prim", 7, Array => min]
+      [4, "##{maj}.<#{write_rhs(min, 0, indent, pn)}>"]
     in ["prim", 6, Integer => tag, type]
       [4, "#6.#{tag}(#{write_rhs(type, 0, indent, pn)})"]
     in ["prim", 6, Array => tag, type]
@@ -109,15 +111,24 @@ 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 = "/="
+        v = ["tcho", *rest]
+      in ["gadd", *rest]
+        assign = "//="
+        v = ["gcho", *rest]
       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.2.7
+  version: 0.3.2
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-26 00:00:00.000000000 Z
+date: 2024-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler