From 22ff849e9602f1f7120e504d4295f4e9854e0c88 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Sun, 31 Jan 2016 03:07:29 -0800 Subject: Support lazy loading of stdlib struct definitions. * struct.c (make_struct_type): Use find_struct_type rather than direct lookup in struct_type_hash. (find_struct_type): Use lisplib_try_load if a type is not found to trigger autoloading on the symbol. --- struct.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/struct.c b/struct.c index ad7a6260..1eeb79e6 100644 --- a/struct.c +++ b/struct.c @@ -44,6 +44,7 @@ #include "args.h" #include "cadr.h" #include "txr.h" +#include "lisplib.h" #include "struct.h" #define max(a, b) ((a) > (b) ? (a) : (b)) @@ -204,7 +205,7 @@ val make_struct_type(val name, val super, val self = lit("make-struct-type"); if (super && symbolp(super)) { - val supertype = gethash(struct_type_hash, super); + val supertype = find_struct_type(super); if (!super) no_such_struct(self, super); super = supertype; @@ -298,7 +299,10 @@ static val make_struct_type_compat(val name, val super, val slots, val find_struct_type(val sym) { - return gethash(struct_type_hash, sym); + uses_or2; + return or2(gethash(struct_type_hash, sym), + if2(lisplib_try_load(sym), + gethash(struct_type_hash, sym))); } val struct_type_p(val obj) -- cgit v1.2.3