cddlc 0.2.5 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dcc0bfbc969c582b8e4e40d841a908e514a9255b98215a0b90a658bcde763737
-  data.tar.gz: 82399e691f628b544bc236c1a4648ff36e977f075501235f1e07cfeac3cee6ed
+  metadata.gz: f9b2369e311571fc7dd58410f31098071ff75e8d53c144d3a478bc957945d7ae
+  data.tar.gz: 326423811614449c38fb1af24e5a2fae1fa1cb4e467084f024e62c9cd514ac62
 SHA512:
-  metadata.gz: e07d69bb1e25bbcf081cc8693429e489ed537712ace54ad14fcec31fb852ca630337d8617e00d380a0a2930ab1f9443feb02294e38e4d63c5af737960bf4e59e
-  data.tar.gz: 22ccbe0f63ee9675522c3303463d28e30381e535eee4431ca1696412b24b576580705ef3e6fc84c4978bc868367014aa9d33c71574f4b00e4cc7f60d0ac904f9
+  metadata.gz: 0eac4ccf86acb957e9abf0eba253a61e07de25a84aea3f6a34e547a9e77b80e8d22f9ecbf106404d272920be114dea28074e65aa59eb2081e72dde942b28a8b3
+  data.tar.gz: 03f7f303c48ae86ab3d99ecff74f9ddf7c07d23ec60660611aec0b734f62790f7f1a26f1b8f758950f7ae2414d5b734f30bd97352df4f1b6782b046f3117a0de

data/bin/cddlc

@@ -64,7 +64,7 @@ begin
     opts.on("-2", "--[no-]cddl2", "Perform some CDDL 2.0 processing") do |v|
       $options.cddl2 = v
     end
-    opts.on("-tFMT", "--to=FMT", [:basic, :neat, :json, :yaml, :enum, :cddl], "Target format") do |v|
+    opts.on("-tFMT", "--to=FMT", [:basic, :neat, :json, :yaml, :const, :enum, :cddl], "Target format") do |v|
       $options.target = v
     end
     opts.on("-sRULE", "--start=RULE", String, "Start rule name") do |v|
@@ -152,6 +152,9 @@ when :neat, :json
   puts JSON.neat_generate(result, after_comma: 1, after_colon: 1)
 when :yaml
   puts result.to_yaml
+when :const
+  require_relative "../lib/processor/cddl-constants.rb"
+  puts cddl.extract_constants.to_yaml
 when :enum
   rules = cddl.rules
   rules.each do |k, v|

data/cddlc.gemspec

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

@@ -0,0 +1,27 @@
+require_relative "../cddlc.rb"
+require_relative "./cddl-visitor.rb"
+
+class CDDL
+  def constant_evaluate(rhs)
+    case rhs
+    in ["number", n]
+      [true, eval(n)]
+    in ["text", n]
+      [true, n]
+    in ["name", n]
+      if nv = rules[n]
+        constant_evaluate(nv)
+      end
+    else
+      [false]
+    end
+  end
+  def extract_constants
+    nr = {}
+    rules.each do |k, v|
+      isconstant, value = constant_evaluate(v)
+      nr[k] = value if isconstant
+    end
+    nr
+  end
+end

data/lib/processor/cddl-flattening.rb

@@ -61,12 +61,14 @@ class CDDL
                 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
+            new_name2 = new_name
+            n = 0
+            while ar = alias_rules[new_name2] and ar != new_value2
+              n += 1
+              new_name2 = new_name << "@" << n.to_s
             end
-            [true, ["mem", cut, key, ["name", new_name]]]
+            alias_rules[new_name2] = new_value2
+            [true, ["mem", cut, key, ["name", new_name2]]]
           end
         else
           false
@@ -74,8 +76,8 @@ class CDDL
       end
     step2 = visit(step1) do |here|
       case here
-      in ["enum", ["mem", _cut, ["text", IDENTIFIER_RE], ["name", MOGRIFIED_ID_RE => new_name]]]
-        [true, ["name", new_name]]
+      in ["enum", ["mem", _cut, ["text", IDENTIFIER_RE], ["name", MOGRIFIED_ID_RE => new_name2]]]
+        [true, ["name", new_name2]]
       else
         false
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cddlc
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.7
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-27 00:00:00.000000000 Z
+date: 2024-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -105,6 +105,7 @@ files:
 - lib/cddlc.rb
 - lib/parser/cddl-util.rb
 - lib/parser/cddlgrammar.rb
+- lib/processor/cddl-constants.rb
 - lib/processor/cddl-expander.rb
 - lib/processor/cddl-flattening.rb
 - lib/processor/cddl-undefined.rb