cddl 0.8.18 → 0.8.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea0383306d236be5fef58afc284e8129b9cd125bb0b8548e6bf76f3bd7b45ab9
-  data.tar.gz: 3e439913ec68a51c044a4215a72789a2e4f25dd05b5f9e864349ce7dc9f83113
+  metadata.gz: 8e344aa8fcd67bc17cbeaba6c564ab2c3b6b9ce63b5df9acdffe060ac32628d3
+  data.tar.gz: 32410cfe8d62729a6f05e1174871746af3be5998cc2a56fe50bdfc139b53252d
 SHA512:
-  metadata.gz: a2d7a09bbeedfb2a1d9884deb69e55c8ed889eec727d67fed6c74223981c6cea5aac9fc07a37dd9bd2e253f5942afdc3ac35effe7a9a8baab47baf375f88222e
-  data.tar.gz: dd32c4869a4d708863ba8ed1188ae1f98b784c6fc6d33ffab54d2db4a6254cbf2ea0490706d31ae2f4c53f21e64ce7a87b9bb0d81ec495765ffe19a2471c6470
+  metadata.gz: 7fad1d715e3acbd3062c8aeb49518148de9a61c6385a09bd3baa7b384e398ce52bce13afa268209ff2fc0763ef1e07aea932857e0489a0c1e94d79429346418c
+  data.tar.gz: ef603bb0dca1beceb0767e87210b4e3819533924c64014392b694e36a2cc9e41b00f1618484226c950aa804e5690e7c5e7451f527b9ad0379ecc5fda5bed389e

data/cddl.gemspec

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

data/lib/cddl.rb

@@ -255,6 +255,11 @@ module CDDL
       h[k] = ABNF.from_abnf(grammar)
     }
 
+    ABNF_ENCODING_FOR_CONOP = {
+      abnf: Encoding::UTF_8,
+      abnfb: Encoding::BINARY
+    }
+
     def generate
       @recursion = 0
       generate1(rules)
@@ -510,12 +515,19 @@ module CDDL
             fail "Don't know yet how to generate #{where}"
           end
           REGEXP_FOR_STRING[regexp].random_example(max_repeater_variance: 5)
-        when :abnf
+        when :abnf, :abnfb
           grammar = generate1(control)
-          unless target == [:prim, 3] && String === grammar
+          bytes = true if target == [:prim, 2]
+          bytes = false if target == [:prim, 3]
+          unless !bytes.nil? && String === grammar
             fail "Don't know yet how to generate #{where}"
           end
-          ABNF_PARSER_FOR_STRING[grammar].generate
+          out = ABNF_PARSER_FOR_STRING[grammar].generate
+          if where[1] == :abnfb
+            out = out.codepoints.pack("C*")
+          end
+          enc = bytes ? Encoding::BINARY : Encoding::UTF_8
+          out.force_encoding(enc)
         when :cbor, :cborseq
           unless target == [:prim, 2]
             fail "Don't know yet how to generate #{where}"
@@ -634,7 +646,7 @@ module CDDL
 
     def validate_result(check)
       check || (
-        @last_message = yield
+        @last_message << yield
         false
       )
     end
@@ -667,7 +679,9 @@ module CDDL
             ann.concat(ann2)
           end
           if occ < s
-            @last_message = "occur not reached in array #{d} for #{where}"
+            # warn "*** lme #{@last_message.encoding} #{@last_message}"
+            # warn "*** #{"\noccur #{occ} < #{s}, not reached at #{i} in array #{d} for #{where}".encoding}"
+            @last_message << "\noccur #{occ} < #{s}, not reached at #{i} in array #{d} for #{where}"
             return [false, ann]
           end
         end
@@ -908,17 +922,19 @@ module CDDL
               end
             end
             )
-          when :abnf            # XXX .abnf vs. .abnfb
+          when :abnf, :abnfb
             ann if (
             if String === d
               ok, v, vt = extract_value(control)
               if ok && vt == String
                 begin
-                  ABNF_PARSER_FOR_STRING[v].validate(d)
+                  ABNF_PARSER_FOR_STRING[v].validate(
+                    d.dup.force_encoding(ABNF_ENCODING_FOR_CONOP[conop]).codepoints.pack("U*")
+                  )
                   true
                 rescue => e
                   # warn "*** #{e}" # XXX
-                  @last_message = e
+                  @last_message = e.to_s.force_encoding(Encoding::UTF_8)
                   nil
                 end
               end
@@ -1278,7 +1294,8 @@ module CDDL
     BRACE = {"{" => :map, "[" => :array}
     RANGE_EXCLUDE_END = {".." => false, "..." => true}
     SUPPORTED_ANNOTATIONS = [:bits, :size, :regexp, :cbor, :cborseq, :within, :and,
-                             :default, :lt, :le, :gt, :ge, :eq, :ne, :feature, :abnf, :cat, :plus]
+                             :default, :lt, :le, :gt, :ge, :eq, :ne,
+                             :feature, :abnf, :abnfb, :cat, :plus]
 
     def type1(n, canbegroup = false)
 #      puts "NVALUE #{n.value.inspect}"

data/test-data/abnf3.cddl

@@ -0,0 +1,32 @@
+start = [tt, tb, bt, bb]
+
+
+tt = text .abnf '4DIGIT 1FOO
+DIGIT          =  %x30-39 ; 0-9
+FOO = %xc0-cf
+'
+tb = text .abnfb '4DIGIT 1FOO
+DIGIT          =  %x30-39 ; 0-9
+FOO = %xc0-cf
+'
+bt = bytes .abnf '4DIGIT 1FOO
+DIGIT          =  %x30-39 ; 0-9
+FOO = %xc0-cf
+'
+bb = bytes .abnfb '4DIGIT 1FOO
+DIGIT          =  %x30-39 ; 0-9
+FOO = %xc0-cf
+'
+
+; ["7408\xC6", "7073\xC3", h'30383131CD', h'32363738CD']
+; ["5892\u00ca", "2145\u00c6", h'33333338C38B', h'31343033C388']
+
+
+; ** ENCOED UTF-8
+; ** ENCOED UTF-8
+; ** ENCOED UTF-8
+; ** ENCOED UTF-8
+; ["5845\u00c6", "9329\u00cb", h'38393538C389', h'33343230C386']
+
+
+; ["1066\u00cc", "9253\xC9", h'38333533C38A', h'32373337C4']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cddl
 version: !ruby/object:Gem::Version
-  version: 0.8.18
+  version: 0.8.19
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-25 00:00:00.000000000 Z
+date: 2021-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cbor-diag
@@ -116,6 +116,7 @@ files:
 - test-data/abignum.cddl
 - test-data/abnf1.cddl
 - test-data/abnf2.cddl
+- test-data/abnf3.cddl
 - test-data/ambig.cddl
 - test-data/b.cddl
 - test-data/badaddr.cddl