cddl 0.9.2 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0421b3c93de64adf3d90584becbfa60257bb370e3db6e565a1843125e4832f9
-  data.tar.gz: 2a9d2a7bd2cfe35ce4a7417118310c041c6181c3ad5a3da453e4f1e9930e572b
+  metadata.gz: ce024a0c0c43374c481b2f099e23dfd2d5da6cda62791111cf767bc12684bd92
+  data.tar.gz: b7bea63f7fb1bc927f3ffad3d602b6544719a7bd9657e7836faae0edd2355bfe
 SHA512:
-  metadata.gz: b4296b97de561560d8464e3b96881f6574da70c8c10fba257feef0e0f6486a53b6edf0951e0deec74c5245e2e78a3dd0db83df16a7e45b62f94f3ed3817e1884
-  data.tar.gz: d0b2bcc1b06c5f06128696690704d1baff8cbd566c2a80fd172ef19b92ffb007ab70d430221fc989fefa658c6878d331f12c7532e7747241e806ecd670a176ff
+  metadata.gz: 59344f19904e61edaecb196d0ba9106a97e5d9cbcb6b77bb3abd8f0a41fc72f0a30e51325253fb718e4f8f928ad979da968b48206c0594e80a6f82e2315252aa
+  data.tar.gz: 17415dd68f227a7c642369563bb38923adc54706b104468aa05c40d322697db1fa9cf22be2c5bc18d1036835f9cf588fc8eb4c514512b4e4b9dd459d8aaf95ce

data/cddl.gemspec

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

data/lib/cddl.rb

@@ -22,6 +22,20 @@ module CDDL
 
   class Parser
 
+    FEATURE_REJECT_RE = /\A\^/
+    # CDDL_FEATURE_OK=cbor,^json
+    CDDL_FEATURE_OK, CDDL_FEATURE_REJECT =
+                 if ok = ENV["CDDL_FEATURE_OK"]
+                   ok.split(/,\s*/)
+                     .partition{|s| s[0] !~ FEATURE_REJECT_RE}
+                     .map {|l| Hash[l.map {|feature|
+                                      [feature.sub(FEATURE_REJECT_RE, ''),
+                                       true]}]}
+                 else
+                   [{}, {}]
+                 end
+
+
     class BackTrack < Exception; end
 
     def initialize(source_text)
@@ -130,7 +144,7 @@ module CDDL
         if subtree[0] == :type1 && subtree[1..-1].all? {|x| x[0] == :int}
           if enumname = subtree.cbor_annotations rescue nil
             enumname = cname(enumname.first)
-            subtree[1..-1].each do |x| 
+            subtree[1..-1].each do |x|
               if memname = x.cbor_annotations
                 memname = "#{enumname}_#{cname(memname.first)}"
                 add.(memname, x[1].to_s)
@@ -255,7 +269,7 @@ module CDDL
     # Memoize a bit here
 
     REGEXP_FOR_STRING = Hash.new {|h, k|
-      h[k] = Regexp.new("\\A#{k}\\z")
+      h[k] = Regexp.new("\\A(?:#{k})\\z")
     }
 
     ABNF_PARSER_FOR_STRING = Hash.new {|h, k|
@@ -459,6 +473,11 @@ module CDDL
           end
           generate1(target, inmap)
         when :feature
+          feature, = extract_feature(control, nil)
+          # warn "@@@ GENFEAT #{feature.inspect} #{CDDL_FEATURE_REJECT[feature].inspect}"
+          if CDDL_FEATURE_REJECT[feature]
+            fail BackTrack.new("Feature '#{feature}' rejected")
+          end
           generate1(target, inmap)
         when :cat, :det
           lhs = generate1(target, inmap)
@@ -636,6 +655,25 @@ module CDDL
        }]
     end
 
+    def extract_feature(control, d)
+      ok, v, vt = extract_value(control)
+      if ok
+        nm = v
+        det = d
+        warn "*** feature controller should be a string: #{control.inspect}" unless String == vt
+      else
+        ok, *v = extract_array(control)
+        if ok && v.size == 2
+          nm = v[0][0]
+          det = v[1][0]
+          warn "*** first element of feature controller should be a string: #{control.inspect}" unless String === nm
+        else
+          warn "*** feature controller not implemented: #{control.inspect}"
+        end
+      end
+      [nm, det]
+    end
+
     def validate_diag
       [@last_data, @last_rule, @last_message]
     end
@@ -647,9 +685,8 @@ module CDDL
       if warn
         if result
           if $features != {}
-            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 }
+            features = $features.reject {|k, v| CDDL_FEATURE_OK[k.to_s] }
+            # warn "@@@ FEAT #{CDDL_FEATURE_OK.inspect} #{CDDL_FEATURE_REJECT.inspect}"
             warn "** Features potentially used (#$fn): #{features.map {|k, v| "#{k}: #{v.keys}"}.join(", ")}" if features != {}
           end
         else
@@ -915,23 +952,9 @@ module CDDL
             end
             ann
           when :feature
-            ok, v, vt = extract_value(control)
-            if ok
-              nm = v
-              det = d
-              warn "*** feature controller should be a string: #{control.inspect}" unless String == vt
-            else
-              ok, *v = extract_array(control)
-              if ok && v.size == 2
-                nm = v[0][0]
-                det = v[1][0]
-                warn "*** first element of feature controller should be a string: #{control.inspect}" unless String === nm
-              else
-                warn "*** feature controller not implemented: #{control.inspect}"
-              end
-            end
+            nm, det = extract_feature(control, d)
             $features[nm][det] = true
-            ann
+            ann if !CDDL_FEATURE_REJECT[nm]
           when :lt, :le, :gt, :ge, :eq, :ne
             op = OPERATORS[conop]
             ok, v, _vt = extract_value(control)
@@ -1120,7 +1143,7 @@ module CDDL
       s = n.to_s
       if s[-1] == "'"
         bsqual, *parts = s.split("'", -1)
-        if parts[-1] != "" 
+        if parts[-1] != ""
           warn "*** Problem decoding byte string #{s.inspect}"
         end
         bsval = parts[0...-1].join("'").gsub(/\\(.)/){$1}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cddl
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.10.1
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-25 00:00:00.000000000 Z
+date: 2022-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cbor-diag