cddl 0.8.23 → 0.8.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 900cef2acf86b7e14cd7c6b534b590862452c75b79c8244126dab0a2a91dc809
-  data.tar.gz: 6107b03e4c7ac8f7cdedde604a1ae84198d0709b3147674775998d17d3ead00e
+  metadata.gz: a2c1f0547764e58450c649bbea75add7bdced3de13d209e2889245f9f93ccc32
+  data.tar.gz: '053925690f1ff8bd8511aaf7879fb0c6ff012357e2b5cb2f66d268e7c8ee6e3d'
 SHA512:
-  metadata.gz: 4daecf273c14c8f3be89fbbe0a02522c7d53509adc25aeca23b2466387b10506503e8d8b7d23647d9eecaacc4fac154a8ca859bc54294599fc775e581bfa7eb2
-  data.tar.gz: 8d7cf1307dcad944255ef2c83bfda804c88b250145b3ae949954fb865412bf61edd3e0e24e76729a554e92da93a86406c1b6a7e275c99b81bdd06743dca823a9
+  metadata.gz: 340381df7522af59ae8bdf637dd7a0731e623f0d36645592c6d1488d2a247d88e612850884f20a27940b9aa66e5174a931ef7d0575ba04bb412070a635706083
+  data.tar.gz: 64ef37b0a90f0b569fc24dfecf3c968296ac3a07602638ee48cf62273d7eecad801d28a1a83efe3b4db1a2ae9234cf97d703a02292ffafdaf480320440a5840a

data/cddl.gemspec

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

data/lib/cddl.rb

@@ -790,7 +790,7 @@ module CDDL
                   true
                 end
               }
-            end and count >= s  # XXX save error indication
+            end and validate_result(count >= s) { "not enough #{ta.inspect} for #{r.inspect}" }
           end
           end
         else

data/test-data/complex-occ.cddl

@@ -0,0 +1,11 @@
+foo = {
+  2*4 any => any
+}
+
+;;sed -n 's/^; //p' complex-occ.cddl | sh
+; echo '{}' | cddl complex-occ.cddl v -
+; echo '{"1": 2}' | cddl complex-occ.cddl v -
+; echo '{"1": 2, "2": 3}' | cddl complex-occ.cddl v -
+; echo '{"1": 2, "2": 3, "3": 4}' | cddl complex-occ.cddl v -
+; echo '{"1": 2, "2": 3, "3": 4, "4": 5}' | cddl complex-occ.cddl v -
+; echo '{"1": 2, "2": 3, "3": 4, "4": 5, "5": 6}' | cddl complex-occ.cddl v -

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cddl
 version: !ruby/object:Gem::Version
-  version: 0.8.23
+  version: 0.8.24
 platform: ruby
 authors:
 - Carsten Bormann
@@ -127,6 +127,7 @@ files:
 - test-data/bpv7b.cddl
 - test-data/cat-re.cddl
 - test-data/cdni-ct.cddl
+- test-data/complex-occ.cddl
 - test-data/coral.cddl
 - test-data/coral1.cddl
 - test-data/coral2.cddl