cddl 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8059c1eece18e74a9f61203673b8e9650b90a41b
-  data.tar.gz: 2cbd8a2ffe191c1e63b65ecd8c1274c37d916eab
+  metadata.gz: 386a3cb063acd7d41cf0add52b2350a063056213
+  data.tar.gz: d21891d0fd81627d7b8e935e8d739ad9f6b8f4ed
 SHA512:
-  metadata.gz: 805dec239578ebd63c6d0ebd53f60bb15c7b536ed6ad7c08a796158f8046ba800557985f3995469a77ddb3c7fd89f67add4ce2c336073d87ecfa369ccbcaf654
-  data.tar.gz: 336f8a01af37ca9b6f40f7a06ed8193fc96acfab84123537e8a552eb64a8fffcd457c6c0bddd0e5b80cc7c864bce03405f65531ecc42e682971da9cbfb4f8bf9
+  metadata.gz: 78156a8375111291be6a625d8b2216a708632aeca2f2d1ad91f9bc08b4db01f5234b40191670b0a73116ae25cec5ccacaaa11253126e5de6825628a173030177
+  data.tar.gz: 4b1538133346cec19f7ff95f3ed2a5ef3dd00f480c7c662c16440fe63b1eedf433450815a4f8fb1ed01d093e24fd12b83f376e99b21bc073d544b05b390457af

data/cddl.gemspec

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

data/lib/cbor-pp.rb

@@ -188,6 +188,10 @@ class Hash # :nodoc:
   end
 end
 
+class Float                     # Hmm.
+  prepend CBOR::PP::EqlMixin
+end
+
 class Numeric
   prepend CBOR::PP::EqlMixin
 end

data/lib/cddl.rb

@@ -570,7 +570,7 @@ module CDDL
     def map_check(d, d_check, members)
       anno = []
       anno if members.all? { |r|
-        # puts "SUBRULE: #{r.inspect}"
+        puts "ALL SUBRULE: #{r.inspect}"         if ENV["CDDL_TRACE"]
         t, s, e, k, v = r
         case t
         when :recurse_grpent
@@ -580,8 +580,10 @@ module CDDL
           end
         when :grpchoice
           r[1..-1].any? {|cand|
+            puts "CHOICE SUBRULE: #{cand.inspect}"         if ENV["CDDL_TRACE"]
             cand_d_check = d_check.dup
             if ann2 = map_check(d, cand_d_check, cand)
+              puts "CHOICE SUBRULE SUCCESS: #{cand.inspect}"         if ENV["CDDL_TRACE"]
               d_check.replace(cand_d_check)
               anno.concat(ann2)
             end
@@ -606,12 +608,14 @@ module CDDL
             if occ >= s
               d_check.replace(d_check1)
               anno.concat(ann2)
-              return anno
+              puts "OCC SATISFIED: #{occ.inspect} >= #{s.inspect}" if ENV["CDDL_TRACE"]
+              anno
             else
               # leave some diagnostic breadcrumbs?
-              return false
+              puts "OCC UNSATISFIED: #{occ.inspect} < #{s.inspect}" if ENV["CDDL_TRACE"]
+              false
             end
-          end
+          else
           # this is mostly quadratic; let's do the linear thing if possible
           simple, simpleval = extract_value(k)
           if simple
@@ -638,6 +642,7 @@ module CDDL
               end
             }
           end
+          end
         else
           fail "Cannot validate #{t} in maps yet #{r}" # MMM
         end
@@ -656,8 +661,10 @@ module CDDL
     end
 
     def validate1(d, where)
-#      puts "DATA: #{d.inspect}"
-#      puts "RULE: #{where.inspect}"
+      if ENV["CDDL_TRACE"]
+        puts "DATA: #{d.inspect}"
+        puts "RULE: #{where.inspect}"
+      end
       # warn ["val1", d, where].inspect
       @last_data = d
       @last_rule = where
@@ -672,6 +679,10 @@ module CDDL
           d_check = d.dup
           if (ann = map_check(d, d_check, where[1..-1])) && d_check == {}
             ann
+          else
+            if ENV["CDDL_TRACE"]
+              puts "MAP RESIDUAL: #{d_check.inspect}"
+            end
           end
         end
       when :array
@@ -679,7 +690,7 @@ module CDDL
         if Array === d
           # validate1 against the record
           idx, ann = validate_forward(d, 0, where)
-          ann if validate_result(idx == d.size) { "cannot complete array #{d} for #{where}" }
+          ann if validate_result(idx == d.size) { "#{validate_diag.inspect} -- cannot complete (#{idx}, #{d.size}) array #{d} for #{where}" }
         end
       when :string, :int, :float
         _, v = extract_value(where)

data/test/test-cddl.rb

@@ -578,6 +578,15 @@ HERE
     refute parser.validate_for_test([1, 5, 4, 9, 10, 3], false)
   end
 
+  def test_aaaa_validate_number
+    parser = CDDL::Parser.new <<HERE
+test = number
+HERE
+    # pp parser.rules
+    assert parser.validate_for_test(1)
+    assert parser.validate_for_test(1.2)
+  end
+
   def test_validate_number_key
     parser = CDDL::Parser.new <<HERE
 test = [test1, test2, test3]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cddl
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-14 00:00:00.000000000 Z
+date: 2016-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cbor-diag