cddl 0.8.26 → 0.8.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47f3304378cd8f42807f0b96551a9b8cd5c609741d9a1e508c7c68913bf591d0
-  data.tar.gz: 312535858550c20a3415238c8f26b5c96f2036707e305bd6665b12bb73e4addc
+  metadata.gz: d71bf9745f9a7e1c96d6ae4007cf598a36617347c1ed772950ace7dedef3c121
+  data.tar.gz: ca84d02afd7243260046c0e75ae0b14eb5442238b97ef56f050ff0d9cbecd6c4
 SHA512:
-  metadata.gz: 36ef0f6662d44814da072251405894b4b70ef20a6a493e8de7b597ece370e774cbf8fe8d2da35c2baa5f8b08adffc1a98dffaf1535907aca11a1a3936b11286a
-  data.tar.gz: a6a731d5d348156deb0b2e3415bf6c944198bcfc7ca33632ee7f4d40e07ce832bbcadcc1b4bab4d8f75653932b9f82cba2c4ccbef662af49c81554edb2e77480
+  metadata.gz: '0595a939e1677462971fba537b6cab3268b84662e4764e2ab69658009928687ca85da7ceb721ee23c6b803c1bf70cebcb90471703cd6fb17325f37838bc45fc7'
+  data.tar.gz: a69d45135335bfcdacc58c03339ec5a7316cb4d99596e65b67b7ca947e65a47adc3fcbd7469b442d9c6bd5fec2d1ee9da8a7a07204f26a489c3c3505205abd6c

data/bin/cddl

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env RUBY_THREAD_VM_STACK_SIZE=5000000 ruby
 # -*- coding: utf-8 -*-
 # require_relative '../lib/cddl'
 require 'cddl'

data/cddl.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'cddl'
-  s.version = '0.8.26'
+  s.version = '0.8.29'
   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

@@ -534,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*")
@@ -1241,9 +1242,13 @@ module CDDL
     def g_process(name, g, genericargs)
       r, ids = g
       args = genericargs.children(:type1).map {|x| type1(x, true)}
+      # warn "** args #{args.inspect}"
       fail "number of args #{name} #{ids.size} #{args.size}" if ids.size != args.size
       bindings = Hash[ids.zip(args)]
-      r_process("#{name}<#{genericargs._strip}>", r, bindings)
+      # warn "** bindings: #{bindings.inspect}"
+      genname = "#{name}<#{args.inspect}>" # XXX this works up to a RECURSE...
+      # warn "** genname #{genname}"
+      r_process(genname, r, bindings)
     end
 
     def type_recall(name, canbegroup, genericargs)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cddl
 version: !ruby/object:Gem::Version
-  version: 0.8.26
+  version: 0.8.29
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-17 00:00:00.000000000 Z
+date: 2022-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cbor-diag
@@ -217,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.11
 signing_key:
 specification_version: 4
 summary: CDDL generator and validator.