cddl 0.8.11 → 0.8.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77b28f069a663ccb82301ec6db8cf42db6b00127b36272020baf874416029a2b
-  data.tar.gz: c37387e5d6b1009d054cb9a345d337e43fbc2a9bcc826d009aa0b1cdfeded437
+  metadata.gz: 4939bdcbf4646dc3e2606b7590db6967cc5ccdb0fcb3ac278376b2393baefef2
+  data.tar.gz: ee4e8dc9a948843a3ad4ee3adbc9a128c3de921a5c2056c8d91c82ecbdf85372
 SHA512:
-  metadata.gz: b7818289a708b07c08a58c8b114730777d70a4dbfb43ec94f10fbcacfae21cdbdcd72b11dd225e52471963e1570d30cb5703790f424b470015ab67064cc48ae8
-  data.tar.gz: 301eb0733448db7eae4dff9404d51b436c018ede13ed9a2288a6285d783e58d479186e80193e90e38ed075bd24b33fccf1ed2055eb57fd99cd99594621aa1df7
+  metadata.gz: 07360a1f513c23f9cabb0f64a870bbd961cc336f722b7d857f6d9e92dd47d8fe328899772dcd27afa24af47085e579c8a029ed4d02b8cbecb95b7af7ea2d50cf
+  data.tar.gz: 9dbf6d31bb5656b958274ec32d39bb76ebaf57e015cd819487f48c752b2d786667166f78f9d822322cfba6c7750a5559dc2baf8e938c42e4ce35b7bf3d509dd0

data/bin/cddl

@@ -50,11 +50,15 @@ end
 
 begin
   case ARGV[1]
-  when /\A.p/
+  when /\A..*p/
     $annotate = true
     require_relative '../lib/cbor-pp'
   end
   case ARGV[1]
+  when /\A..*s/
+    $sequence = true
+  end
+  case ARGV[1]
   when /\Ar/                      # secret
     $advanced = true
     my_pp parser.rules
@@ -83,7 +87,11 @@ begin
     end
   when /\Av/
     instance = read_arg(ARGV[2])
-    instance = CBOR.decode(instance.b) rescue JSON.load(instance)
+    instance = if $sequence
+      CBOR.decode("\x9f".b << instance.b << "\xff".b)
+    else
+      CBOR.decode(instance.b) rescue JSON.load(instance)
+    end
     instance = instance.cbor_clone if $annotate && ENV["EXPERIMENTAL_ANNOTATE"]
     ann = parser.validate(instance)
     # my_pp ann

data/cddl.gemspec

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

data/data/cddl.abnf

@@ -16,6 +16,7 @@ type1 = type2 [S (rangeop / annotator) S type2]
      / "#" "6" ["." uint] "(" S type S ")" ; note no space!
      / "#" DIGIT ["." uint]                ; major/ai
      / "#"                                 ; any
+     / "~" S typename [genericarg]
      / "{" S group S "}"
      / "[" S group S "]"
      / "&" S "(" S group S ")"

data/lib/cddl.rb

@@ -441,6 +441,29 @@ module CDDL
           generate1(target, inmap)
         when :feature
           generate1(target, inmap)
+        when :cat
+          lhs = generate1(target, inmap)
+          rhs = generate1(control)
+          begin
+            lhs + rhs
+          rescue Exception => e
+            fail "Can't #{lhs.inspect} .cat #{rhs.inspect}: #{e.message}"
+          end
+        when :plus
+          lhs = generate1(target, inmap)
+          rhs = generate1(control)
+          begin
+            case lhs
+            when Integer
+              lhs + Integer(rhs)
+            when Numeric
+              lhs + rhs
+            else
+              fail "#{lhs.inspect}: Not a number"
+            end
+          rescue Exception => e
+            fail "Can't #{lhs.inspect} .plus #{rhs.inspect}: #{e.message}"
+          end
         when :eq
           content = generate1(control)
           if validate1(content, where)
@@ -542,9 +565,34 @@ module CDDL
         [true, t[1], vt]
       elsif v = SIMPLE_VALUE[t]
         v
-      else
-        [false]
-      end
+      elsif t[0] == :anno
+        _, conop, target, control = t
+        # warn ["EXV0", conop, target, control].inspect
+        if conop == :cat || conop == :plus
+          ok1, v1, vt1 = extract_value(target)
+          ok2, v2, vt2 = extract_value(control)
+          # warn ["EXV", ok1, v1, vt1, ok2, v2, vt2].inspect
+          if ok1 && ok2
+            if vt1 == Integer
+              [true, v1 + Integer(v2), Integer] if vt2 == Integer || vt2 == Float
+            elsif vt1 == Float
+              [true, v1 + v2, vt1] if vt2 == Integer || vt2 == Float
+            else
+              [true, v1 + v2, vt1] if vt1 == vt2
+            end
+          end rescue nil
+        end
+      end || [false]
+    end
+
+    def extract_array(t)
+      return [false] unless t[0] == :array
+      [true, *t[1..-1].map { |el|
+         return [false] unless el[0..3] == [:member, 1, 1, nil]
+         ok, v, vt = extract_value(el[4])
+         return [false] unless ok
+         [v, vt]
+       }]
     end
 
     def validate_diag
@@ -558,7 +606,10 @@ module CDDL
       if warn
         if result
           if $features != {}
-            warn "** Features potentially used: #{$features.map {|k, v| "#{k}: #{v.keys}"}.join(", ")}"
+            ok = ENV["CDDL_FEATURE_OK"] and ok = ok.split(/,\s*/) or ok = []
+            # warn([:OK, ok, $features].inspect)
+            features = $features.reject {|k, v| ok.include? k.to_s }
+            warn "** Features potentially used: #{features.map {|k, v| "#{k}: #{v.keys}"}.join(", ")}" if features != {}
           end
         else
           warn "CDDL validation failure (#{result.inspect} for #{d.inspect}):"
@@ -762,10 +813,18 @@ module CDDL
       when :range
         [] if where[2] === d && where[1].include?(d)
       when :anno
-        target = where[2]
-        if ann = validate1a(d, target)
-          control = where[3]
-          case where[1]
+        _, conop, target, control = where
+        if conop == :cat || conop == :plus
+          ok1, v1, vt1 = extract_value(target)
+          ok2, v2, vt2 = extract_value(control)
+          # warn ["ANNO0", ok1, v1, vt1, ok2, v2, vt2, d].inspect
+          if ok1 && ok2
+            v2 = Integer(v2) if vt1 == Integer
+            # warn ["ANNO", ok1, v1, vt1, ok2, v2, vt2, d].inspect
+            [] if d == v1 + v2  # XXX Focus ArgumentError
+          end
+        elsif ann = validate1a(d, target)
+          case conop
           when :size
             case d
             when Integer
@@ -806,10 +865,22 @@ module CDDL
             ann
           when :feature
             ok, v, vt = extract_value(control)
-            $features[v][d] = true
+            if ok
+              nm = v
+              det = d
+            else
+              ok, *v = extract_array(control)
+              if ok && v.size == 2
+                nm = v[0][0]
+                det = v[1][0]
+              else
+                warn "*** feature controller not implemented: #{control.inspect}"
+              end
+            end
+            $features[nm][det] = true
             ann
           when :lt, :le, :gt, :ge, :eq, :ne
-            op = OPERATORS[where[1]]
+            op = OPERATORS[conop]
             ok, v, _vt = extract_value(control)
             if ok
               ann if d.send(op, v) rescue nil # XXX Focus ArgumentError
@@ -1179,7 +1250,7 @@ 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]
+                             :default, :lt, :le, :gt, :ge, :eq, :ne, :feature, :cat, :plus]
 
     def type1(n, canbegroup = false)
 #      puts "NVALUE #{n.value.inspect}"
@@ -1241,6 +1312,26 @@ module CDDL
              v
            }
           ]
+        when /\A~/
+          if tn = n.typename
+            s = type_recall(tn.to_s, false, n.genericarg).flatten(1)
+          else
+            fail "No typename in unwrap #{n}"
+          end
+          if s[0] != :type1
+            fail [:UNWRAPs0, s].inspect
+          end
+          case s[1]
+          when :map, :array
+            [:grpent, s[2..-1]]
+          when :prim
+            if s[2] != 6
+              fail [:UNWRAPs2, s].inspect
+            end
+            s[4]                # check :type1?
+          else
+            fail [:UNWRAPs1, s].inspect
+          end
         else
           "unimplemented #{n}"
         end

data/test-data/feat1.cddl

@@ -1,4 +1,4 @@
-foo = {
+bla = {
     a: int
     ? ("b" .feature "foo") => float
 }

data/test-data/feature-detail.cddl

@@ -0,0 +1,5 @@
+foo = {
+  kind: bar / baz .feature (["foo-extensions", "bazify"])
+}
+bar = int
+baz = text ; complex stuff that doesn't all need to be in the detail

data/test-data/sequence.cddl

@@ -0,0 +1 @@
+a = [tstr, tstr, tstr]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cddl
 version: !ruby/object:Gem::Version
-  version: 0.8.11
+  version: 0.8.16
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-14 00:00:00.000000000 Z
+date: 2021-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cbor-diag
@@ -118,6 +118,7 @@ files:
 - test-data/dotsize.cddl
 - test-data/extractor-demo.cddl
 - test-data/feat1.cddl
+- test-data/feature-detail.cddl
 - test-data/foo.cddl
 - test-data/grasp-01-extract.cddl
 - test-data/grasp-01-test.cddl
@@ -149,6 +150,7 @@ files:
 - test-data/named-group.cddl
 - test-data/patch1.cddl
 - test-data/reused_named_group.cddl
+- test-data/sequence.cddl
 - test-data/structure.cddl
 - test-data/test-gen.cddl
 - test-data/toerless0.cddl
@@ -179,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: CDDL generator and validator.