cddl 0.12.1 → 0.12.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a29d5d85e11598502b09d04e3b08a7ada9b6d0d8a9eb0e425bb01da81b92532b
-  data.tar.gz: 61c2a191c264c34600f0b66a8e7cfb2ea1359f3954676828a56a63aa25e3015c
+  metadata.gz: a4b5bfb31fd9b7fcf4cf66a1d0f2a76550c9682215c486d99a03997bab1ae30b
+  data.tar.gz: 97f11378fb18576f115ffb8cbd668fe9e14e33e91e4aac01d874c69e206f2fbd
 SHA512:
-  metadata.gz: 671d119f1cb328151c0631cbcd808f5a32d1f82d6c715a64cb5e5c9702b3452c996278a6b5055613de74b00f76489a9874037b336ac3a760947d4a2526d84cc9
-  data.tar.gz: 8146d9b66bb87e84b2179507fb9144012676be726dd5f4312da2482a047e46429a6d41d5b1d49097724aa8cfd68519be06e6e8f860e97f0cbc187de0c20242ca
+  metadata.gz: 623f3945c3fff7c04dd2a4e1c77879d585d347092c87b54d5ead6b8fb3ed3c5ab68a58ae67b7f3f936437c8bc9f92dea6f8597509ba8913fbc5e2e47f43d398a
+  data.tar.gz: a04d3f282b0d42182f63dd66988fece8fb0ab7ddb4e159b2f8213705503cff0a97b622a172096b881dc4fe70f16bdcc48a51fa035413bc55421bb5e15d1bcda3

data/bin/cddl

@@ -22,6 +22,13 @@ def usage
   exit EX_USAGE
 end
 
+def utfify(s)
+  s.force_encoding(Encoding::UTF_8).scrub { |c|
+      warn "*** replaced invalid UTF-8 byte sequence #{c.inspect} by U+FFFD REPLACEMENT CHARACTER"
+      0xFFFD.chr(Encoding::UTF_8)
+  }
+end
+
 def read_arg(arg, remember_fn = true)
   if arg == "-"
     $fn = "(stdin)" if remember_fn
@@ -29,15 +36,12 @@ def read_arg(arg, remember_fn = true)
   else
     usage unless arg
     $fn = arg if remember_fn
-    File.read(arg, mode: "rb").force_encoding(Encoding::UTF_8).scrub { |c|
-      warn "*** replaced invalid UTF-8 byte sequence #{c.inspect} by U+FFFD REPLACEMENT CHARACTER"
-      0xFFFD.chr(Encoding::UTF_8)
-    }
+    File.read(arg, mode: "rb")
   end
 end
 
 def parser
-  @parser ||= CDDL::Parser.new(read_arg(ARGV[0], false))
+  @parser ||= CDDL::Parser.new(utfify(read_arg(ARGV[0], false)))
 end
 
 def my_pp(v)
@@ -102,7 +106,12 @@ begin
       instance = if $sequence
                    CBOR.decode("\x9f".b << instance.b << "\xff".b)
                  else
-                   CBOR.decode(instance.b) rescue JSON.load(instance)
+                   begin
+                     CBOR.decode(instance.b)
+                   rescue => e
+                     warn e.inspect if verbose
+                     JSON.load(utfify(instance))
+                   end
                  end
       instance = instance.cbor_clone if $annotate && ENV["EXPERIMENTAL_ANNOTATE"]
       warn "#{fn}:" if verbose
@@ -110,6 +119,7 @@ begin
       # my_pp ann
       instance.cbor_add_annotations_from(ann) rescue nil
       my_diag(instance) if $annotate
+      warn "ann: #{!!ann}" if verbose
       unless ann
         retcode = 1
       end

data/cddl.gemspec

@@ -1,13 +1,13 @@
 spec = Gem::Specification.new do |s|
   s.name = 'cddl'
-  s.version = '0.12.1'
+  s.version = '0.12.14'
   s.summary = "CDDL generator and validator."
   s.description = %{A parser, generator, and validator for CDDL}
   s.add_dependency('cbor-diag')
   s.add_dependency('abnc', '~> 0.1.1')
   s.add_dependency('json_pure')
   s.add_dependency('abnftt')
-  s.add_dependency('regexp-examples') # , '1.1.0')
+  s.add_dependency('regexp-examples', '~> 1.5.1') # , '1.1.0')
   s.add_dependency('colorize')
   s.add_dependency('base32', '~> 0.3')
   s.add_dependency('base45_lite', '~> 1.0')
@@ -16,11 +16,10 @@ spec = Gem::Specification.new do |s|
   s.files = Dir['lib/**/*.rb'] + %w(cddl.gemspec) + Dir['data/**/*.abnf'] + Dir['data/**/*.cddl'] + Dir['test-data/**/*.cddl'] + Dir['test/**/*.rb']
   s.require_path = 'lib'
   s.executables = ['cddl']
-  s.default_executable = 'cddl'
   s.required_ruby_version = '>= 2.3'
   s.author = "Carsten Bormann"
   s.email = "cabo@tzi.org"
-  s.homepage = "http://github.com/cabo/cddl"
+  s.homepage = "https://www.rfc-editor.org/rfc/rfc8610#appendix-F"
   s.license = 'MIT'
 end
 

data/data/cddl.abnf

@@ -41,7 +41,7 @@ grpent = [occur S] [memberkey S] type optcom
        / [occur S] groupname [genericarg] optcom ; preempted by above
        / [occur S] "(" S group S ")" optcom
 
-memberkey = type1 S "=>"
+memberkey = type1 S ["^" S] "=>"
           / bareword S ":"
           / value S ":"
 
@@ -65,9 +65,10 @@ value = number
 int = ["-"] uint
 
 ; This is a float if it has fraction or exponent; int otherwise
-number = int ["." fraction] ["e" exponent ]
+number = hexfloat / (int ["." fraction] ["e" exponent ])
+hexfloat = ["-"] "0x" 1*HEXDIG ["." 1*HEXDIG] "p" exponent
 fraction = 1*DIGIT
-exponent = int
+exponent = ["+"/"-"] 1*DIGIT
 
 text = %x22 *SCHAR %x22
 SCHAR = %x20-21 / %x23-5B / %x5D-7E / NONASCII / SESC

data/lib/cddl.rb

@@ -40,6 +40,7 @@ module CDDL
                    [{}, {}]
                  end
 
+    CDDL_UNUSED_OK = ENV["CDDL_UNUSED_OK"]
 
     class BackTrack < Exception; end
 
@@ -118,6 +119,16 @@ module CDDL
       r.compact
     end
 
+    def longest_initial_match(old, now)
+      md = /\A(.*)(.*)\n\1(.*)\z/.match([old,now].join("\n"))
+      md[1..3]
+    end
+
+    def diff_message(old, now)
+      c, l, r = longest_initial_match(old, now)
+      "-- common: >#{c}< -- old: >#{l}< -- new: >#{r}<"
+    end
+
     def cname(s)
       s.to_s.gsub(/-/, "_")
     end
@@ -204,7 +215,8 @@ module CDDL
           ids = g.children(:id).map(&:to_s)
           # puts ["ids", ids].inspect
           if b = @generics[n]
-            fail "Duplicate generics definition #{n} as #{rule_ast} (was #{b})"
+            fail "Duplicate generics definition #{n} #{
+              diff_message(strip_nodes(b[0]).inspect, strip_nodes(rule_ast).inspect)}"
           end
           @generics[n] = [rule_ast, ids]
         else
@@ -216,7 +228,7 @@ module CDDL
               if a == b
                 warn "*** Warning: Identical redefinition of #{n} as #{a}"
               else
-                fail "Duplicate rule definition #{n} as #{b} (was #{a})"
+                fail "Duplicate rule definition #{n} #{diff_message(b, a)}"
               end
             end
             @rules[n] = rule_ast
@@ -248,7 +260,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] || CDDL_UNUSED_OK
       end
       if result[0] == :grpent
         warn "Group at top -- first rule must be a type!"
@@ -302,6 +314,12 @@ module CDDL
       abnfb: Encoding::BINARY
     }
 
+    def myfrand(exp)
+      exprange = 1 << exp
+      expoffset= exprange >> 1
+      (rand(2)*2-1) * rand() * 2.0**(rand(exprange)-expoffset)
+    end
+
     def generate
       @recursion = 0
       generate1(rules)
@@ -446,15 +464,15 @@ module CDDL
           when 0..19, 23, 32..255
             CBOR::Simple.new(w2)
           when 25
-            while !(hs = Half.encode_from_single_bytes([rand()].pack("g")))
+            while !(hs = Half.encode_from_single_bytes([myfrand(5)].pack("g")))
             end
             Half.decode(hs)
           when 26
-            while (a = [rand()].pack("g").unpack("g").first).to_cbor.size != 5
+            while (a = [myfrand(8)].pack("g").unpack("g").first).to_cbor.size != 5
             end
             a
           when 27
-            while (a = rand()).to_cbor.size != 9
+            while (a = myfrand(11)).to_cbor.size != 9
             end
             a
           else
@@ -619,7 +637,13 @@ module CDDL
           end
           content = JSON::dump(generate1(control))
           content
-        when :decimal
+        when :decimal, :base10
+          if conop == :decimal
+            unless @decimal_warned
+              warn "** .decimal control operator is now called .base10"
+              @decimal_warned = true
+            end
+          end
           unless target == [:prim, 3]
             fail "Don't know yet how to generate #{where}"
           end
@@ -686,6 +710,7 @@ module CDDL
           fail "Not smart enough to generate #{where}#{@last_message}"
         when :within, :and
           try_generate(target) do |content|
+            $features ||= Hash.new {|h, k| h[k] = {}}
             if validate1(content, control)
               return content
             elsif conop == :within
@@ -1005,6 +1030,7 @@ module CDDL
     end
 
     OPERATORS = {lt: :<, le: :<=, gt: :>, ge: :>=, eq: :==, ne: :!=}
+    OPERATORS_MATCH = {eq: true, ne: false}
     FLOAT_AI_FROM_SIZE = {3 => 25, 5 => 26, 9 => 27}
 
     def validate1(d, where)
@@ -1016,6 +1042,9 @@ module CDDL
       @last_data = d
       @last_rule = where
       ann = nil
+      if CBOR::Tagged === d && d.tag === 888 && ENV["CDDL_888"]
+        return []
+      end
       case where[0]
       when :type1
         if where[1..-1].any? {|r| ann = validate1a(d, r)}
@@ -1135,6 +1164,11 @@ module CDDL
             ok, v, _vt = extract_value(control)
             if ok
               ann if d.send(op, v) rescue nil # XXX Focus ArgumentError
+            else
+              needs_to_match = OPERATORS_MATCH[conop]
+              unless needs_to_match.nil?
+                ann if !!validate1(d, control) == needs_to_match
+              end
             end
           when :regexp
             ann if (
@@ -1187,7 +1221,14 @@ module CDDL
             end
           when :json
             ann if validate1((JSON::load(d) rescue :BAD_JSON), control)
-          when :decimal
+          when :decimal, :base10
+            if conop == :decimal
+              unless @decimal_warned
+                warn "** .decimal control operator is now called .base10"
+                @decimal_warned = true
+              end
+            end
+
             ann if (
                 if /\A0|-?[1-9][0-9]*\z/ === d
                   validate1((d.to_i rescue :BAD_JSON), control)
@@ -1428,6 +1469,10 @@ module CDDL
                                else
                                  [:type1]
                                end
+          elsif s = ENV["CDDL_INVENT"]
+            s = "_" if s == ""
+            r = [:type1, [:text, "#{s}-#{name}"]]
+            return r
           end
         end
         if r
@@ -1531,7 +1576,11 @@ module CDDL
             end
           }
         end
-        val = eval(s)
+        if s =~ /p.*\d\z/       # hexfloat
+          val = s.scanf("%a").first
+        else
+          val = eval(s)
+        end
         # warn val
         case val
          when Integer; [:int, val]
@@ -1724,7 +1773,7 @@ module CDDL
                              :within, :and,
                              :default, :lt, :le, :gt, :ge, :eq, :ne,
                              :feature, :abnf, :abnfb, :det, :cat, :plus,
-                             :json, :decimal, :join,
+                             :json, :decimal, :base10, :join,
                              :b64u, :"b64u-sloppy", :b64c, :"b64c-sloppy",
                              :b45, :b32, :h32, :hex, :hexlc, :hexuc,
                              :printf,

data/test-data/decimal-warn.cddl

@@ -0,0 +1 @@
+s = [text .decimal 4711, text .base10 4712]

data/test-data/valemb.cddl

@@ -0,0 +1,16 @@
+cwt = [
+  bstr .cbor protected-map,
+  unprotected-map,
+  bstr .cbor payload-map,
+  bstr ; signature
+]
+
+protected-map = {
+   &(alg: 1) => int, 
+   ? &(typ: 16) => text,
+   * key => any   
+}
+
+unprotected-map = ()
+key = "key"
+payload-map = { payload: "map"}

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: cddl
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.12.14
 platform: ruby
 authors:
 - Carsten Bormann
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-16 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cbor-diag
@@ -70,16 +69,16 @@ dependencies:
   name: regexp-examples
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -184,6 +183,7 @@ files:
 - test-data/cose.cddl
 - test-data/dcaf.cddl
 - test-data/dcaf1.cddl
+- test-data/decimal-warn.cddl
 - test-data/decimal.cddl
 - test-data/decimal2.cddl
 - test-data/det1.cddl
@@ -263,6 +263,7 @@ files:
 - test-data/toerless0.cddl
 - test-data/toerless1.cddl
 - test-data/two_anonymous_groups.cddl
+- test-data/valemb.cddl
 - test-data/wrong1.cddl
 - test-data/wrong1a.cddl
 - test-data/wrong2.cddl
@@ -271,11 +272,10 @@ files:
 - test-data/yangid.cddl
 - test-data/yaron1.cddl
 - test/test-cddl.rb
-homepage: http://github.com/cabo/cddl
+homepage: https://www.rfc-editor.org/rfc/rfc8610#appendix-F
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -290,8 +290,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
-signing_key:
+rubygems_version: 4.0.8
 specification_version: 4
 summary: CDDL generator and validator.
 test_files: []