cddlc 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30602affec27761888bf5f3094ac596e21cbf80fa9726f2476210ed8b419b981
-  data.tar.gz: 4742739b320591da0f59be4732d4c0957acbfc80a1ca699caeda5943007b3d0a
+  metadata.gz: 2d56a7033911531ad73966b0807a1c6b9d9c09b9b09638d43274337e067a02fa
+  data.tar.gz: 609ab555ddc49c64a1dde396b99e01b2c79fd9a4fb63b1efb19ccd0ba3a311c1
 SHA512:
-  metadata.gz: 9a726e557db0da91370c0c3f22ab31fc7f494d0c6902874b8129c3afb40bffd95855d7785be15f105a3cdc62831a79048daa919f714267e83bd372cf3c455bd1
-  data.tar.gz: a1b74234c1195480fa40eb2e298dcbb2450c07e12e282fbb0606733cf60c716f280a224f33ba5f9baa9e80d0cb1829dff526bbe78f492ae9e7f30a1bff8cc68b
+  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.6"
+  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/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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cddlc
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-10 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