cddlc 0.2.4 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee5782e163037658b00ecdca15da1a80d779406426f98a25e2d88888f713fd3b
-  data.tar.gz: fa784df9fbf17c6ed73108f6dc139771edb46d21fae1276d935deba15580a2dc
+  metadata.gz: d9a2b5efd82c91f2fc158bfffdb79adc0c2cd31def11dccb6ec986c61985556f
+  data.tar.gz: 8c663966329be0e8b0648c794c9be4e9af773ed2072dae35080c0182db9957ad
 SHA512:
-  metadata.gz: d146016f0cc89d76678b737920898f599346bfe342b01e42af79f6a2f20c7dd986ed22b4239097f54f80e685e60de1d4735342315b99fbd014a632af82ff70e4
-  data.tar.gz: 05cfab1f81f76fda3882ec8b10d2952df94c41bba86de4f9fbc3285b20a2bf01a45dc6a6641c478a8dbcf91a0c2d90adee2669fa7717469e42318ce380e320c7
+  metadata.gz: 45eb92c7c2f2185cabcdbf49d869ea31dceef60f45fbafb3bccc2c31a57cde096e62a10542b8e389618c4db31d33734201075fc9ec7235b21ced54e0823ea855
+  data.tar.gz: 2e1d13a69f257316054ac9866082d12f39289c587ec0049a7be5ccc89abba187ae64012e2e14a0a0d62473e92a2681dd5109105c8bd8e3e8a6f502dfaab2b634

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.4"
+  s.version = "0.2.6"
   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/parser/cddlgrammar.rb

@@ -3185,7 +3185,14 @@ module CDDLGRAMMAR
   end
 
   module SESC2
-    def ast() JSON.load("\"\\#{elements[1].text_value}\"") end
+    def ast
+                    tv = elements[1].text_value
+                    if /\Au\{(\h+)\}/ =~ tv
+                      $1.hex.chr(Encoding::UTF_8)
+                    else
+                      JSON.load("\"\\#{tv}\"")
+                    end
+                  end
   end
 
   def _nt_SESC
@@ -3350,6 +3357,12 @@ module CDDLGRAMMAR
   end
 
   module Hexchar0
+  end
+
+  module Hexchar1
+  end
+
+  module Hexchar2
     def high_surrogate
       elements[0]
     end
@@ -3371,51 +3384,138 @@ module CDDLGRAMMAR
     end
 
     i0 = index
-    r1 = _nt_non_surrogate
-    if r1
-      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
-      r0 = r1
+    i1, s1 = index, []
+    if (match_len = has_terminal?("{", false, index))
+      r2 = true
+      @index += match_len
     else
-      i2, s2 = index, []
-      r3 = _nt_high_surrogate
-      s2 << r3
+      terminal_parse_failure('"{"')
+      r2 = nil
+    end
+    s1 << r2
+    if r2
+      i3 = index
+      i4, s4 = index, []
+      s5, i5 = [], index
+      loop do
+        if (match_len = has_terminal?("0", false, index))
+          r6 = true
+          @index += match_len
+        else
+          terminal_parse_failure('"0"')
+          r6 = nil
+        end
+        if r6
+          s5 << r6
+        else
+          break
+        end
+      end
+      if s5.empty?
+        @index = i5
+        r5 = nil
+      else
+        r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
+      end
+      s4 << r5
+      if r5
+        r8 = _nt_hexscalar
+        if r8
+          r7 = r8
+        else
+          r7 = instantiate_node(SyntaxNode,input, index...index)
+        end
+        s4 << r7
+      end
+      if s4.last
+        r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
+        r4.extend(Hexchar0)
+      else
+        @index = i4
+        r4 = nil
+      end
+      if r4
+        r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
+        r3 = r4
+      else
+        r9 = _nt_hexscalar
+        if r9
+          r9 = SyntaxNode.new(input, (index-1)...index) if r9 == true
+          r3 = r9
+        else
+          @index = i3
+          r3 = nil
+        end
+      end
+      s1 << r3
       if r3
-        if (match_len = has_terminal?("\\", false, index))
-          r4 = true
+        if (match_len = has_terminal?("}", false, index))
+          r10 = true
           @index += match_len
         else
-          terminal_parse_failure('"\\\\"')
-          r4 = nil
+          terminal_parse_failure('"}"')
+          r10 = nil
         end
-        s2 << r4
-        if r4
-          if (match_len = has_terminal?("u", false, index))
-            r5 = true
+        s1 << r10
+      end
+    end
+    if s1.last
+      r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
+      r1.extend(Hexchar1)
+    else
+      @index = i1
+      r1 = nil
+    end
+    if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
+      r0 = r1
+    else
+      r11 = _nt_non_surrogate
+      if r11
+        r11 = SyntaxNode.new(input, (index-1)...index) if r11 == true
+        r0 = r11
+      else
+        i12, s12 = index, []
+        r13 = _nt_high_surrogate
+        s12 << r13
+        if r13
+          if (match_len = has_terminal?("\\", false, index))
+            r14 = true
             @index += match_len
           else
-            terminal_parse_failure('"u"')
-            r5 = nil
+            terminal_parse_failure('"\\\\"')
+            r14 = nil
           end
-          s2 << r5
-          if r5
-            r6 = _nt_low_surrogate
-            s2 << r6
+          s12 << r14
+          if r14
+            if (match_len = has_terminal?("u", false, index))
+              r15 = true
+              @index += match_len
+            else
+              terminal_parse_failure('"u"')
+              r15 = nil
+            end
+            s12 << r15
+            if r15
+              r16 = _nt_low_surrogate
+              s12 << r16
+            end
           end
         end
-      end
-      if s2.last
-        r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
-        r2.extend(Hexchar0)
-      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
+        if s12.last
+          r12 = instantiate_node(SyntaxNode,input, i12...index, s12)
+          r12.extend(Hexchar2)
+        else
+          @index = i12
+          r12 = nil
+        end
+        if r12
+          r12 = SyntaxNode.new(input, (index-1)...index) if r12 == true
+          r0 = r12
+        else
+          @index = i0
+          r0 = nil
+        end
       end
     end
 
@@ -3840,6 +3940,152 @@ module CDDLGRAMMAR
     r0
   end
 
+  module Hexscalar0
+  end
+
+  module Hexscalar1
+    def HEXDIG1
+      elements[0]
+    end
+
+  end
+
+  def _nt_hexscalar
+    start_index = index
+    if node_cache[:hexscalar].has_key?(index)
+      cached = node_cache[:hexscalar][index]
+      if cached
+        node_cache[:hexscalar][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0 = index
+    i1, s1 = index, []
+    if (match_len = has_terminal?("10", false, index))
+      r2 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+      @index += match_len
+    else
+      terminal_parse_failure('"10"')
+      r2 = nil
+    end
+    s1 << r2
+    if r2
+      s3, i3 = [], index
+      loop do
+        r4 = _nt_HEXDIG
+        if r4
+          s3 << r4
+        else
+          break
+        end
+        if s3.size == 4
+          break
+        end
+      end
+      if s3.size < 4
+        @index = i3
+        r3 = nil
+      else
+        if s3.size < 4
+          @terminal_failures.pop
+        end
+        r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
+      end
+      s1 << r3
+    end
+    if s1.last
+      r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
+      r1.extend(Hexscalar0)
+    else
+      @index = i1
+      r1 = nil
+    end
+    if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
+      r0 = r1
+    else
+      i5, s5 = index, []
+      r6 = _nt_HEXDIG1
+      s5 << r6
+      if r6
+        s7, i7 = [], index
+        loop do
+          r8 = _nt_HEXDIG
+          if r8
+            s7 << r8
+          else
+            break
+          end
+          if s7.size == 4
+            break
+          end
+        end
+        if s7.size < 4
+          @index = i7
+          r7 = nil
+        else
+          if s7.size < 4
+            @terminal_failures.pop
+          end
+          r7 = instantiate_node(SyntaxNode,input, i7...index, s7)
+        end
+        s5 << r7
+      end
+      if s5.last
+        r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
+        r5.extend(Hexscalar1)
+      else
+        @index = i5
+        r5 = nil
+      end
+      if r5
+        r5 = SyntaxNode.new(input, (index-1)...index) if r5 == true
+        r0 = r5
+      else
+        r9 = _nt_non_surrogate
+        if r9
+          r9 = SyntaxNode.new(input, (index-1)...index) if r9 == true
+          r0 = r9
+        else
+          s10, i10 = [], index
+          loop do
+            r11 = _nt_HEXDIG
+            if r11
+              s10 << r11
+            else
+              break
+            end
+            if s10.size == 3
+              break
+            end
+          end
+          if s10.size < 1
+            @index = i10
+            r10 = nil
+          else
+            if s10.size < 3
+              @terminal_failures.pop
+            end
+            r10 = instantiate_node(SyntaxNode,input, i10...index, s10)
+          end
+          if r10
+            r10 = SyntaxNode.new(input, (index-1)...index) if r10 == true
+            r0 = r10
+          else
+            @index = i0
+            r0 = nil
+          end
+        end
+      end
+    end
+
+    node_cache[:hexscalar][start_index] = r0
+
+    r0
+  end
+
   module Bytes0
   end
 
@@ -4407,6 +4653,104 @@ module CDDLGRAMMAR
     r0
   end
 
+  def _nt_HEXDIG1
+    start_index = index
+    if node_cache[:HEXDIG1].has_key?(index)
+      cached = node_cache[:HEXDIG1][index]
+      if cached
+        node_cache[:HEXDIG1][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0 = index
+    r1 = _nt_DIGIT1
+    if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
+      r0 = r1
+    else
+      if (match_len = has_terminal?("a", :insens, index))
+        r2 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+        @index += match_len
+      else
+        terminal_parse_failure('"A"')
+        r2 = nil
+      end
+      if r2
+        r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
+        r0 = r2
+      else
+        if (match_len = has_terminal?("b", :insens, index))
+          r3 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+          @index += match_len
+        else
+          terminal_parse_failure('"B"')
+          r3 = nil
+        end
+        if r3
+          r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
+          r0 = r3
+        else
+          if (match_len = has_terminal?("c", :insens, index))
+            r4 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+            @index += match_len
+          else
+            terminal_parse_failure('"C"')
+            r4 = nil
+          end
+          if r4
+            r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
+            r0 = r4
+          else
+            if (match_len = has_terminal?("d", :insens, index))
+              r5 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+              @index += match_len
+            else
+              terminal_parse_failure('"D"')
+              r5 = nil
+            end
+            if r5
+              r5 = SyntaxNode.new(input, (index-1)...index) if r5 == true
+              r0 = r5
+            else
+              if (match_len = has_terminal?("e", :insens, index))
+                r6 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+                @index += match_len
+              else
+                terminal_parse_failure('"E"')
+                r6 = nil
+              end
+              if r6
+                r6 = SyntaxNode.new(input, (index-1)...index) if r6 == true
+                r0 = r6
+              else
+                if (match_len = has_terminal?("f", :insens, index))
+                  r7 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+                  @index += match_len
+                else
+                  terminal_parse_failure('"F"')
+                  r7 = nil
+                end
+                if r7
+                  r7 = SyntaxNode.new(input, (index-1)...index) if r7 == true
+                  r0 = r7
+                else
+                  @index = i0
+                  r0 = nil
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+
+    node_cache[:HEXDIG1][start_index] = r0
+
+    r0
+  end
+
   def _nt_BINDIG
     start_index = index
     if node_cache[:BINDIG].has_key?(index)

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.4
+  version: 0.2.6
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-14 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