cddl 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 192e487f56aa32371186d7bfe2156cb4c7a465fb
-  data.tar.gz: 8160ada742e24c3d9141cd7d20e7dc83d2665cb8
+  metadata.gz: 5e96b926d7b91f4085b026b6416c3c468c5bffdf
+  data.tar.gz: 104a4d49f78b4f0c3fd672a00e41f4d906a38560
 SHA512:
-  metadata.gz: a14e09892b6831a6db72a6442a2b009daa7f2d2c2047c3b1b5ea37d0da6d659c8451a2595b94f7b58a796b2f3afe555ddc1cf05a45065fa554172d54c483d181
-  data.tar.gz: f5672a56a37cf50d9d8aacff38563d6ed4d8037917c52cedd4f43ab261feb8f071b1021d11b184c8dd6145f5b59ef63866e84816084c1836821a193e4eaa0651
+  metadata.gz: bc7414656a7232c31c46567cf31420495c2586c2af513ad53d778d7cbe3dabf1d26917bd59255a4b9b9acc3acd9032e1d01b74ae99ffeae495a6510b15035e78
+  data.tar.gz: 2bcbfadaae30c0f8dae730cf4d005526a0af35780a51933b7a4f52805d9c25baa1f64fe58438a23c24d3e66143b450377f0b6f16df3cefa4171b1f88d9efa1c6

data/cddl.gemspec

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

data/data/cddl.abnf

@@ -30,9 +30,9 @@ group = "(" S *grpent S ")"
 grpent = [occur S] [memberkey S] type1 optcom
        / [occur S] groupname optcom ; always preempted by previous...
 
-memberkey = membername S ":"
-membername = bareword              ; note that this can be a typename
-           / type1                 ; can be preempted by previous...
+memberkey = type1 S "::"
+          / bareword S ":"
+          / string S ":"
 
 bareword = id
 

data/lib/cddl.rb

@@ -92,7 +92,7 @@ module CDDL
       r_process("used_in_cddl_prelude", @rules["used_in_cddl_prelude"])
       @rules.each do |n, r|
       #   r_process(n, r)     # debug only loop
-        warn "Unused rule #{n}" unless @stage1[n]
+        warn "*** Unused rule #{n}" unless @stage1[n]
       end
       if result[0] == :grpent
         warn "Group at top -- first rule must be a type!"
@@ -434,15 +434,22 @@ module CDDL
 
     def grpent(n)               # returns array of entries
       occ = occur(n.occur)
-      if mk = n.memberkey       # work around unclear bug in ast generation
-        [[:member, *occ, label(mk.membername), type1(n.type1)]]
-      else
-        # fail n.inspect unless n.type1
-        t = if n.membername # work around unclear bug, part 2
-          type1(n.membername.type1, true)
+      if mk = n.memberkey       # work around unclear bug in ast generation below
+        fail n.inspect unless n.type1
+        if t1 = mk.type1
+          [[:member, *occ, type1(t1), type1(n.type1)]]
         else
-          type1(n.type1, true)              # type1 can be a group here!
+          bw = mk.bareword
+          fail unless bw
+          name = bw.to_s
+          [[:member, *occ, [:string, name], type1(n.type1)]]
         end
+      else
+        t = if n.bareword # work around unclear bug, part 2
+              type1(n.bareword.type1, true)
+            else
+              type1(n.type1, true)              # type1 can be a group here!
+            end
         if t[0] == :grpent && (@insides.last != :array || occ == [1, 1])
           # go through the members here and multiply the occs
           t1 = t[1..-1].flatten(1)
@@ -527,6 +534,8 @@ module CDDL
           end
         end                     # XXX should flatten the thing, too
         t
+      else
+        fail [n, n.children].inspect
       end
     end
 

data/test-data/7071-concise.cddl

@@ -13,5 +13,5 @@ reputon = {
   ? sample-size: uint
   ? generated: uint
   ? expires: uint
-  * any: any
+  * tstr:: any
 }

data/test-data/7071-verbose.cddl

@@ -37,6 +37,6 @@ normal-value = ( normal-rating: float16 )
 sample-value = ( sample-size: uint )
 gen-value = ( generated: uint )
 expire-value = ( expires: uint )
-ext-value = ( any: any )
+ext-value = ( tstr:: any )
 
 

data/test/test-cddl.rb

@@ -33,7 +33,7 @@ class TestABNF < Test::Unit::TestCase
       [:member, 0, 1, [:string, "sample-size"], [:prim, 0]],
       [:member, 0, 1, [:string, "generated"], [:prim, 0]],
       [:member, 0, 1, [:string, "expires"], [:prim, 0]],
-      [:member, 0, CDDL::MANY, [:type1, [:prim]], [:prim]]]]]]]]
+      [:member, 0, CDDL::MANY, [:prim, 3], [:prim]]]]]]]]
 
   def test_aa_rfc7071_concise
     parser1 = CDDL::Parser.new(File.read("#{TEST_DATA_DIR}/7071-concise.cddl"))
@@ -133,7 +133,7 @@ HERE
 
   def test_validate_a_string_string
     parser = CDDL::Parser.new <<HERE
-test = [* "two": "one"]
+test = [* "two":: "one"]
 HERE
     assert parser.validate([])
     assert parser.validate(["one"])
@@ -359,13 +359,28 @@ HERE
     assert_equal [1, 2, 1, 2, 1, 2], parser.generate
   end
 
+  def test_generate_occur3  # XXX need indirection for now
+    parser = CDDL::Parser.new <<HERE
+test = [5*5 "foo"]
+HERE
+    assert_equal Array.new(5, "foo"), parser.generate
+  end
+
+  def test_basic_string  # XXX need indirection for now
+    parser = CDDL::Parser.new <<HERE
+test = "foo"
+HERE
+    assert_equal "foo", parser.generate
+  end
+
   def test_validate_json_float
     parser = CDDL::Parser.new <<HERE
 test = {
 foo: int
 ? bar: beer
 f16: float16
-"f64": float64
+? "f32": float32
+"f64":: float64
 }
 beer = 3.14 / 6.28
 HERE

metadata

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