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.

4 files changed, 9 insertions, 5 deletions

diff --git a/eval.c b/eval.c
index fb310f44..a41d362a 100644
--- a/eval.c
+++ b/eval.c
@@ -6453,7 +6453,8 @@ void eval_init(void)
   reg_fun(intern(lit("gensym"), user_package), func_n1o(gensym, 0));
   reg_var(gensym_counter_s = intern(lit("*gensym-counter*"), user_package), zero);
   reg_var(package_alist_s = intern(lit("*package-alist*"), user_package), packages);
-  reg_var(package_s = intern(lit("*package*"), user_package), user_package);
+  reg_var(package_s = intern(lit("*package*"), user_package),
+          (opt_compat && opt_compat <= 190) ? user_package : public_package);
   reg_fun(intern(lit("make-package"), user_package), func_n1(make_package));
   reg_fun(intern(lit("find-package"), user_package), func_n1(find_package));
   reg_fun(intern(lit("delete-package"), user_package), func_n1(delete_package));
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);
diff --git a/lib.h b/lib.h
index 3f63acfe..5a818086 100644
--- a/lib.h
+++ b/lib.h
@@ -445,7 +445,7 @@ INLINE val chr(wchar_t ch)
 #define cur_package_alist_loc (get_current_package_alist_loc())
 
 extern val packages, system_package, keyword_package, user_package;
-extern val package_alist_s;
+extern val public_package, package_alist_s;
 extern val package_s, keyword_package_s, system_package_s, user_package_s;
 extern val null_s, t, cons_s, str_s, chr_s, fixnum_sl;
 extern val sym_s, pkg_s, fun_s, vec_s;
diff --git a/txr.c b/txr.c
index 14cc6642..5f2ea883 100644
--- a/txr.c
+++ b/txr.c
@@ -1065,7 +1065,8 @@ repl:
            num(opt_compat), nao);
   reg_var(args_s, or2(orig_args, arg_list));
   reg_varl(intern(lit("self-path"), user_package), lit("listener"));
-  env_vbind(dyn_env, package_s, user_package);
+  env_vbind(dyn_env, package_s,
+            opt_compat && opt_compat <= 190 ? user_package : public_package);
   env_vbind(dyn_env, load_recursive_s, nil);
   repl(bindings, std_input, std_output);
 #endif