cddl 0.8.5 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7338cde62dc12f53d0ebdef50710108d03570241
-  data.tar.gz: 6ab3c6679a1553bd36ad614dcd406855be6d3bd5
+SHA256:
+  metadata.gz: 8ba44459ee2f7bf888218b60e75e52c6dbf90b38cb498b3de091ae7e5e525213
+  data.tar.gz: 8fcb86e2209fb4264f55663a47a37a9b150347f32704af94f0be27357d012d18
 SHA512:
-  metadata.gz: 2d87a121c7ad9489dc74de6e6a09d05b4d303a1e6739ad887dcf142f03857079ddac3442add743916ffc580558aac800ef13f52685c68a28c54bc17206f65c93
-  data.tar.gz: 2ddc22986f4f623dff1d5bc793654a2c1f3482172fd1a4f90d30c172160d89cbc21c497ec5c48014968060e09f5ac378aaf58d24628aec7d1d8aea12a4cedd6c
+  metadata.gz: 65f7adeb64757a58a0b548a5c33fcf78ca0e3bb9ae442032d40ddc45c098de7471657437772f1fed07716bcb829467b75d8eaf4982ed04be78ce2abbca780684
+  data.tar.gz: 6274c24c143aed5cba8d35f17e0beab84fe6af515fd4e44c11133bf3296c68f84cbd8f526616ad6cc2b8ff397f56d60ea2cf16e1d09990dc7f9aec50be5929ef

data/cddl.gemspec

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

data/data/cddl.abnf

@@ -50,7 +50,9 @@ occur = [uint] "*" [uint]
       / "?"
 
 uint = ["0x" / "0b"] "0"
-     / ["0x" / "0b"] DIGIT1 *DIGIT
+     / DIGIT1 *DIGIT
+     / "0x" 1*HEXDIG
+     / "0b" 1*BINDIG
 
 value = number
       / text
@@ -77,6 +79,9 @@ ALPHA = %x41-5A / %x61-7A
 EALPHA = %x41-5A / %x61-7A / "@" / "_" / "$"
 DIGIT = %x30-39
 DIGIT1 = %x31-39
+HEXDIG = DIGIT / "A" / "B" / "C" / "D" / "E" / "F"
+BINDIG = %x30-31
+
 S = *WS
 WS = SP / NL
 SP = %x20

data/lib/cddl.rb

@@ -320,7 +320,8 @@ module CDDL
         end
       when :member
         st = where[1]
-        en = [where[2], [st, 4].max].min # truncate to 4 unless must be more
+        fudge = 4 * (1 - (@recursion / MAX_RECURSE.to_f))**3 # get less generate-happy with more recursion
+        en = [where[2], [st, fudge].max].min # truncate to fudge unless must be more
         st += rand(en + 1 - st) if en != st
         kr = where[3]
         vr = where[4]
@@ -526,7 +527,7 @@ module CDDL
       [:prim, 7, 23] => [true, :undefined, :undefined],
     }
 
-    def extract_value(t)
+    def extract_value(t)        # []
       if vt = VALUE_TYPE[t[0]]
         [true, t[1], vt]
       elsif v = SIMPLE_VALUE[t]
@@ -661,7 +662,7 @@ module CDDL
           # this is mostly quadratic; let's do the linear thing if possible
           simple, simpleval = extract_value(k)
           if simple
-            #              puts "SIMPLE: #{d_check.inspect} #{simpleval}"
+                          puts "SIMPLE: #{d_check.inspect} #{simpleval}"         if ENV["CDDL_TRACE"]
             # add occurrence check; check that val is present in the first place
             actual = d.fetch(simpleval, :not_found)
             if actual == :not_found
@@ -673,7 +674,7 @@ module CDDL
               end
             end
           else
-            #              puts "COMPLEX: #{k.inspect} #{simple.inspect} #{simpleval.inspect}"
+                          puts "COMPLEX: #{k.inspect} #{simple.inspect} #{simpleval.inspect}"         if ENV["CDDL_TRACE"]
             keys = d_check.keys
             ta, keys = keys.partition{ |key| validate1(key, k)}
             # XXX check ta.size against s/e
@@ -964,12 +965,12 @@ module CDDL
       else
         val = eval(n.to_s)
         # warn val
-        [case val
-         when Integer; :int
-         when Numeric; :float
-         when String; :text
+        case val
+         when Integer; [:int, val]
+         when Numeric; [:float, val]
+         when String; [:text, val.force_encoding(Encoding::UTF_8)]
          else fail "huh? value #{val.inspect}"
-         end, val]
+        end
       end
     end
 
@@ -1009,7 +1010,7 @@ module CDDL
             fail [n, n.children, mk, mk.children].inspect
           end
           name = bw.to_s
-          [[:member, *occ, [:text, name], type(nt)]]
+          [[:member, *occ, [:text, name.force_encoding(Encoding::UTF_8)], type(nt)]]
         end
       else
         t = if nbw = nt.bareword
@@ -1021,8 +1022,8 @@ module CDDL
             else
               type(nt, true)              # type can actually be a group here!
             end
-        # pp ["t is", t]
-        if t[0] == :grpent && (@insides.last != :array || occ == [1, 1])
+        pp ["t is", t]               if ENV["CDDL_TRACE"]
+        if t[0] == :grpent && (occ == [1, 1])
           # go through the members here and multiply the occs
           t1 = t[1..-1].flatten(1)
           if t1[0] == :recurse_grpent

data/test-data/ambig.cddl

@@ -0,0 +1,2 @@
+b = [ a ]
+a = uint

data/test-data/kevin5.cddl

@@ -0,0 +1,5 @@
+   top = { topgroup }
+
+   topgroup = ( first: tstr, second: tstr,
+            (option1: uint //
+            option2: uint) )

data/test-data/map-group.cddl

@@ -0,0 +1,13 @@
+map = {
+ first_group,
+ ? second_group,
+}
+
+first_group = ( e1, e2,)
+second_group = (e3, e4, e5)
+
+e1 = (1: uint)
+e2 = (2: tstr)
+e3 = (3: tdate)
+e4 = (4: tstr)
+e5 = (5: uint)

data/test-data/mapkey.cddl

@@ -0,0 +1,2 @@
+foo = { foo: bool, "foob" => bar, * tstr => uint }
+bar = "blba"

data/test-data/toerless0.cddl

@@ -0,0 +1,14 @@
+
+foo = { 1*relement }
+
+context-element = 4711
+
+relement = $$relement .within relement-generic
+
+relement-generic = ( relement-codepoint => relement-value ) ; [1]
+relement-codepoint = uint                            ; [1]
+relement-value     = any                             ; [1]
+
+$$relement //= ( &(sender-loop-count:1) => 1..255 )    ; [2]
+$$relement //= ( &(srv-element:2) => context-element ) ; [2]
+

data/test-data/toerless1.cddl

@@ -0,0 +1,11 @@
+foo = foo-specific .within foo-generic
+foo-specific = { 1*$$relement }
+foo-generic = { 1*relement-generic }
+
+relement-generic = ( relement-codepoint => relement-value ) ; [1]
+relement-codepoint = uint                            ; [1]
+relement-value     = any                             ; [1]
+
+$$relement //= ( &(sender-loop-count:1) => 1..255 )    ; [2]
+$$relement //= ( &(srv-element:2) => context-element ) ; [2]
+context-element = "and so on"

data/test/test-cddl.rb

@@ -59,9 +59,9 @@ class TestABNF < Test::Unit::TestCase
 
   def test_generate_hex_bin
     parser = CDDL::Parser.new <<HERE
-test = [0x4711, 0b1011001110001111000]
+test = [0x4711, 0xabcDEF, 0b1011001110001111000]
 HERE
-    assert_equal [0x4711, 0b1011001110001111000], parser.generate
+    assert_equal [0x4711, 0xabcDEF, 0b1011001110001111000], parser.generate
   end
 
   def test_generate_le
@@ -202,6 +202,54 @@ HERE
     assert parser.validate_for_test({"one" => 1, "two" => 1}, false)
   end
 
+  def test_validate_a_nontrivial_group_map
+    parser = CDDL::Parser.new <<HERE
+test = {* (text => 1, text => 2)}
+HERE
+    assert parser.validate_for_test({})
+    assert parser.validate_for_test({"one" => 2, "two" => 1})
+    assert parser.validate_for_test({"one" => 1, "two" => 2})
+    refute parser.validate_for_test({"one" => 1}, false)
+    assert parser.validate_for_test({"one" => 1, "two" => 2, "uno" => 1, "due" => 2})
+  end
+
+
+  def test_murray
+    parser = CDDL::Parser.new <<HERE
+a = {
+  b
+}
+
+b = (
+  (x: int // y: int), z: int
+)
+HERE
+    assert parser.validate_for_test({})
+    assert parser.validate_for_test({"x" => 2, "z" => 1})
+    assert parser.validate_for_test({"y" => 1, "z" => 2})
+    refute parser.validate_for_test({"z" => 1}, false)
+    assert parser.validate_for_test({"one" => 1, "two" => 2, "uno" => 1, "due" => 2})
+  end
+
+
+  def test_murray_workaround
+    parser = CDDL::Parser.new <<HERE
+a = {
+  b
+}
+
+b = ( z: int
+  (x: int // y: int)
+)
+HERE
+    assert parser.validate_for_test({})
+    assert parser.validate_for_test({"x" => 2, "z" => 1})
+    assert parser.validate_for_test({"y" => 1, "z" => 2})
+    refute parser.validate_for_test({"z" => 1}, false)
+    assert parser.validate_for_test({"one" => 1, "two" => 2, "uno" => 1, "due" => 2})
+  end
+
+
   def test_validate_a_string
     parser = CDDL::Parser.new <<HERE
 test = [* one: "one"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cddl
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-23 00:00:00.000000000 Z
+date: 2018-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cbor-diag
@@ -98,6 +98,7 @@ files:
 - test-data/7071-concise.cddl
 - test-data/7071-verbose.cddl
 - test-data/a.cddl
+- test-data/ambig.cddl
 - test-data/b.cddl
 - test-data/badaddr.cddl
 - test-data/basic_syntax_example.cddl
@@ -117,10 +118,15 @@ files:
 - test-data/ifmap-metadata-2.2v9_fh-cabo.cddl
 - test-data/ifmap2.cddl
 - test-data/jcr-ex.cddl
+- test-data/kevin5.cddl
+- test-data/map-group.cddl
+- test-data/mapkey.cddl
 - test-data/minimal.cddl
 - test-data/patch1.cddl
 - test-data/reused_named_group.cddl
 - test-data/structure.cddl
+- test-data/toerless0.cddl
+- test-data/toerless1.cddl
 - test-data/two_anonymous_groups.cddl
 - test-data/wrong1.cddl
 - test-data/wrong1a.cddl
@@ -148,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: CDDL generator and validator.