cddl 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 393b811831045b4c855ad1f27ba0fa410c6e5278
-  data.tar.gz: 8f28e4e50d8a408b1ef43c13b90c6c8c00c6d99c
+  metadata.gz: 8e2adafcd62e2e19c64d3b561c3f4fa020551ded
+  data.tar.gz: 42cfe0856afa556943bdcf10c8805bf9acf87d13
 SHA512:
-  metadata.gz: 73d8c3fb4b67680d74eeb9ea2b91dc84e9b23410a5ee4f8fb253dddfccbf3531114fece3c2d4008e36cd171c7f833567141690a856f3a41684dfb14f0d227cdf
-  data.tar.gz: 1402b3fd3b79bc6f1c69627125886ef9d59a1693d1c65c76883d79f982551f94af2332cc35eec9f8141100bb8e086a079542677551d2c209ff704b405dc9469a
+  metadata.gz: 3e3aaa3ec40b05a3b0afb50a13e7cf169c33cb55634289379bc481a7831fc4faf490536828097e490a172a776dc7b2c30f3b83f975595dfdc857f5b15f8c4988
+  data.tar.gz: 30308d4da1eb610ebba0d9fd67906b4615a2d701bed333a0afc4695b92d2c2a49f0a6819c61a58784c26e834e57ea496f6aaf214c314c274624bd553aec25c75

data/cddl.gemspec

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

data/data/cddl.abnf

@@ -34,7 +34,7 @@ group = grpchoice S *("//" S grpchoice S)
 grpchoice = *grpent
 
 grpent = [occur S] [memberkey S] type optcom
-       / [occur S] groupname [genericarg] optcom ; always preempted by previous...
+       / [occur S] groupname [genericarg] optcom   ; preempted by previous
        / [occur S] "(" S group S ")" optcom
 
 memberkey = type1 S "=>"

data/lib/cddl.rb

@@ -236,9 +236,14 @@ module CDDL
         vr = where[4]
         if inmap
           unless kr
-            if vr[0] == :grpent
+            case vr[0]
+            when :grpent
               fail "grpent in map #{vr.inspect}" unless vr.size == 2
-              g = generate1(vr[1], true)
+              g = Array.new(st) { generate1(vr[1], true) }.flatten(1)
+              # warn "GGG #{g.inspect}"
+              return g
+            when :grpchoice
+              g = Array.new(st) { generate1(vr, true) }.flatten(1)
               # warn "GGG #{g.inspect}"
               return g
             else
@@ -448,10 +453,17 @@ module CDDL
           }
         when :member
           unless k
-            fail "member name not known for group entry #{r} in map" unless v[0] == :grpent
+            case v[0]
+            when :grpent
+              entries = v[1..-1]
+            when :grpchoice
+              entries = [v]
+            else
+              fail "member name not known for group entry #{r} in map"
+            end
             d_check1 = d_check.dup
-            # XXX this is ignoring occur = [s, _e]
-            return map_check(d, d_check1, v[1..-1]) && d_check.replace(d_check1)
+            # XXX this is ignoring occur = [s, _e]  FIXME!
+            return map_check(d, d_check1, entries) && d_check.replace(d_check1)
           end
           # this is mostly quadratic; let's do the linear thing if possible
           simple, simpleval = extract_value(k)
@@ -832,7 +844,7 @@ module CDDL
           end
         when :recurse_grpent # XXX we don't have the entry yet
         when :member
-          fail "map entry without member key given: #{member}" unless member[3] || member[4][0] == :grpent # || member[4] == [:grpchoice]
+          fail "map entry without member key given: #{member}" unless member[3] || member[4][0] == :grpent || member[4][0] == :grpchoice
         else
           fail ["type1 member", member].inspect unless member[0] == :member
         end

data/test/test-cddl.rb

@@ -1237,6 +1237,31 @@ HERE
     assert parser.validate({})
   end
 
+  def test_aaa_validate_more_socket_in_star
+    parser = CDDL::Parser.new <<HERE
+tcp-header = {seq: uint, ack: uint, * $$tcp-option}
+
+; later, in a different file
+
+$$tcp-option //= (
+sack: [+(left: uint, right: uint)]
+)
+
+; and, maybe in another file
+
+$$tcp-option //= (
+sack-permitted: true
+)
+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)
+  end
+
   
   def test_simple_type_augmented_uninitialized
     parser = CDDL::Parser.new <<HERE

metadata

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