cddlc 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2ac8a4458103e760994cda656a70d934555d3b3a5f86416c53b6c3be353fd38
-  data.tar.gz: 7f8d5cd6a43fb98f3d201fb218d30b865f47cc0b8b0714db6ce68e2770b130bc
+  metadata.gz: ee5782e163037658b00ecdca15da1a80d779406426f98a25e2d88888f713fd3b
+  data.tar.gz: fa784df9fbf17c6ed73108f6dc139771edb46d21fae1276d935deba15580a2dc
 SHA512:
-  metadata.gz: 82ef745cc5ccae3bfb100227f9713bc923b535d9f7c6087c7b091a0570be012236f2756280319163574d145745370f8193467c0824e2a66b3e48cf67621c69c6
-  data.tar.gz: 369473fb2b9ed8b88c6f42f627af9fa41a5a0fe3c0600a0574bd7a2815284b4c68fc9d33cfcd8a1f8fad107c7aba0282063d8a2e34be6677fc2b1d9bc9f78885
+  metadata.gz: d146016f0cc89d76678b737920898f599346bfe342b01e42af79f6a2f20c7dd986ed22b4239097f54f80e685e60de1d4735342315b99fbd014a632af82ff70e4
+  data.tar.gz: 05cfab1f81f76fda3882ec8b10d2952df94c41bba86de4f9fbc3285b20a2bf01a45dc6a6641c478a8dbcf91a0c2d90adee2669fa7717469e42318ce380e320c7

data/cddlc.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "cddlc"
-  s.version = "0.2.2"
+  s.version = "0.2.4"
   s.summary = "CDDL (Concise Data Definition Language) converters and miscellaneous tools"
   s.description = %q{cddlc implements converters and miscellaneous tools for CDDL, RFC 8610}
   s.author = "Carsten Bormann"

data/lib/cddlc.rb

@@ -162,8 +162,12 @@ class CDDL
             end
           end
           break unless got_more
+          recently_imported = to_be_imported
           to_be_imported = cddl_undefined # XXX square...
           warn "TO IMPORT #{to_be_imported.inspect}" if $options.verbose
+          if to_be_imported == recently_imported
+            fail "No progress importing #{to_be_imported.inspect} from #{fn} (generics issue?)"
+          end
           must_be_found = false
         end
         if preferred_tag

data/lib/processor/cddl-expander.rb

@@ -2,6 +2,16 @@ require_relative "../cddlc.rb"
 require_relative "./cddl-visitor.rb"
 
 class CDDL
+
+  class MissingGenericError < StandardError
+    attr_reader :name, :args
+    def initialize(name_, args_)
+      @name = name_
+      @args = args_
+      super("** no generic for #{name}<#{args}>")
+    end
+  end
+
   def substitute(prod, parms, subs, &block)
     visit(prod) do |p, &block1|
       case p
@@ -18,7 +28,9 @@ class CDDL
   end
   def gen_apply(gen_name, gen_args, &block)
     gen_parms, gen_prod = @gen[gen_name]
-    fail "** no generic for #{gen_name}<#{gen_args}>" unless gen_parms
+    unless gen_parms
+      fail MissingGenericError.new(gen_name, gen_args)
+    end
     substitute(gen_prod, gen_parms, gen_args, &block)
   end
   def expand_prod(prod)

data/lib/processor/cddl-undefined.rb

@@ -27,7 +27,11 @@ class CDDL
   def cddl_undefined
     # currently only works on expanded...
     cddl2 = self.deep_clone                # needs deep-clone
-    cddl2.expand_generics
+    begin
+      cddl2.expand_generics
+    rescue CDDL::MissingGenericError => e
+      return [e.name] # make this expandable first by pulling missing generic
+    end
     used = {}
     cddl2.rules.each do |k, v|
       fail unless String === k

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cddlc
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-12 00:00:00.000000000 Z
+date: 2024-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler