cddl 0.10.7 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd34ee2aa2fc9a5d0d504d0dc48222f4e94722b4e19086d4932b8bcc82980e92
-  data.tar.gz: b397db50185a9f899c6b3d4bc9ce63946a1f57c6989cb7cf55215eb1d6da9868
+  metadata.gz: 73391c15e100fe86614bce5277a63cf8d7032754e7a7e05f8eb4cc1ce074beae
+  data.tar.gz: 26734d7b7677595eb88b9f970b5d4986991cc1afc9841bc9c3c1f3bc5237c4a8
 SHA512:
-  metadata.gz: 96be7107033f0e3ef5da1ee747738bcd712eeb5af8230e11f128d64d0649920c8d15f5f4a13c5ccfb0ececad19dac7da1a145337f6e1a322ffe3573d7af4c689
-  data.tar.gz: d3edd46ef0698fde296cb18509101f98700568c942652e77e6d36abdd7a9a79e27d2fb920a3a5efc46160466feff0ecaa0ae0fda45411a94d234ed4ace037deb
+  metadata.gz: 151f3e6374672a6b1c4211363ac90a7fb46814639f45d65a7fc85722c9b48cbc73d4e1919a8a3ddba574e4957f1b74b9d8105fdb0bb697f351a9069af222d742
+  data.tar.gz: 5d33838dfc0ff62d14f736d14108936100e638f5a1b73c5af9119a81a1ab7264369ce8059c95223347c756d4e73e7d38cd975ac8ae3387ed259e65edeee75610

data/cddl.gemspec

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

data/data/cddl.abnf

@@ -13,7 +13,8 @@ genericarg = "<" S type1 S *("," S type1 S ) ">"
 type = type1 S *("/" S type1 S)
 
 type1 = type2 [S (rangeop / annotator) S type2]
-     / "#" "6" ["." tagnumber] "(" S type S ")" ; note no space!
+     / "#" "6" ["." headnumber] "(" S type S ")" ; note no space!
+     / "#" "7" ["." headnumber]             ; note no space!
      / "#" DIGIT ["." uint]                ; major/ai
      / "#"                                 ; any
      / "~" S typename [genericarg]
@@ -22,7 +23,7 @@ type1 = type2 [S (rangeop / annotator) S type2]
      / "&" S "(" S group S ")"
      / "&" S groupname [genericarg]
 
-tagnumber = uint / ("<" type ">")
+headnumber = uint / ("<" type ">")
 
 type2 = value
       / typename [genericarg]

data/lib/cddl.rb

@@ -2,6 +2,7 @@ require 'abnc'
 require 'pp'
 require 'pathname'
 require 'cbor-pure' unless defined?(CBOR::Tagged)
+require 'half'
 require 'cbor-deterministic'
 require 'regexp-examples'
 require 'abnftt'
@@ -429,7 +430,11 @@ module CDDL
           end
           CBOR::Tagged.new(tn, generate1(where[3]))
         when 7
-          case where[2]
+          w2 = where[2]
+          if Array === w2
+            w2 = generate1(w2)
+          end
+          case w2
           when nil
             Math::PI
           when 20
@@ -439,9 +444,21 @@ module CDDL
           when 22
             nil
           when 0..19, 23, 32..255
-            CBOR::Simple.new(where[2])
-          when 25, 26, 27
-            rand()
+            CBOR::Simple.new(w2)
+          when 25
+            while !(hs = Half.encode_from_single_bytes([rand()].pack("g")))
+            end
+            Half.decode(hs)
+          when 26
+            while (a = [rand()].pack("g").unpack("g").first).to_cbor.size != 5
+            end
+            a
+          when 27
+            while (a = rand()).to_cbor.size != 9
+            end
+            a
+          else
+            fail "Can't generate prim #7.#{where[2].inspect}" # XXX retry array generate
           end
         else
           fail "Can't generate prim #{where[1]}"
@@ -710,17 +727,24 @@ module CDDL
       [:prim, 7, 22] => [true, nil, :nil],
     }
     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)        # []
       if vt = VALUE_TYPE[t[0]]
         [true, t[1], vt]
-      elsif v = SIMPLE_VALUE[t]
-        v
+      elsif t[0] == :prim && t[1] == 7
+        case t2 = t[2]
+        when Integer
+        when Array
+          a, b, c = extract_value(t2)
+          if a && c == Integer
+            t2 = b
+          end
+        end
+        if v = SIMPLE_VALUE[[:prim, 7, t2]]
+          v
+        elsif SIMPLE_VALUE_SIMPLE === t2
+          [true, CBOR::Simple.new(t2), :simple]
+        end
       elsif t[0] == :anno
         _, conop, target, control = t
         # warn ["EXV0", conop, target, control].inspect
@@ -968,6 +992,7 @@ module CDDL
     end
 
     OPERATORS = {lt: :<, le: :<=, gt: :>, ge: :>=, eq: :==, ne: :!=}
+    FLOAT_AI_FROM_SIZE = {3 => 25, 5 => 26, 9 => 27}
 
     def validate1(d, where)
       if ENV["CDDL_TRACE"]
@@ -1023,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
@@ -1235,12 +1266,25 @@ module CDDL
           if t
             v.eql? d
           else
-            case where[2]
+            case w2 = where[2]
             when nil
-              # XXX
-              fail [:valnil, d, where].inspect
+              Float === d || CBOR::Simple === d || [false, true, nil].include?(d)
+            when Array
+              headnum = case d
+                        when Float
+                          FLOAT_AI_FROM_SIZE[d.to_cbor.size]
+                        when false
+                          20
+                        when true
+                          21
+                        when nil
+                          22
+                        when CBOR::Simple
+                          d.value
+                        end
+              validate1a(headnum, w2)
             when 25, 26, 27
-              Float === d
+              Float === d && FLOAT_AI_FROM_SIZE[d.to_cbor.size] == w2
             else
               fail [:val7, d, where].inspect
             end
@@ -1589,7 +1633,7 @@ module CDDL
         when /\A#(\d+)/
           maj = $1.to_i
           s = [:prim, maj, *n.children(:uint).map(&:to_s).map(&:to_i)]
-          if tn = n.tagnumber
+          if tn = n.headnumber
             if ui = tn.uint
               s << ui.to_s.to_i
             elsif tt = tn.type

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.10.7
+  version: 0.11.2
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-26 00:00:00.000000000 Z
+date: 2024-03-05 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