From 9a2bc9a4666b0a8789eccd231dd97cf1abc74cae Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Fri, 18 Feb 2022 21:58:48 -0800 Subject: lisplib: rename lisplib funtions to autoload prefix. * lisplib.c (lisplib_init): Follow rename, and rename try-load-fun to autoload-try-fun. (lisplib_try_load_fun, lisplib_try_load_var, lisplib_try_load_fun_var, lisplib_try_load_slot, lisplib_try_load_struct, lisplib_try_load_keyword): Renamed from `lisplib_try_load_@kind` to `autoload_try_@kind`. * lisplib.h (lisplib_try_load_fun, lisplib_try_load_var, lisplib_try_load_fun_var, lisplib_try_load_slot, lisplib_try_load_struct, lisplib_try_load_keyword): Declarations renamed. * eval.c (lookup_global_var, lookup_sym_lisp1, lookup_fun, lookup_mac, lookup_symac, lookup_symac_lisp1, special_var_p, expand_param_macro, rt_defvar, rt_defv, op_defsymacro, rt_defsymacro, rt_defun, rt_defmacro, makunbound, fmakunbound, mmakunbound): Follow rename. * struct.c (make_struct_type, find_struct_type, lookup_slot_load, lookup_static_slot_load, lookup_static_slot_desc_load, slot_types, static_slot_types): Follow rename. * stdlib/place.tl (get-place-macro): Follow rename of try-load-fun to autoload-try-fun. --- struct.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'struct.c') diff --git a/struct.c b/struct.c index b994f6d4..f38e306f 100644 --- a/struct.c +++ b/struct.c @@ -46,7 +46,7 @@ #include "args.h" #include "cadr.h" #include "txr.h" -#include "lisplib.h" +#include "autoload.h" #include "struct.h" #define max(a, b) ((a) > (b) ? (a) : (b)) @@ -442,7 +442,7 @@ val make_struct_type(val name, val supers, val self = lit("make-struct-type"); val iter; - lisplib_try_load_struct(name); + autoload_try_struct(name); if (built_in_type_p(name)) uw_throwf(error_s, lit("~a: ~s is a built-in type"), @@ -604,7 +604,7 @@ val find_struct_type(val sym) { uses_or2; return or2(gethash(struct_type_hash, sym), - if2(lisplib_try_load_struct(sym), + if2(autoload_try_struct(sym), gethash(struct_type_hash, sym))); } @@ -1199,7 +1199,7 @@ static loc lookup_slot_load(val inst, struct struct_inst *si, val sym) { loc ptr = lookup_slot(inst, si, sym); if (nullocp(ptr)) { - lisplib_try_load_slot(sym); + autoload_try_slot(sym); return lookup_slot(inst, si, sym); } return ptr; @@ -1209,7 +1209,7 @@ static loc lookup_static_slot_load(struct struct_type *st, val sym) { loc ptr = lookup_static_slot(st, sym); if (nullocp(ptr)) { - lisplib_try_load_slot(sym); + autoload_try_slot(sym); return lookup_static_slot(st, sym); } return ptr; @@ -1220,7 +1220,7 @@ static struct stslot *lookup_static_slot_desc_load(struct struct_type *st, { struct stslot *stsl = lookup_static_slot_desc(st, sym); if (stsl == 0) { - lisplib_try_load_slot(sym); + autoload_try_slot(sym); return lookup_static_slot_desc(st, sym); } return stsl; @@ -1995,7 +1995,7 @@ val slot_types(val slot) { uses_or2; return or2(gethash(slot_type_hash, slot), - if2(lisplib_try_load_slot(slot), + if2(autoload_try_slot(slot), gethash(slot_type_hash, slot))); } @@ -2003,7 +2003,7 @@ val static_slot_types(val slot) { uses_or2; return or2(gethash(static_slot_type_hash, slot), - if2(lisplib_try_load_slot(slot), + if2(autoload_try_slot(slot), gethash(static_slot_type_hash, slot))); } -- cgit v1.2.3