cddlc 0.2.7 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9b2369e311571fc7dd58410f31098071ff75e8d53c144d3a478bc957945d7ae
-  data.tar.gz: 326423811614449c38fb1af24e5a2fae1fa1cb4e467084f024e62c9cd514ac62
+  metadata.gz: 9ac6c49d6e3aae903f307b8ca75486ec8a0654bbf9bcb8ce77cfbc32d58b97a2
+  data.tar.gz: 04c26c80b59ca309c68d0a1ff7e1236f50ddcc10f2aab7d6eddc0c09d5a3f698
 SHA512:
-  metadata.gz: 0eac4ccf86acb957e9abf0eba253a61e07de25a84aea3f6a34e547a9e77b80e8d22f9ecbf106404d272920be114dea28074e65aa59eb2081e72dde942b28a8b3
-  data.tar.gz: 03f7f303c48ae86ab3d99ecff74f9ddf7c07d23ec60660611aec0b734f62790f7f1a26f1b8f758950f7ae2414d5b734f30bd97352df4f1b6782b046f3117a0de
+  metadata.gz: e99d700012b8c6211ee051e20399271ee9e765f92c835eb0c567880b3cf05f343f26c8ab4b28535641f98020916a2ea6b4ccb73f55c61375771f7fc68cbd69f9
+  data.tar.gz: fd110edebea03f2ebd07e3e670e2861c24caeff9758ecf40edefc4a73034933f22c17b183eff86babb2421472fe9fa10938710ac6965e36a9a1efa36dd7f30a9

data/cddlc.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "cddlc"
-  s.version = "0.2.7"
+  s.version = "0.3.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/parser/cddlgrammar.rb

@@ -947,7 +947,7 @@ module CDDLGRAMMAR
   end
 
   module Type214
-    def tag_number
+    def head_number
       elements[1]
     end
   end
@@ -975,26 +975,42 @@ module CDDLGRAMMAR
   end
 
   module Type217
-    def uint
+    def head_number
       elements[1]
     end
   end
 
   module Type218
+  end
+
+  module Type219
+    def ast
+              el = elements[2].elements
+              ["prim", 7, *el && [el[1].ast]]
+            end
+  end
+
+  module Type220
+    def uint
+      elements[1]
+    end
+  end
+
+  module Type221
     def DIGIT
       elements[1]
     end
 
   end
 
-  module Type219
+  module Type222
     def ast
               ["prim", elements[1].text_value.to_i,
                *(el = elements[2].elements) ? [el[1].text_value.to_i] : []]
             end
   end
 
-  module Type220
+  module Type223
     def ast() ["prim"] end
   end
 
@@ -1330,7 +1346,7 @@ module CDDLGRAMMAR
                         end
                         s48 << r49
                         if r49
-                          r50 = _nt_tag_number
+                          r50 = _nt_head_number
                           s48 << r50
                         end
                         if s48.last
@@ -1402,7 +1418,13 @@ module CDDLGRAMMAR
                       end
                       s56 << r57
                       if r57
-                        r58 = _nt_DIGIT
+                        if (match_len = has_terminal?("7", false, index))
+                          r58 = true
+                          @index += match_len
+                        else
+                          terminal_parse_failure('"7"')
+                          r58 = nil
+                        end
                         s56 << r58
                         if r58
                           i60, s60 = index, []
@@ -1415,7 +1437,7 @@ module CDDLGRAMMAR
                           end
                           s60 << r61
                           if r61
-                            r62 = _nt_uint
+                            r62 = _nt_head_number
                             s60 << r62
                           end
                           if s60.last
@@ -1445,20 +1467,74 @@ module CDDLGRAMMAR
                         r56 = SyntaxNode.new(input, (index-1)...index) if r56 == true
                         r0 = r56
                       else
+                        i63, s63 = index, []
                         if (match_len = has_terminal?("#", false, index))
-                          r63 = instantiate_node(SyntaxNode,input, index...(index + match_len))
-                          r63.extend(Type220)
+                          r64 = true
                           @index += match_len
                         else
                           terminal_parse_failure('"#"')
+                          r64 = nil
+                        end
+                        s63 << r64
+                        if r64
+                          r65 = _nt_DIGIT
+                          s63 << r65
+                          if r65
+                            i67, s67 = index, []
+                            if (match_len = has_terminal?(".", false, index))
+                              r68 = true
+                              @index += match_len
+                            else
+                              terminal_parse_failure('"."')
+                              r68 = nil
+                            end
+                            s67 << r68
+                            if r68
+                              r69 = _nt_uint
+                              s67 << r69
+                            end
+                            if s67.last
+                              r67 = instantiate_node(SyntaxNode,input, i67...index, s67)
+                              r67.extend(Type220)
+                            else
+                              @index = i67
+                              r67 = nil
+                            end
+                            if r67
+                              r66 = r67
+                            else
+                              r66 = instantiate_node(SyntaxNode,input, index...index)
+                            end
+                            s63 << r66
+                          end
+                        end
+                        if s63.last
+                          r63 = instantiate_node(SyntaxNode,input, i63...index, s63)
+                          r63.extend(Type221)
+                          r63.extend(Type222)
+                        else
+                          @index = i63
                           r63 = nil
                         end
                         if r63
                           r63 = SyntaxNode.new(input, (index-1)...index) if r63 == true
                           r0 = r63
                         else
-                          @index = i0
-                          r0 = nil
+                          if (match_len = has_terminal?("#", false, index))
+                            r70 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+                            r70.extend(Type223)
+                            @index += match_len
+                          else
+                            terminal_parse_failure('"#"')
+                            r70 = nil
+                          end
+                          if r70
+                            r70 = SyntaxNode.new(input, (index-1)...index) if r70 == true
+                            r0 = r70
+                          else
+                            @index = i0
+                            r0 = nil
+                          end
                         end
                       end
                     end
@@ -1476,27 +1552,27 @@ module CDDLGRAMMAR
     r0
   end
 
-  module TagNumber0
+  module HeadNumber0
     def ast() text_value.to_i end
   end
 
-  module TagNumber1
+  module HeadNumber1
     def type
       elements[1]
     end
 
   end
 
-  module TagNumber2
+  module HeadNumber2
     def ast() elements[1].ast end
   end
 
-  def _nt_tag_number
+  def _nt_head_number
     start_index = index
-    if node_cache[:tag_number].has_key?(index)
-      cached = node_cache[:tag_number][index]
+    if node_cache[:head_number].has_key?(index)
+      cached = node_cache[:head_number][index]
       if cached
-        node_cache[:tag_number][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:head_number][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -1504,8 +1580,8 @@ module CDDLGRAMMAR
 
     i0 = index
     r1 = _nt_uint
-    r1.extend(TagNumber0)
-    r1.extend(TagNumber0)
+    r1.extend(HeadNumber0)
+    r1.extend(HeadNumber0)
     if r1
       r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
       r0 = r1
@@ -1535,8 +1611,8 @@ module CDDLGRAMMAR
       end
       if s2.last
         r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
-        r2.extend(TagNumber1)
-        r2.extend(TagNumber2)
+        r2.extend(HeadNumber1)
+        r2.extend(HeadNumber2)
       else
         @index = i2
         r2 = nil
@@ -1550,7 +1626,7 @@ module CDDLGRAMMAR
       end
     end
 
-    node_cache[:tag_number][start_index] = r0
+    node_cache[:head_number][start_index] = r0
 
     r0
   end

data/lib/writer/cddl-writer.rb

@@ -64,8 +64,10 @@ class CDDL
       [4, "#"]
     in ["prim", maj]
       [4, "##{maj}"]
-    in ["prim", maj, min]
+    in ["prim", maj, Integer => min]
       [4, "##{maj}.#{min}"]
+    in ["prim", 7, Array => min]
+      [4, "##{maj}.<#{write_rhs(min, 0, indent, pn)}>"]
     in ["prim", 6, Integer => tag, type]
       [4, "#6.#{tag}(#{write_rhs(type, 0, indent, pn)})"]
     in ["prim", 6, Array => tag, type]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cddlc
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.3.1
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-26 00:00:00.000000000 Z
+date: 2024-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler