summaryrefslogtreecommitdiffstats
path: root/lib.c
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2018-04-06 07:06:00 -0700
committerKaz Kylheku <kaz@kylheku.com>2018-04-09 15:51:24 -0700
commit23f5371c462e933102e6c4048dded8d9c5811f73 (patch)
treeaa4e5bb9c3bd661ffb32a3820a80c680d1924faf /lib.c
parent8a9159263d4ca1b174a60476e3863c45d9e63cc1 (diff)
downloadtxr-23f5371c462e933102e6c4048dded8d9c5811f73.tar.gz
txr-23f5371c462e933102e6c4048dded8d9c5811f73.tar.bz2
txr-23f5371c462e933102e6c4048dded8d9c5811f73.zip
Application code is now in a package called pub.
* lib.c (public_package): New variable. (obj_init): Protect public_package from gc. Initialize it with a package called "pub" which has the user package in its fallback list. * lib.h (public_package): Declared. * eval.c (eval_init): Initialize package_s to public_package rather than user_package, except in compat <= 190 mode. * txr.c (txr_main): Bind *package* to public_package rather than user_package, except in compat <= 190 mode.
Diffstat (limited to 'lib.c')
-rw-r--r--lib.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib.c b/lib.c
index e45cdafe..980fe768 100644
--- a/lib.c
+++ b/lib.c
@@ -84,7 +84,7 @@ int async_sig_enabled = 0;
val packages;
val system_package, keyword_package, user_package;
-val package_alist_s;
+val public_package, package_alist_s;
val package_s, system_package_s, keyword_package_s, user_package_s;
val null_s, t, cons_s, str_s, chr_s, fixnum_s, sym_s, pkg_s, fun_s, vec_s;
@@ -10665,7 +10665,7 @@ static void obj_init(void)
*/
protect(&packages, &system_package, &keyword_package,
- &user_package, &null_string, &nil_string,
+ &user_package, &public_package, &null_string, &nil_string,
&null_list, &equal_f, &eq_f, &eql_f,
&car_f, &cdr_f, &null_f, &list_f,
&identity_f, &less_f, &greater_f, &prog_string, &env_list,
@@ -10679,6 +10679,7 @@ static void obj_init(void)
system_package = make_package(lit("sys"));
keyword_package = make_package(lit("keyword"));
user_package = make_package(lit("usr"));
+ public_package = make_package(lit("pub"));
rehome_sym(hash_s, user_package);
@@ -10693,6 +10694,7 @@ static void obj_init(void)
set(mkloc(t->s.package, t), user_package);
set_package_fallback_list(system_package, cons(user_package, nil));
+ set_package_fallback_list(public_package, cons(user_package, nil));
null_s = intern(lit("null"), user_package);
cons_s = intern(lit("cons"), user_package);