cddl 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 167e4f338b7d73dd31d38e050c736fe9d8041984
-  data.tar.gz: 62c373480ad582423abcf9c5475371a11f08425b
+  metadata.gz: d81421c45b8589d98a0bee597ebf58684b6dc47d
+  data.tar.gz: 2c43ce26e9ec1061a91ffc078eb797293e6e861c
 SHA512:
-  metadata.gz: 6f26f2048e7a77f12175e23430bf1a0c5271deaa4e0d499683f1d25785aec4765b70966af4b7c155469f68a2db7cb9540658909da1764b6f3a221eed4dcfb92d
-  data.tar.gz: 7e922d96378421546a660cfda5c1dc3ff54efa5ee218767323e1015570f875e829c196e5a90e4115be42c504c9c7d2f51d73b5a8d05f7e14f7d5946886b97cce
+  metadata.gz: a59f236c132f7d3c4c20b20275270a304873abe3a0a527cd923a84d683ab953d59a65fa006f7de0c81de45c0d175bb86dcbb7abc680aa5f83e7753464d0dc8d6
+  data.tar.gz: 2724e39b65ff8d6b2de65845ae67a713276fd99743625f2745bc4d6a6c0433ae43f736d47e1741f5e4df936c5102f112e675e541cffa3991a98abb54e93c9b67

data/cddl.gemspec

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

data/lib/cddl.rb

@@ -14,6 +14,8 @@ module CDDL
 
   MANY = Float::INFINITY
 
+  MAX_RECURSE = 32              # XXX
+
   class ParseError < ArgumentError; end
 
   class Parser
@@ -119,14 +121,19 @@ module CDDL
       h[k] = Regexp.new("\\A#{k}\\z")
     }
 
-    def generate(where=rules, inmap = false)
+    def generate
+      @recursion = 0
+      generate1(rules)
+    end
+
+    def generate1(where, inmap = false)
       case where[0]
       when :type1
-        generate(where[rand(where.size-1)+1])
+        generate1(where[rand(where.size-1)+1])
       when :map
-        Hash[where[1..-1].flat_map {|m| generate(m, true)}]
+        Hash[where[1..-1].flat_map {|m| generate1(m, true)}]
       when :array, :grpent
-        r = where[1..-1].flat_map {|m| generate(m).map{|e| e[1]}}
+        r = where[1..-1].flat_map {|m| generate1(m).map{|e| e[1]}}
             .flat_map {|e| Array === e && e[0] == :grpent ? e[1..-1] : [e]}
                            # nested grpents need to be "unpacked"
         if where[0] == :grpent
@@ -141,8 +148,8 @@ module CDDL
         kr = where[3]
         vr = where[4]
         fail "member key not given in map for #{where}" unless kr if inmap
-        Array.new(st) { [ (generate(kr) if kr), # XXX: need error in map context
-                         generate(vr)
+        Array.new(st) { [ (generate1(kr) if kr), # XXX: need error in map context
+                         generate1(vr)
                        ]}
       when :string, :int, :float
         where[1]
@@ -161,7 +168,7 @@ module CDDL
         when 3
           gen_word
         when 6
-          CBOR::Tagged.new(where[2], generate(where[3]))
+          CBOR::Tagged.new(where[2], generate1(where[3]))
         when 7
           case where[2]
           when nil
@@ -185,13 +192,13 @@ module CDDL
         control = where[3]
         case where[1]
         when :size
-          should_be_int = generate(control)
+          should_be_int = generate1(control)
           unless target == [:prim, 2] && Integer === should_be_int
             fail "Don't know yet how to generate #{where}"
           end
           Random.new.bytes(should_be_int)
         when :bits
-          set_of_bits = Array.new(10) { generate(control) } # XXX: ten?
+          set_of_bits = Array.new(10) { generate1(control) } # XXX: ten?
           # p set_of_bits
           unless (target == [:prim, 0] || target == [:prim, 2]) &&
                  set_of_bits.all? {|x| Integer === x && x >= 0 }
@@ -213,7 +220,7 @@ module CDDL
             end
           end
         when :regexp
-          regexp = generate(control)
+          regexp = generate1(control)
           unless target == [:prim, 3] && String === regexp
             fail "Don't know yet how to generate #{where}"
           end
@@ -221,6 +228,17 @@ module CDDL
         else
           fail "Don't know yet how to generate from #{where}"
         end
+      when :recurse
+        name = where[1]
+        rule = @stage1[name]
+        if @recursion < MAX_RECURSE
+          @recursion += 1
+          r = generate1(rule)
+          @recursion -= 1
+          r
+        else
+          fail "Deep recursion into #{name}: #{@stage1[name]}, not yet implemented"
+        end
       else
         fail "Don't know how to generate from #{where[0]}"
       end
@@ -249,6 +267,7 @@ module CDDL
     end
 
     def validate(d, warn=true)
+      @recursion = 0
       result = validate1(d)
       unless result
         if warn
@@ -416,10 +435,20 @@ module CDDL
               fail
             end
           end
-
         else
           fail "Can't validate prim #{where[1]} yet"
         end
+      when :recurse
+        name = where[1]
+        rule = @stage1[name]
+        if @recursion < MAX_RECURSE
+          @recursion += 1
+          r = validate1(d, rule)
+          @recursion -= 1
+          r
+        else
+          fail "Deep recursion into #{name}: #{rule}, not yet implemented"
+        end
       else
         # fail where
       end
@@ -455,12 +484,15 @@ module CDDL
     end
 
     def r_process(n, r, bindings = {})
-      @bindings.push(bindings)
       t = r[0]
       # puts "Processing rule #{n} = #{t}"
-      r = @stage1[n] ||= [t, *r[1..-1].map {|e| send(t, e)}]
-      @bindings.pop
-      r
+      @stage1[n] ||= begin
+                       @stage1[n] = [:type1, [:recurse, n]]
+                       @bindings.push(bindings)
+                       r = [t, *r[1..-1].map {|e| send(t, e)}]
+                       @bindings.pop
+                       r
+                     end
     end
 
     def value(n)

data/test/test-cddl.rb

@@ -811,4 +811,23 @@ HERE
     }
   end
 
+  def test_endless_recursion
+    parser = CDDL::Parser.new <<HERE
+a = a
+HERE
+    assert_raise { parser.validate(1) }
+    assert_raise { parser.generate }
+  end
+
+  def test_recursion
+    parser = CDDL::Parser.new <<HERE
+a = [a] / 1
+HERE
+    10.times {
+      g = parser.generate
+      pp ["recurse-test", g]
+      assert parser.validate(g)
+    }
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cddl
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Carsten Bormann