cddl 0.6.2 → 0.6.3

data/test/test-cddl.rb

@@ -434,7 +434,7 @@ test = {
   ?(bar: int // bar: true)
 }
 HERE
-    pp parser.rules
+    # pp parser.rules
     parser.validate({})
     10.times {
       g = parser.generate
@@ -511,7 +511,7 @@ test = [
 bar = (5 // 6)
 HERE
     # puts parser.ast_debug
-    pp parser.rules
+    # pp parser.rules
     10.times {
       g = parser.generate
       pp ["gcia", g]
@@ -1256,10 +1256,12 @@ HERE
     # puts "empty_group_sp AST:"
     # puts parser.ast_debug
     # puts "simple_type_augmented RULES:"
-    pp parser.rules
-    g = parser.generate
-    pp g
-    assert parser.validate(g)
+    # pp parser.rules
+    10.times do
+      g = parser.generate
+      # pp g
+      assert parser.validate(g)
+    end
     assert parser.validate({"seq" => 1, "ack" => 2})
   end
 
@@ -1324,4 +1326,64 @@ HERE
       refute parser2.validate(g << 1, false)
     }
   end
+
+  def test_aaa_grpchoice
+    parser = CDDL::Parser.new <<HERE
+result = [2*2 identifier]
+identifier //= ( "ifmap" // "ifmap")
+;identifier = ( "ifmap" // "ifmap" )
+HERE
+    p parser.rules
+    # - [:type1, [:array, [:member, 2, 2, nil, [:grpchoice, [[:member, 1, 1, nil, [:string, "ifmap"]]]]]]]
+    # - [:type1, [:array, [:member, 2, 2, nil, [:grpchoice, [[:grpchoice, [[:member, 1, 1, nil, [:string, "ifmap"]]], [[:member, 1, 1, nil, [:string, "ifmap"]]]]]]]]]
+    # + [:type1, [:array, [:member, 2, 2, nil, [:grpent, [:grpchoice, [[:member, 1, 1, nil, [:string, "ifmap"]]], [[:member, 1, 1, nil, [:string, "ifmap"]]]]]]]]
+    g = parser.generate
+    assert_equal g, ["ifmap", "ifmap"]
+  end
+
+  def test_aaaa_plus_with_choice
+    parser = CDDL::Parser.new <<HERE
+response = [*locator / divert]
+locator = 3
+divert = 4
+HERE
+    assert_equal [:type1, [:array, [:member, 0, CDDL::MANY, nil, [:type1, [:int, 3], [:int, 4]]]]], parser.rules
+    parser = CDDL::Parser.new <<HERE
+response = [*(locator / divert)]
+locator = 3
+divert = 4
+HERE
+    assert_equal [:type1, [:array, [:member, 0, CDDL::MANY, nil, [:type1, [:int, 3], [:int, 4]]]]], parser.rules
+    parser = CDDL::Parser.new <<HERE
+response = [*locator // divert // objective]
+locator = 3
+divert = 4
+objective = 5
+HERE
+    assert_equal [:type1, [:array, [:grpchoice, [[:member, 0, CDDL::MANY, nil, [:int, 3]]], [[:member, 1, 1, nil, [:int, 4]]], [[:member, 1, 1, nil, [:int, 5]]]]]], parser.rules
+    # 10.times do
+    #   p parser.generate
+    # end
+    parser = CDDL::Parser.new <<HERE
+response = [*locator // divert / objective]
+locator = 3
+divert = 4
+objective = 5
+HERE
+    assert_equal [:type1, [:array, [:grpchoice, [[:member, 0, CDDL::MANY, nil, [:int, 3]]], [[:member, 1, 1, nil, [:type1, [:int, 4], [:int, 5]]]]]]], parser.rules
+    # 10.times do
+    #   p parser.generate
+    # end
+  end
+
+  
+  def test_aaaaa_false_map_values
+    parser = CDDL::Parser.new <<HERE
+a = {a: nil}
+HERE
+    g = parser.generate
+    assert parser.validate(g)
+    assert_equal g, {"a" => nil}
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cddl
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-12 00:00:00.000000000 Z
+date: 2015-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cbor-diag
@@ -91,6 +91,8 @@ files:
 - cddl.gemspec
 - data/cddl.abnf
 - data/prelude.cddl
+- lib/cbor-pp-play.rb
+- lib/cbor-pp.rb
 - lib/cddl.rb
 - test-data/7071-concise.cddl
 - test-data/7071-verbose.cddl
@@ -98,8 +100,13 @@ files:
 - test-data/b.cddl
 - test-data/basic_syntax_example.cddl
 - test-data/cdni-ct.cddl
+- test-data/dcaf.cddl
 - test-data/dcaf1.cddl
+- test-data/grasp-v1.cddl
+- test-data/grasp-v2X.cddl
 - test-data/ifmap-base-2.0v17.cddl
+- test-data/ifmap-base-2.2v9_fh-cabo.cddl
+- test-data/ifmap-metadata-2.2v9_fh-cabo.cddl
 - test-data/ifmap2.cddl
 - test-data/jcr-ex.cddl
 - test-data/minimal.cddl
@@ -137,3 +144,4 @@ signing_key:
 specification_version: 4
 summary: CDDL generator and validator.
 test_files: []
+has_rdoc: