cddl 0.10.5 → 0.10.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3b0177b945919083ba2e0595570d098809b87839cb86e823dd54c62f225ad6b
-  data.tar.gz: 45302758ba30682f746f9b515cd293a5ac0883b2b126d6f74cd13a4911286e9e
+  metadata.gz: cd34ee2aa2fc9a5d0d504d0dc48222f4e94722b4e19086d4932b8bcc82980e92
+  data.tar.gz: b397db50185a9f899c6b3d4bc9ce63946a1f57c6989cb7cf55215eb1d6da9868
 SHA512:
-  metadata.gz: d613c36a0b4e7e1a18c68c1a2c5df9b0c46389936fdc063465bc8c130ba470b5c6467872fd55befa47972ea8cce8362f45a2164e2ee32c02539f29bd45fb1279
-  data.tar.gz: 6dca2e75e676eb00aba31e03671b2baf37568a2e4eb8fb0b506c8b02829efb88d6efda323891962e6ca3644be4added36482ee555bbf4d13565517c59cbaf397
+  metadata.gz: 96be7107033f0e3ef5da1ee747738bcd712eeb5af8230e11f128d64d0649920c8d15f5f4a13c5ccfb0ececad19dac7da1a145337f6e1a322ffe3573d7af4c689
+  data.tar.gz: d3edd46ef0698fde296cb18509101f98700568c942652e77e6d36abdd7a9a79e27d2fb920a3a5efc46160466feff0ecaa0ae0fda45411a94d234ed4ace037deb

data/cddl.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'cddl'
-  s.version = '0.10.5'
+  s.version = '0.10.7'
   s.summary = "CDDL generator and validator."
   s.description = %{A parser, generator, and validator for CDDL}
   s.add_dependency('cbor-diag')

data/lib/cddl.rb

@@ -438,8 +438,8 @@ module CDDL
             true
           when 22
             nil
-          when 23
-            :undefined
+          when 0..19, 23, 32..255
+            CBOR::Simple.new(where[2])
           when 25, 26, 27
             rand()
           end
@@ -708,7 +708,12 @@ module CDDL
       [:prim, 7, 20] => [true, false, :bool],
       [:prim, 7, 21] => [true, true, :bool],
       [:prim, 7, 22] => [true, nil, :nil],
-      [:prim, 7, 23] => [true, :undefined, :undefined],
+    }
+    SIMPLE_VALUE_SIMPLE = Set[23] + (0..19) + (32..255)
+    SIMPLE_VALUE.default_proc = proc { |hash, t|
+      if t[0] == :prim && t[1] == 7 && SIMPLE_VALUE_SIMPLE.include?(t[2])
+        [true, CBOR::Simple.new(t[2]), :simple]
+      end
     }
 
     def extract_value(t)        # []
@@ -1233,11 +1238,11 @@ module CDDL
             case where[2]
             when nil
               # XXX
-              fail
+              fail [:valnil, d, where].inspect
             when 25, 26, 27
               Float === d
             else
-              fail
+              fail [:val7, d, where].inspect
             end
           end
         else
@@ -1583,7 +1588,7 @@ module CDDL
           [:prim]
         when /\A#(\d+)/
           maj = $1.to_i
-          s = [:prim, maj]
+          s = [:prim, maj, *n.children(:uint).map(&:to_s).map(&:to_i)]
           if tn = n.tagnumber
             if ui = tn.uint
               s << ui.to_s.to_i

data/test-data/prim.cddl

@@ -0,0 +1,7 @@
+start = [a, e, b, c, d]
+a = false
+e = undefined
+b = float32
+; c = #7.32
+c = #6.<12>(3)
+d = #6.13(4)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cddl
 version: !ruby/object:Gem::Version
-  version: 0.10.5
+  version: 0.10.7
 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: cbor-diag
@@ -235,6 +235,7 @@ files:
 - test-data/oidbat.cddl
 - test-data/patch1.cddl
 - test-data/plus.cddl
+- test-data/prim.cddl
 - test-data/printf.cddl
 - test-data/printf0.cddl
 - test-data/printf1.cddl