cddl 0.12.8 → 0.12.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d0d87a6a4651bea40e4aa0cf6f348ba14820b187e75543534ba9dc41c299d19
-  data.tar.gz: 0b75c2f9aad67bf11b5d44035248515aa974c13ab11882d4fdc92422e21ec8b9
+  metadata.gz: 49a1d0bc5804fcc0cc5d3a67b3b6754e917146021043b63fb53de148e568029b
+  data.tar.gz: ab3c7a943a3d8acf7f557f1f796ca30de5572417ea5bb7ad198edf6453ceed4c
 SHA512:
-  metadata.gz: bc92be11473ad0aa9aae359359fb726981335f3f60ecb8537a8a756d1659336752a3394b9ada51326896e1a149653460619cb9da4a254f8b342ca7f180376f83
-  data.tar.gz: dfdc532498dd3f52e2ff34e880aa9f5c0bef46ffb85081f62e085625d74c5359c860fcae06adaa970d6b003a6cc5825a8d815b580f5d575f9d8d012dcdecff2c
+  metadata.gz: e395661ff52a4dd30cfa8e22275c1a247f0ffbe24643a568c431372b7ed86a487ce6d2334cdbe07786e96e0931ed265c653e03c65917a3f82e5b5bdb1046e77b
+  data.tar.gz: b022f002061187c6d35312e4e9339dcc01b7b7da3a25f536e8789463f7dd0ec070df99e3ccba93e06e267a3ec938725c05301e3331f60cbb0d441f3be379fab3

data/cddl.gemspec

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

data/lib/cddl.rb

@@ -40,6 +40,7 @@ module CDDL
                    [{}, {}]
                  end
 
+    CDDL_UNUSED_OK = ENV["CDDL_UNUSED_OK"]
 
     class BackTrack < Exception; end
 
@@ -248,7 +249,7 @@ module CDDL
       r_process("used_in_cddl_prelude", @rules["used_in_cddl_prelude"])
       @rules.each do |n, r|
       #   r_process(n, r)     # debug only loop
-        warn "*** Unused rule #{n}" unless @stage1[n]
+        warn "*** Unused rule #{n}" unless @stage1[n] || CDDL_UNUSED_OK
       end
       if result[0] == :grpent
         warn "Group at top -- first rule must be a type!"
@@ -625,7 +626,13 @@ module CDDL
           end
           content = JSON::dump(generate1(control))
           content
-        when :decimal
+        when :decimal, :base10
+          if conop == :decimal
+            unless @decimal_warned
+              warn "** .decimal control operator is now called .base10"
+              @decimal_warned = true
+            end
+          end
           unless target == [:prim, 3]
             fail "Don't know yet how to generate #{where}"
           end
@@ -1199,7 +1206,14 @@ module CDDL
             end
           when :json
             ann if validate1((JSON::load(d) rescue :BAD_JSON), control)
-          when :decimal
+          when :decimal, :base10
+            if conop == :decimal
+              unless @decimal_warned
+                warn "** .decimal control operator is now called .base10"
+                @decimal_warned = true
+              end
+            end
+
             ann if (
                 if /\A0|-?[1-9][0-9]*\z/ === d
                   validate1((d.to_i rescue :BAD_JSON), control)
@@ -1740,7 +1754,7 @@ module CDDL
                              :within, :and,
                              :default, :lt, :le, :gt, :ge, :eq, :ne,
                              :feature, :abnf, :abnfb, :det, :cat, :plus,
-                             :json, :decimal, :join,
+                             :json, :decimal, :base10, :join,
                              :b64u, :"b64u-sloppy", :b64c, :"b64c-sloppy",
                              :b45, :b32, :h32, :hex, :hexlc, :hexuc,
                              :printf,

data/test-data/decimal-warn.cddl

@@ -0,0 +1 @@
+s = [text .decimal 4711, text .base10 4712]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cddl
 version: !ruby/object:Gem::Version
-  version: 0.12.8
+  version: 0.12.10
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-26 00:00:00.000000000 Z
+date: 2025-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cbor-diag
@@ -184,6 +184,7 @@ files:
 - test-data/cose.cddl
 - test-data/dcaf.cddl
 - test-data/dcaf1.cddl
+- test-data/decimal-warn.cddl
 - test-data/decimal.cddl
 - test-data/decimal2.cddl
 - test-data/det1.cddl