cddl 0.8.12 → 0.8.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ede21b4292e6f546745029c7a071eb1af1259366e676d90e19f400dfe089d7a
-  data.tar.gz: 57ed90f75d58941bd28c5afef7d5eb29eea5d5483a6a3b2c4fc65d49df0370aa
+  metadata.gz: bbd414d9d4fbc897f8f31c03437fa57155547c0f02978de2da4f75844cf0e1ef
+  data.tar.gz: 9aa239d57c5e70f8352da90cc8023273a2793577df84ee6e003a1ac0fdc200dc
 SHA512:
-  metadata.gz: 65de704e842bb6d48265e7024922edf0406d6cb521d2977b07db2926d396b8b2d6bdc103619d579b861cb53b8914b4383e25c2e610e86f7b4d88d89983a64dff
-  data.tar.gz: c0919845b3ee5bba3b2a5d77f9e182a4a9f1904f187843501abf29954d37033d62f1cfd50545865ba878c92583f26151f9024dc1093c0d4607442038b36008b0
+  metadata.gz: 00dac4c95e0b94e0bc3ae775b1bf1ab33a41507bb06774ccaa0838daf6c9fffc0c2d4b3d049199c3ae35858888be853058248c710ea056edd718a0938fd7d8e3
+  data.tar.gz: 18ea8731c6ab8ec9ae547331be276b9ca1c58c490c6986969824a0a56c7870478ca01418f8ae83a5504d393c14e9fcc5764bfc0cb65c7f2f267cd1757dfbdbac

data/cddl.gemspec

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

data/lib/cddl.rb

@@ -547,6 +547,16 @@ module CDDL
       end
     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
       [@last_data, @last_rule, @last_message]
     end
@@ -806,7 +816,19 @@ 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]]

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cddl
 version: !ruby/object:Gem::Version
-  version: 0.8.12
+  version: 0.8.13
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-24 00:00:00.000000000 Z
+date: 2020-11-13 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