From f6b8a4a199c9ba358e3571ae9486dd6e3b93e5b2 Mon Sep 17 00:00:00 2001
From: Kaz Kylheku <kaz@kylheku.com>
Date: Fri, 18 Feb 2022 20:07:28 -0800
Subject: lisplib: split lisplib_try_load into namespaces.

* lisplib.c (lisplib_init): Change sys:try-load (only used by
place.tl) to sys:try-load-fun, and register it to
(lisplib_try_load): External function becomes static.
(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): New
functions.

* lisplib.h (lisplib_try_load): Declaration removed.
(lisplib_try_load): External function becomes static.
(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): Declared.

* eval.c (lookup_global_var, lookup_var, lookup_symac,
lookup_symac_lisp1, rt_defvarl, rt_defv, op_defsymacro,
rt_defsymacro, makunbound): Use lisplip_try_load_var.
(lookup_fun, lookup_mac, rt_defun, rt_defmacro, fmakunbound,
mmakunbound): Use lisplib_try_load_fun.
(expand_param_macro): Use lisplib_try_load_keyword, which is
a catch-all namespace for anything tied to keywords.

* struct.c (make_struct_type, find_struct_type): Use
lisplib_try_load_struct.
(lookup_sloat_load, lookup_static_slot_load,
lookup_static_slot_desc_load, slot_types, static_slot_types):
Use lisplib_try_load_slot.

* stdlib/place.tl (get-place-macro): Use try-load-fun,
rather than try-load.
---
 struct.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'struct.c')

diff --git a/struct.c b/struct.c
index c4b58785..b994f6d4 100644
--- a/struct.c
+++ b/struct.c
@@ -442,7 +442,7 @@ val make_struct_type(val name, val supers,
   val self = lit("make-struct-type");
   val iter;
 
-  lisplib_try_load(name);
+  lisplib_try_load_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(sym),
+             if2(lisplib_try_load_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(sym);
+    lisplib_try_load_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(sym);
+    lisplib_try_load_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(sym);
+    lisplib_try_load_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),
+             if2(lisplib_try_load_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),
+             if2(lisplib_try_load_slot(slot),
                  gethash(static_slot_type_hash, slot)));
 }
 
-- 
cgit v1.2.3