cddlc 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa1feed69996a1e91c43877cfbe3e68c6b935039976ae95db312fef99a0e8bbd
-  data.tar.gz: 746c4b175cb78c502ab731e43672841663cfb4a4159bcf387f8f69c9f34e347a
+  metadata.gz: 2d56a7033911531ad73966b0807a1c6b9d9c09b9b09638d43274337e067a02fa
+  data.tar.gz: 609ab555ddc49c64a1dde396b99e01b2c79fd9a4fb63b1efb19ccd0ba3a311c1
 SHA512:
-  metadata.gz: c9b58614695995f0336496734a3684992ddd6f7a1be0dfcbc0451f45afde7e78eb2a2f89ce60e9c5e0c09a1c0e7e8856cc5e5658fe3fe78bc22bc08c4897c4d4
-  data.tar.gz: d19ca545ca39eb87af227651438755c13475dd75bd29ef11a6a6327aac42e9c4a69fe0e5322a291e7819903d89c4de1296e1605934bce9b154dcb7ef6563c151
+  metadata.gz: c704b7fbc908dd1449a6c267936bea906f689852d54b54291fc8a2bc4ca62c39b2e947223da42069343e5d1b28e997907ffeb451d528c5436a7a96f82de17498
+  data.tar.gz: 8e9f965b91b31eae2986a5e4c621dc0048bb64308017ec917d1a7b90853b9c6322674eaf4ef034905c8f0c555791e5664112cb905b03255fe72b857f57830f67

data/bin/cddlc

@@ -55,6 +55,9 @@ begin
     opts.on("-x", "--[no-]expand", "Expand generics") do |v|
       $options.expand_generics = v
     end
+    opts.on("-f", "--[no-]flattening", "Flattening") do |v|
+      $options.flattening = v
+    end
     opts.on("-u", "--[no-]undefined", "Note undefined names") do |v|
       $options.note_undefined = v
     end
@@ -82,6 +85,11 @@ rescue Exception => e
   exit 1
 end
 
+if ($options.expand_generics || $options.flattening) && !$options.rules
+  warn "** can't expand or flatten in tree; adding -r flag"
+  $options.rules = true
+end
+
 cddl_file = ""
 if $options.start
   cddl_file << "$.start.$ = #{$options.start}\n"
@@ -117,15 +125,20 @@ else
   cddl_file << ARGF.read
 end
 
+
 cddl = CDDL.from_cddl(cddl_file)
 result = if $options.rules
            if $options.expand_generics
              require_relative "../lib/processor/cddl-expander.rb"
              cddl.expand_generics
            end
+           if $options.flattening
+             require_relative "../lib/processor/cddl-flattening.rb"
+             cddl.flattening
+             warn "*** done flattening" if $options.verbose
+           end
            cddl.rules
          else
-           warn "** can't expand in tree; use -r flag as well" if $options.expand_generics
            cddl.tree
          end
 

data/cddlc.gemspec

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

@@ -98,9 +98,9 @@ class CDDL
           end
         end.compact
       end
-      puts "FROM #{from.inspect}" if $options.verbose
-      puts "PREFERRED_TAG #{preferred_tag.inspect}" if $options.verbose
-      puts "DOCREF #{docref.inspect}" if $options.verbose
+      warn "FROM #{from.inspect}" if $options.verbose
+      warn "PREFERRED_TAG #{preferred_tag.inspect}" if $options.verbose
+      warn "DOCREF #{docref.inspect}" if $options.verbose
 
       fn = docref.downcase << ".cddl"
       io = CDDL.read_from_include_path(fn)
@@ -162,6 +162,7 @@ class CDDL
           end
           break unless got_more
           to_be_imported = cddl_undefined # XXX square...
+          warn "TO IMPORT #{to_be_imported.inspect}" if $options.verbose
           must_be_found = false
         end
         if preferred_tag

data/lib/parser/cddlgrammar.rb

@@ -947,7 +947,7 @@ module CDDLGRAMMAR
   end
 
   module Type214
-    def uint
+    def tag_number
       elements[1]
     end
   end
@@ -970,7 +970,7 @@ module CDDLGRAMMAR
   module Type216
     def ast
               el = elements[2].elements
-              ["prim", 6, el && el[1].text_value.to_i, elements[5].ast]
+              ["prim", 6, el && el[1].ast, elements[5].ast]
             end
   end
 
@@ -1330,7 +1330,7 @@ module CDDLGRAMMAR
                         end
                         s48 << r49
                         if r49
-                          r50 = _nt_uint
+                          r50 = _nt_tag_number
                           s48 << r50
                         end
                         if s48.last
@@ -1476,6 +1476,85 @@ module CDDLGRAMMAR
     r0
   end
 
+  module TagNumber0
+    def ast() text_value.to_i end
+  end
+
+  module TagNumber1
+    def type
+      elements[1]
+    end
+
+  end
+
+  module TagNumber2
+    def ast() elements[1].ast end
+  end
+
+  def _nt_tag_number
+    start_index = index
+    if node_cache[:tag_number].has_key?(index)
+      cached = node_cache[:tag_number][index]
+      if cached
+        node_cache[:tag_number][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0 = index
+    r1 = _nt_uint
+    r1.extend(TagNumber0)
+    r1.extend(TagNumber0)
+    if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
+      r0 = r1
+    else
+      i2, s2 = index, []
+      if (match_len = has_terminal?("<", false, index))
+        r3 = true
+        @index += match_len
+      else
+        terminal_parse_failure('"<"')
+        r3 = nil
+      end
+      s2 << r3
+      if r3
+        r4 = _nt_type
+        s2 << r4
+        if r4
+          if (match_len = has_terminal?(">", false, index))
+            r5 = true
+            @index += match_len
+          else
+            terminal_parse_failure('">"')
+            r5 = nil
+          end
+          s2 << r5
+        end
+      end
+      if s2.last
+        r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
+        r2.extend(TagNumber1)
+        r2.extend(TagNumber2)
+      else
+        @index = i2
+        r2 = nil
+      end
+      if r2
+        r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
+        r0 = r2
+      else
+        @index = i0
+        r0 = nil
+      end
+    end
+
+    node_cache[:tag_number][start_index] = r0
+
+    r0
+  end
+
   def _nt_rangeop
     start_index = index
     if node_cache[:rangeop].has_key?(index)

data/lib/processor/cddl-expander.rb

@@ -42,7 +42,7 @@ class CDDL
       else
       end
     end
-    p @gen if $options.verbose
+    warn "@gen = #{@gen.inspect}" if $options.verbose
     @gen.each do |k, v|
       parmnames = v[0]
       fail unless rules[k] == ["parm", parmnames, v[1]]
@@ -53,7 +53,7 @@ class CDDL
       fail if Array === name
       @new_rules[name] = expand_prod(prod)
     end
-    p @new_rules if $options.verbose
+    warn "@new_rules = #{@new_rules.inspect}" if $options.verbose
     @rules = @new_rules
   end
 end

data/lib/processor/cddl-flattening.rb

@@ -0,0 +1,99 @@
+require_relative "../cddlc.rb"
+require_relative "./cddl-visitor.rb"
+
+class CDDL
+  ID_RE = /\A[A-Za-z@_$]([-.]*[A-Za-z@_$0-9])*\z/
+  MOGRIFIED_ID_RE = /\A\$\.[A-Za-z@_$]([-.]*[A-Za-z@_$0-9])*\z/
+  def flattening_key_name(key, value, env = nil)
+    case key
+    in ["enum", ["mem", ["text", ID_RE => text], _]]
+      [false, text]
+    in ["text", ID_RE => text]
+      [false, text]
+    in ["number", /\A0|[-]?[1-9][0-9]*\z/ => intval] if env
+      [true, "$.#{env}$#{intval}"]
+    else
+      [false]
+    end
+  end
+  def flattening_occurrences
+    symtab = Hash.new { |h, k| h[k] = [] }
+    rules.each do |name, prod|
+      visit(prod) do |here|
+        case here
+        in ["mem", key, value]
+          _labeled, keyname = flattening_key_name(key, value, false)
+          if keyname
+            symtab[keyname] << [name, value]
+            false
+          end
+        else
+          false
+        end
+      end
+    end
+    symtab_replacements = Hash[symtab.map do |k, v|
+      s = Set[*v.map{_2}]
+      # warn "** #{k} #{s.inspect}"
+      if s.size == 1
+        [k, [[v.map{|k, v| k}.join("|"), s.first]]]
+      end
+    end.compact]
+    # warn "** symtab_replacements: #{symtab_replacements.inspect}" if $options.verbose
+    symtab.merge(symtab_replacements)
+  end
+  def flattening_mogrify(name, prod, symtab, alias_rules)
+    step1 = visit(prod) do |here|
+        case here
+        in ["mem", key, value]
+          ### mogrify
+          labeled, keyname = flattening_key_name(key, value, name)
+          if keyname
+            new_name =
+              unless labeled
+                syment = symtab[keyname]
+                fail keyname unless Array === syment
+                if syment.size == 1
+                  "$.#{keyname}"
+                else
+                  "$.#{name}$#{keyname}"
+                end
+              else
+                keyname
+              end
+            new_value2 = flattening_mogrify(new_name, value, symtab, alias_rules)
+            if ar = alias_rules[new_name]
+              fail [:ALIAS_RULES, ar, new_value].inspect if ar != new_value2
+            else
+              alias_rules[new_name] = new_value2
+            end
+            [true, ["mem", key, ["name", new_name]]]
+          end
+        else
+          false
+        end
+      end
+    step2 = visit(step1) do |here|
+      case here
+      in ["enum", ["mem", ["text", ID_RE], ["name", MOGRIFIED_ID_RE => new_name]]]
+        [true, ["name", new_name]]
+      else
+        false
+      end
+    end
+    step2
+  end
+  def flattening_replace(symtab)
+    alias_rules = {}
+    new_rules = Hash[rules.map do |name, prod|
+                       [name,
+                        flattening_mogrify(name, prod, symtab, alias_rules)]
+                     end]
+    new_rules.merge(alias_rules)
+  end
+  def flattening
+    symtab = flattening_occurrences
+    PP.pp(["*** SYMTAB", symtab], STDERR) if $options.verbose
+    rules.replace(flattening_replace(symtab))
+  end
+end

data/lib/processor/cddl-visitor.rb

@@ -31,7 +31,7 @@ class CDDL
       ["enum", visit(prod, &block)]
     in ["unwrap", prod]
       ["unwrap", visit(prod, &block)] # XXX, this may need to be bottled in a rule
-    in ["prim", Array => prod, *prods]
+    in ["prim", prod, *prods]
       ["prim", visit(prod, &block), *visit_all(prods, &block)]
     in ["mem", *prods]
       ["mem", *visit_all(prods, &block)]

data/lib/writer/cddl-writer.rb

@@ -68,6 +68,8 @@ class CDDL
       [4, "##{maj}.#{min}"]
     in ["prim", 6, Integer => tag, type]
       [4, "#6.#{tag}(#{write_rhs(type, 0, indent, pn)})"]
+    in ["prim", 6, Array => tag, type]
+      [4, "#6.<#{write_rhs(tag, 0, indent, pn)}>(#{write_rhs(type, 0, indent, pn)})"]
     in ["prim", 6, nil, type]
       [4, "#6(#{write_rhs(type, 0, indent, pn)})"]
 # prim: extension for #6.<i>(t)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cddlc
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-05 00:00:00.000000000 Z
+date: 2023-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -101,6 +101,7 @@ files:
 - lib/parser/cddl-util.rb
 - lib/parser/cddlgrammar.rb
 - lib/processor/cddl-expander.rb
+- lib/processor/cddl-flattening.rb
 - lib/processor/cddl-undefined.rb
 - lib/processor/cddl-visitor.rb
 - lib/writer/cddl-writer.rb