cddlc 0.1.7 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d56a7033911531ad73966b0807a1c6b9d9c09b9b09638d43274337e067a02fa
-  data.tar.gz: 609ab555ddc49c64a1dde396b99e01b2c79fd9a4fb63b1efb19ccd0ba3a311c1
+  metadata.gz: ea4f2c1a1ecedae6a543bebad045a0063e3b7103b757306a8f1da1fea694c3ca
+  data.tar.gz: 247a51f6016e133358fb37e524e0692eec3c84104ea63137b9549e3164ff65ad
 SHA512:
-  metadata.gz: c704b7fbc908dd1449a6c267936bea906f689852d54b54291fc8a2bc4ca62c39b2e947223da42069343e5d1b28e997907ffeb451d528c5436a7a96f82de17498
-  data.tar.gz: 8e9f965b91b31eae2986a5e4c621dc0048bb64308017ec917d1a7b90853b9c6322674eaf4ef034905c8f0c555791e5664112cb905b03255fe72b857f57830f67
+  metadata.gz: 1d039d6618590fea6f3baaf19888583afdddcab37887cb4e9fb24b56c1fcf52455964426c8ea8325f2d57fa67e19008c05de791278664c094e3da500455387d8
+  data.tar.gz: be73e1a03f41bb0052eac06e1fac77bddb3ef55eade8e2b8f0e4c9f625cd5c7bd928a5b464a693e07826521135bd402583d32d801908a95c2749c9f3508eb253

data/bin/cddlc

@@ -15,7 +15,7 @@ def named_keys(tree)
   when "rep"
     named_keys(tree[3])
   when "mem"
-    key = tree[1]
+    key = tree[2]
     if Array === key && key[0] == "name"
       [key[1]]
     end

data/cddlc.gemspec

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

@@ -55,6 +55,7 @@ class CDDL
   SAFE_FN = /\A[-._a-zA-Z0-9]+\z/
   IMPINC = /\A(?:import|include)\z/
   IDENTIFIER_RE = /\A[A-Za-z@_$]([-.]*[A-Za-z@_$0-9])*\z/
+  INT_RE = /\A0|[-]?[1-9][0-9]*\z/
 
   def self.from_cddl(s)
     ast = @@parser.parse s

data/lib/parser/cddlgrammar.rb

@@ -1812,7 +1812,9 @@ module CDDLGRAMMAR
   end
 
   module Grpent2
-    def ast() repwrap(elements[0], ["mem", elements[1].elements ? elements[1].memberkey.ast : nil, elements[2].ast]) end
+    def ast()
+     repwrap(elements[0], ["mem", *elements[1].elements ? elements[1].memberkey.ast : [false, nil],
+                                  elements[2].ast]) end
   end
 
   module Grpent3
@@ -2012,7 +2014,7 @@ module CDDLGRAMMAR
   end
 
   module Memberkey2
-    def ast() type1.ast end
+    def ast() [!!elements[2].elements, type1.ast] end
   end
 
   module Memberkey3
@@ -2027,7 +2029,7 @@ module CDDLGRAMMAR
   end
 
   module Memberkey4
-    def ast() ["text", bareword.text_value] end
+    def ast() [true, ["text", bareword.text_value]] end
   end
 
   module Memberkey5
@@ -2042,7 +2044,7 @@ module CDDLGRAMMAR
   end
 
   module Memberkey6
-    def ast() value.ast end
+    def ast() [true, value.ast] end
   end
 
   def _nt_memberkey
@@ -3148,15 +3150,9 @@ module CDDLGRAMMAR
           r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
           r0 = r3
         else
-          if has_terminal?(@regexps[gr = '\A[€-􏿽]'] ||= Regexp.new(gr), :regexp, index)
-            r4 = instantiate_node(SyntaxNode,input, index...(index + 1))
-            r4.extend(SCHAR3)
-            r4.extend(SCHAR3)
-            @index += 1
-          else
-            terminal_parse_failure('[€-􏿽]')
-            r4 = nil
-          end
+          r4 = _nt_NONASCII
+          r4.extend(SCHAR3)
+          r4.extend(SCHAR3)
           if r4
             r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
             r0 = r4
@@ -3951,40 +3947,46 @@ module CDDLGRAMMAR
         r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
         r0 = r2
       else
-        if has_terminal?(@regexps[gr = '\A[\\]-􏿽]'] ||= Regexp.new(gr), :regexp, index)
+        if has_terminal?(@regexps[gr = '\A[\\]-~]'] ||= Regexp.new(gr), :regexp, index)
           r3 = true
           @index += 1
         else
-          terminal_parse_failure('[\\]-􏿽]')
+          terminal_parse_failure('[\\]-~]')
           r3 = nil
         end
         if r3
           r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
           r0 = r3
         else
-          r4 = _nt_SESC
+          r4 = _nt_NONASCII
           if r4
             r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
             r0 = r4
           else
-            if (match_len = has_terminal?("\\'", false, index))
-              r5 = instantiate_node(SyntaxNode,input, index...(index + match_len))
-              @index += match_len
-            else
-              terminal_parse_failure('"\\\\\'"')
-              r5 = nil
-            end
+            r5 = _nt_SESC
             if r5
               r5 = SyntaxNode.new(input, (index-1)...index) if r5 == true
               r0 = r5
             else
-              r6 = _nt_CRLF
+              if (match_len = has_terminal?("\\'", false, index))
+                r6 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+                @index += match_len
+              else
+                terminal_parse_failure('"\\\\\'"')
+                r6 = nil
+              end
               if r6
                 r6 = SyntaxNode.new(input, (index-1)...index) if r6 == true
                 r0 = r6
               else
-                @index = i0
-                r0 = nil
+                r7 = _nt_CRLF
+                if r7
+                  r7 = SyntaxNode.new(input, (index-1)...index) if r7 == true
+                  r0 = r7
+                else
+                  @index = i0
+                  r0 = nil
+                end
               end
             end
           end
@@ -4623,11 +4625,49 @@ module CDDLGRAMMAR
       r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
       r0 = r1
     else
-      if has_terminal?(@regexps[gr = '\A[€-􏿽]'] ||= Regexp.new(gr), :regexp, index)
+      r2 = _nt_NONASCII
+      if r2
+        r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
+        r0 = r2
+      else
+        @index = i0
+        r0 = nil
+      end
+    end
+
+    node_cache[:PCHAR][start_index] = r0
+
+    r0
+  end
+
+  def _nt_NONASCII
+    start_index = index
+    if node_cache[:NONASCII].has_key?(index)
+      cached = node_cache[:NONASCII][index]
+      if cached
+        node_cache[:NONASCII][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0 = index
+    if has_terminal?(@regexps[gr = '\A[ -퟿]'] ||= Regexp.new(gr), :regexp, index)
+      r1 = true
+      @index += 1
+    else
+      terminal_parse_failure('[ -퟿]')
+      r1 = nil
+    end
+    if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
+      r0 = r1
+    else
+      if has_terminal?(@regexps[gr = '\A[-􏿽]'] ||= Regexp.new(gr), :regexp, index)
         r2 = true
         @index += 1
       else
-        terminal_parse_failure('[€-􏿽]')
+        terminal_parse_failure('[-􏿽]')
         r2 = nil
       end
       if r2
@@ -4639,7 +4679,7 @@ module CDDLGRAMMAR
       end
     end
 
-    node_cache[:PCHAR][start_index] = r0
+    node_cache[:NONASCII][start_index] = r0
 
     r0
   end

data/lib/processor/cddl-flattening.rb

@@ -2,15 +2,14 @@ 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], _]]
+    in ["enum", ["mem", _cut, ["text", IDENTIFIER_RE => text], _]]
       [false, text]
-    in ["text", ID_RE => text]
+    in ["text", IDENTIFIER_RE => text]
       [false, text]
-    in ["number", /\A0|[-]?[1-9][0-9]*\z/ => intval] if env
+    in ["number", INT_RE => intval] if env
       [true, "$.#{env}$#{intval}"]
     else
       [false]
@@ -21,7 +20,7 @@ class CDDL
     rules.each do |name, prod|
       visit(prod) do |here|
         case here
-        in ["mem", key, value]
+        in ["mem", _cut, key, value]
           _labeled, keyname = flattening_key_name(key, value, false)
           if keyname
             symtab[keyname] << [name, value]
@@ -45,7 +44,7 @@ class CDDL
   def flattening_mogrify(name, prod, symtab, alias_rules)
     step1 = visit(prod) do |here|
         case here
-        in ["mem", key, value]
+        in ["mem", cut, key, value]
           ### mogrify
           labeled, keyname = flattening_key_name(key, value, name)
           if keyname
@@ -67,7 +66,7 @@ class CDDL
             else
               alias_rules[new_name] = new_value2
             end
-            [true, ["mem", key, ["name", new_name]]]
+            [true, ["mem", cut, key, ["name", new_name]]]
           end
         else
           false
@@ -75,7 +74,7 @@ class CDDL
       end
     step2 = visit(step1) do |here|
       case here
-      in ["enum", ["mem", ["text", ID_RE], ["name", MOGRIFIED_ID_RE => new_name]]]
+      in ["enum", ["mem", _cut, ["text", IDENTIFIER_RE], ["name", MOGRIFIED_ID_RE => new_name]]]
         [true, ["name", new_name]]
       else
         false

data/lib/processor/cddl-visitor.rb

@@ -33,8 +33,8 @@ class CDDL
       ["unwrap", visit(prod, &block)] # XXX, this may need to be bottled in a rule
     in ["prim", prod, *prods]
       ["prim", visit(prod, &block), *visit_all(prods, &block)]
-    in ["mem", *prods]
-      ["mem", *visit_all(prods, &block)]
+    in ["mem", cut, *prods]
+      ["mem", cut, *visit_all(prods, &block)]
     in ["rep", s, e, prod]
       ["rep", s, e, visit(prod, &block)]
     else

data/lib/writer/cddl-writer.rb

@@ -90,10 +90,14 @@ class CDDL
                 "#{s}*#{e || ""}"
               end
       [1, "#{occur}#{write_rhs(group, 2, indent, pn)}"]
-    in ["mem", nil, t2]
+    in ["mem", false, nil, t2]
       [2, write_rhs(t2, 2, indent, pn)]
-    in ["mem", t1, t2]
-      [2, "#{write_rhs(t1, 3, indent, pn)} => #{write_rhs(t2, 2, indent, pn)}"]
+    in ["mem", true, ["text", IDENTIFIER_RE => bareword], t2]
+      [2, "#{bareword}: #{write_rhs(t2, 2, indent, pn)}"]
+    in ["mem", true, ["number", INT_RE => bareword], t2]
+      [2, "#{bareword}: #{write_rhs(t2, 2, indent, pn)}"]
+    in ["mem", cut, t1, t2]
+      [2, "#{write_rhs(t1, 3, indent, pn)} #{cut ? "^" : ""}=> #{write_rhs(t2, 2, indent, pn)}"]
       # 2->3: work around cddl tool limitation
     in ["bytes", t]
       [4, t]                    # XXX not very clean

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cddlc
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.1
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-11 00:00:00.000000000 Z
+date: 2023-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -124,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: CDDL (Concise Data Definition Language) converters and miscellaneous tools