cddl 0.8.24 → 0.8.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2c1f0547764e58450c649bbea75add7bdced3de13d209e2889245f9f93ccc32
-  data.tar.gz: '053925690f1ff8bd8511aaf7879fb0c6ff012357e2b5cb2f66d268e7c8ee6e3d'
+  metadata.gz: 2ecd9496de4033983eac3321d6cda899c4e948656e06fe48d6bc5e5b9d8e3942
+  data.tar.gz: c117ef0c739d0c9d3967532c57a23aec3dd796c0191a8afb1eb03ee3aae4bd9d
 SHA512:
-  metadata.gz: 340381df7522af59ae8bdf637dd7a0731e623f0d36645592c6d1488d2a247d88e612850884f20a27940b9aa66e5174a931ef7d0575ba04bb412070a635706083
-  data.tar.gz: 64ef37b0a90f0b569fc24dfecf3c968296ac3a07602638ee48cf62273d7eecad801d28a1a83efe3b4db1a2ae9234cf97d703a02292ffafdaf480320440a5840a
+  metadata.gz: 2454be6a2b39855ef2d2111c5b5ef98066e32c078ea2ada8ae911c9b0c08fc48cc85c60bead949ab04f5bb7ed4499193283f0abb92296486ec797e48ef1ceb07
+  data.tar.gz: 370c93eec6ffc637d4814a81336ebca143ef334a3fad807a2f213104d5ae5051277fbe7d8db19d406e4bde675ff6d993c171f2b5532ff91e64803254f18ec258

data/bin/cddl

@@ -19,17 +19,19 @@ def usage
   exit EX_USAGE
 end
 
-def read_arg(arg)
+def read_arg(arg, remember_fn = true)
   if arg == "-"
+    $fn = "(stdin)" if remember_fn
     STDIN.read
   else
     usage unless arg
+    $fn = arg if remember_fn
     File.read(arg, mode: "rb")
   end
 end
 
 def parser
-  @parser ||= CDDL::Parser.new(read_arg(ARGV[0]))
+  @parser ||= CDDL::Parser.new(read_arg(ARGV[0], false))
 end
 
 def my_pp(v)

data/cddl.gemspec

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

data/lib/cbor-pp-play.rb

@@ -2,6 +2,7 @@ require_relative "cbor-pp"
 
 a = [1, {foo: "bar", busel: "basel", baz: "bass", ant: "cat", bat: "dog", eel: "fox"},
              2, 3, 4, [3]*55, "foo".b, 0.00006103515625, 0.0000099, 1e-7, nil]
+a[0].cbor_annotation_add "flurp"
 a[1].cbor_annotation_add "fasel"
 CBOR::PP.pp a
 

data/lib/cddl.rb

@@ -463,7 +463,10 @@ module CDDL
         when :cat, :det
           lhs = generate1(target, inmap)
           rhs = generate1(control)
-          rhs = remove_indentation(rhs) if conop == :det
+          if conop == :det
+            lhs = remove_indentation(lhs)
+            rhs = remove_indentation(rhs)
+          end
           begin
             lhs + rhs
           rescue Exception => e
@@ -531,6 +534,7 @@ module CDDL
           unless !bytes.nil? && String === grammar
             fail "Don't know yet how to generate #{where}"
           end
+          grammar << "\n" unless grammar =~ /\n\z/
           out = ABNF_PARSER_FOR_STRING[grammar].generate
           if conop == :abnfb
             out = out.codepoints.pack("C*")
@@ -611,7 +615,10 @@ module CDDL
             elsif vt1 == Float
               [true, v1 + v2, vt1] if vt2 == Integer || vt2 == Float
             else
-              v2 = remove_indentation(v2) if conop == :det
+              if conop == :det
+                v1 = remove_indentation(v1)
+                v2 = remove_indentation(v2)
+              end
               [true, v1 + v2, vt1] if vt1 == vt2
             end
           end rescue nil
@@ -643,7 +650,7 @@ module CDDL
             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 != {}
+            warn "** Features potentially used (#$fn): #{features.map {|k, v| "#{k}: #{v.keys}"}.join(", ")}" if features != {}
           end
         else
           warn "CDDL validation failure (#{result.inspect} for #{d.inspect}):"
@@ -854,13 +861,16 @@ module CDDL
         [] if where[2] === d && where[1].include?(d)
       when :anno
         _, conop, target, control = where
-        if conop == :cat || conop == :plus
+        if conop == :cat || conop == :plus || conop == :det
           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
-            v2 = remove_indentation(v2) if conop == :det
+            if conop == :det
+              v1 = remove_indentation(v1)
+              v2 = remove_indentation(v2)
+            end
             # warn ["ANNO", ok1, v1, vt1, ok2, v2, vt2, d].inspect
             [] if d == v1 + v2  # XXX Focus ArgumentError
           end
@@ -909,11 +919,13 @@ module CDDL
             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

data/test-data/det1.cddl

@@ -0,0 +1,12 @@
+bar = ["" .cat foo, "" .cat cbor-tags-oid]
+
+foo = '' .det cbor-tags-oid
+
+ cbor-tags-oid = '
+   oid = 1*arc
+   roid = *arc
+   arc = [nlsb] %x00-7f
+   nlsb = %x81-ff *%x80-ff
+ ' .det ''
+
+cbor-tags-oid-decrypted = cbor-tags-oid .det (([]) .det ([]))

data/test-data/feature-controller.cddl

@@ -0,0 +1,6 @@
+a = b .feature 3
+b = c .feature 3.3
+c = d .feature (["drei", "ok"])
+d = e .feature ([[], "ok"])
+e = f .feature ([1, "ok"])
+f = int .feature (1)

data/test-data/yangid.cddl

@@ -0,0 +1 @@
+a = text .regexp "[a-z][a-z0-9]*(-[a-z0-9]+)*"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cddl
 version: !ruby/object:Gem::Version
-  version: 0.8.24
+  version: 0.8.27
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-09 00:00:00.000000000 Z
+date: 2022-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cbor-diag
@@ -135,9 +135,11 @@ files:
 - test-data/cose.cddl
 - test-data/dcaf.cddl
 - test-data/dcaf1.cddl
+- test-data/det1.cddl
 - test-data/dotsize.cddl
 - test-data/extractor-demo.cddl
 - test-data/feat1.cddl
+- test-data/feature-controller.cddl
 - test-data/feature-detail.cddl
 - test-data/foo.cddl
 - test-data/grasp-01-extract.cddl
@@ -193,6 +195,7 @@ files:
 - test-data/wrong2.cddl
 - test-data/wrong2a.cddl
 - test-data/xmlmig.cddl
+- test-data/yangid.cddl
 - test-data/yaron1.cddl
 - test/test-cddl.rb
 homepage: http://github.com/cabo/cddl
@@ -214,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: CDDL generator and validator.