cddl 0.12.4 → 0.12.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f150cc0a1db8532ed33bd7e9cfde5aa93a32883a4bf9ea7c0197e281acebd4ed
-  data.tar.gz: af5a579a6465b21134583986899ba003b68f55964a92105b977da7765a9d5eaa
+  metadata.gz: '0165296a8cb6db3edb52eca36db6650700b336e9b56be7fb43441d6689e1000b'
+  data.tar.gz: 18774d6257ec95b81e3ba6abfc2d1abf982ce0f2d79f1a12298e3b59c0fd407d
 SHA512:
-  metadata.gz: 4cc593dfeac8e95d31d563e098c0cdefc786a25e95245b30f2554a6a2b07fcd75476051e55ddcf350724a7ac5f69b5823b296d771d3bc2ad985c3770687d7727
-  data.tar.gz: d513213818f2b00f88864d799adea6495aa97a011da8a8f722f4091938ddd4d0bbfd27c75959fc893ad86fdbb079f93618442a93fafabb7e58b5ecdb59c87929
+  metadata.gz: d7c2bede49beaa2c5cfebad435573632aefe258ff460427e7fc5599e96c85039c913ab295fb0dba43baeba36acbb0e7b035cebbbe69e8d9ae3bb179a6cdf8a5c
+  data.tar.gz: be65be0e5c42a59203ca3956b5d89da5680df5dff1f8da6120f9bfaa28ac3a558e609655c68d4164e94fb87d40ccb3a832432a69e4c5eb3f0398b673b8ff38e5

data/cddl.gemspec

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

data/lib/cddl.rb

@@ -302,6 +302,12 @@ module CDDL
       abnfb: Encoding::BINARY
     }
 
+    def myfrand(exp)
+      exprange = 1 << exp
+      expoffset= exprange >> 1
+      (rand(2)*2-1) * rand() * 2.0**(rand(exprange)-expoffset)
+    end
+
     def generate
       @recursion = 0
       generate1(rules)
@@ -446,15 +452,15 @@ module CDDL
           when 0..19, 23, 32..255
             CBOR::Simple.new(w2)
           when 25
-            while !(hs = Half.encode_from_single_bytes([rand()].pack("g")))
+            while !(hs = Half.encode_from_single_bytes([myfrand(5)].pack("g")))
             end
             Half.decode(hs)
           when 26
-            while (a = [rand()].pack("g").unpack("g").first).to_cbor.size != 5
+            while (a = [myfrand(8)].pack("g").unpack("g").first).to_cbor.size != 5
             end
             a
           when 27
-            while (a = rand()).to_cbor.size != 9
+            while (a = myfrand(11)).to_cbor.size != 9
             end
             a
           else
@@ -1005,6 +1011,7 @@ module CDDL
     end
 
     OPERATORS = {lt: :<, le: :<=, gt: :>, ge: :>=, eq: :==, ne: :!=}
+    OPERATORS_MATCH = {eq: true, ne: false}
     FLOAT_AI_FROM_SIZE = {3 => 25, 5 => 26, 9 => 27}
 
     def validate1(d, where)
@@ -1135,6 +1142,11 @@ module CDDL
             ok, v, _vt = extract_value(control)
             if ok
               ann if d.send(op, v) rescue nil # XXX Focus ArgumentError
+            else
+              needs_to_match = OPERATORS_MATCH[conop]
+              unless needs_to_match.nil?
+                ann if !!validate1(d, control) == needs_to_match
+              end
             end
           when :regexp
             ann if (
@@ -1428,6 +1440,10 @@ module CDDL
                                else
                                  [:type1]
                                end
+          elsif s = ENV["CDDL_INVENT"]
+            s = "_" if s == ""
+            r = [:type1, [:text, "#{s}-#{name}"]]
+            return r
           end
         end
         if r

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cddl
 version: !ruby/object:Gem::Version
-  version: 0.12.4
+  version: 0.12.6
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-17 00:00:00.000000000 Z
+date: 2024-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cbor-diag