cddl 0.11.1 → 0.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b75dfee163242854b4a139d3a6e84710d9ac31702e57e502ac125b1b5e9dc944
-  data.tar.gz: 4a5360b99c364b7cd6c1aa518a332e79616e65331a95243ba2406a8d04712639
+  metadata.gz: 3e68a03fc0896c89695a52e04ab35f75b4db08bc04f59d02a07868872512c5d0
+  data.tar.gz: 3a590d814827221b6b66ed7ea3297592bb25c65f8a309aba51dd34544de1ae85
 SHA512:
-  metadata.gz: 1127b09451324ff3842890e59e077c96f3c248082c9dac7f194f453faf88d0c9ffc8e7326c8087677ec953c03b62cbe50e582a2d8362876e57375289453ab3e4
-  data.tar.gz: 74ce9832d9a84dd4204411beecd9b029ddb76eacbc9e09e2056512310cbdb4309d439360d9bc1bf6c86ca60a87b7ca3423f9ef8471481657bda327f816b4426b
+  metadata.gz: da7623036a6b440ff006bec0e3bc1bbac363a776194692339d9a869b561bc80bb576ac76315d902c1c4a95b0bbd52ce5e16b1fa4b53cc4bbaded48de0b3248b8
+  data.tar.gz: 743bae03497658a1e13e8da74f5bed3c5e1be6a9ff5e742f6724611d2b2efeac53fe45e8923e61f14d2c9c5ce6ca3af7f1178aa43490b5d343ea6b37dc655e5a

data/bin/cddl

@@ -7,10 +7,13 @@ require 'json'
 
 Encoding.default_external = "UTF-8" # wake up, smell the coffee
 
+CDDL_VERSION = Gem.loaded_specs["cddl"].version rescue "unknown-version"
+
 EX_USAGE = 64
 EX_DATAERR = 65
 
 def usage
+  warn "cddl tool version #{CDDL_VERSION}"
   warn "Usage:"
   warn "#$0 spec.cddl generate [n]"
   warn "#$0 spec.cddl json-generate [n]"

data/cddl.gemspec

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

data/lib/cddl.rb

@@ -1048,6 +1048,12 @@ module CDDL
             end
             # warn ["ANNO", ok1, v1, vt1, ok2, v2, vt2, d].inspect
             [] if d == v1 + v2  # XXX Focus ArgumentError
+          elsif conop == :plus && Integer === d
+            if ok1 && vt1 == Integer
+              validate1a(d - Integer(v1), control)
+            elsif ok2 && vt2 == Integer
+              validate1a(d - Integer(v2), target)
+            end
           end
         elsif ann = validate1a(d, target)
           case conop

data/test-data/dotplus1.cddl

@@ -0,0 +1,3 @@
+a = b<13..15>
+b<T> = #7.<32 .plus T>
+; cddl dotplus1.cddl gp 10

data/test-data/dotplus2.cddl

@@ -0,0 +1,3 @@
+a = d<17..19>
+d<T> = #7.<T .plus 32>
+; cddl dotplus.cddl gp 10

data/test-data/dotplus3.cddl

@@ -0,0 +1,3 @@
+a = d<17..19>
+d<T> = 32.5 .plus T
+; cddl dotplus4.cddl gp 10

data/test-data/dotplus4.cddl

@@ -0,0 +1,3 @@
+a = d<17..19>
+d<T> = T .plus 32.5
+; cddl dotplus4.cddl gp 10

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cddl
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.3
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-02 00:00:00.000000000 Z
+date: 2024-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cbor-diag
@@ -185,6 +185,10 @@ files:
 - test-data/decimal.cddl
 - test-data/decimal2.cddl
 - test-data/det1.cddl
+- test-data/dotplus1.cddl
+- test-data/dotplus2.cddl
+- test-data/dotplus3.cddl
+- test-data/dotplus4.cddl
 - test-data/dotsize.cddl
 - test-data/extractor-demo.cddl
 - test-data/feat1.cddl
@@ -280,7 +284,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.4
 signing_key:
 specification_version: 4
 summary: CDDL generator and validator.