summaryrefslogtreecommitdiffstats
path: root/lib.h
diff options
context:
space:
mode:
Diffstat (limited to 'lib.h')
-rw-r--r--lib.h13
1 files changed, 6 insertions, 7 deletions
diff --git a/lib.h b/lib.h
index 34c6b59d..9ebfe524 100644
--- a/lib.h
+++ b/lib.h
@@ -412,12 +412,13 @@ INLINE val chr(wchar_t ch)
#define lit(strlit) lit_noex(strlit)
-#define keyword_package (deref(get_keyword_package()))
-#define user_package (deref(get_user_package()))
-#define system_package (deref(get_system_package()))
+#define keyword_package keyword_package_var
+#define user_package user_package_var
+#define system_package system_package_var
+#define cur_package (get_current_package())
extern val system_package_var, keyword_package_var, user_package_var;
-extern val keyword_package_s, system_package_s, user_package_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;
extern val stream_s, hash_s, hash_iter_s, lcons_s, lstr_s, cobj_s, cptr_s;
@@ -788,9 +789,7 @@ val symbolp(val sym);
val symbol_name(val sym);
val symbol_package(val sym);
val keywordp(val sym);
-loc get_user_package(void);
-loc get_system_package(void);
-loc get_keyword_package(void);
+val get_current_package(void);
val func_f0(val, val (*fun)(val env));
val func_f1(val, val (*fun)(val env, val));
val func_f2(val, val (*fun)(val env, val, val));