cddl 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 069ab5627679f8b9c644f6469eff2a3760c4c911
-  data.tar.gz: 39c18606d5c35934d4933ff96c444a7f685f7003
+  metadata.gz: fe3ed839df42c1fd6b07c8b4ddb8e89173d7aad7
+  data.tar.gz: 181bc6679b13f2d6d3bb1e83956ce319d7e78b0e
 SHA512:
-  metadata.gz: 65ff54e705aa476af42d7157cfa87120678b59d6c8177d86a6552abd5c4ee135531b8c17dcb078c34fed3a773c67aaddc6e30c645e9c40af22bb1fca6c6d1a08
-  data.tar.gz: 32049a27a9a6a2ca7080a7d9bffde7fa7c3e2f0e88eaac030fb9ea97b87e0bd0b5844d660ec730ca321665f96d01eb68af78f119c809974178bde444bb7b8638
+  metadata.gz: 0df738339807fd13719e6fe7ba06a382b8179eace4f9f21a7a1956800ac7004a47f52d79b93055a409a7e205f6d3b5d3b99a1cf05bfef1eda6b5b96b41cd340f
+  data.tar.gz: 960d722af0ad43719aff06482a6b795f9b958379aa918a243ac2b52e94c46cfb0299a041d8b85e1d92fadc7ae9c15bbb02e03e3b37dc6656c0ba5b4ce499b419

data/cddl.gemspec

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

data/data/cddl.abnf

@@ -7,7 +7,7 @@ groupname = id
 
 type = type1 S *("/" S type1 S)
 
-type1 = type2 [S (rangeop / annotation) S type2]
+type1 = type2 [S (rangeop / annotator) S type2]
      / "#" "6" ["." uint] "(" S type S ")" ; note no space!
      / "#" DIGIT ["." uint]                ; major/ai
      / "#"                                 ; any
@@ -22,13 +22,13 @@ type2 = value
 
 rangeop = "..." / ".."
 
-annotation = "." id
+annotator = "." id
 
 group = "(" S *grpent S ")"
       / *grpent
 
 grpent = [occur S] [memberkey S] type1 optcom
-       / [occur S] groupname optcom       ; always preempted by previous...
+       / [occur S] groupname optcom ; always preempted by previous...
 
 memberkey = membername S ":"
 membername = bareword              ; note that this can be a typename

data/lib/cddl.rb

@@ -157,7 +157,7 @@ module CDDL
           Random.new.bytes(should_be_int)
         when :bits
           set_of_bits = Array.new(10) { generate(control) } # XXX: ten?
-          p set_of_bits
+          # p set_of_bits
           unless target == [:prim, 2] && set_of_bits.all? {|x| Integer === x && x >= 0 }
             fail "Don't know yet how to generate #{where}"
           end
@@ -168,7 +168,7 @@ module CDDL
             if v = s.getbyte(n)
               s.setbyte(n, v | bit)
             else
-              s << "\0" * (s.size - n) << bit.chr(Encoding::BINARY)
+              s << "\0" * (n - s.size) << bit.chr(Encoding::BINARY)
             end
           end
           s
@@ -326,7 +326,7 @@ module CDDL
               ok, v, vt = extract_value(control)
               if ok && vt == String
                 re = Regexp.new("\\A#{v}\\z")
-                pp re
+                # pp re
                 d.match(re)
               end
             end
@@ -524,7 +524,7 @@ module CDDL
              val
            }, RANGE_EXCLUDE_END[ro.to_s]),
            cats[0] == cats[1] ? cats[0] : fail("Incompatible range #{cats}")]
-        elsif anno = n.annotation
+        elsif anno = n.annotator
           annotyp = anno.id.to_s.intern
           unless SUPPORTED_ANNOTATIONS.include?(annotyp)
             fail "Unsupported annotation .#{annotyp}"

metadata

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