summaryrefslogtreecommitdiffstats
path: root/lib.h
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2018-04-05 22:53:59 -0700
committerKaz Kylheku <kaz@kylheku.com>2018-04-05 22:53:59 -0700
commit1a18cf60f6f675fc6e0508cae87c4990706046e8 (patch)
tree6ef033de3ca830ac27fd4fdc46ad7f908ac197a6 /lib.h
parent0dc63a9258e21d09783f02b89e9b1ab1abbee7eb (diff)
downloadtxr-1a18cf60f6f675fc6e0508cae87c4990706046e8.tar.gz
txr-1a18cf60f6f675fc6e0508cae87c4990706046e8.tar.bz2
txr-1a18cf60f6f675fc6e0508cae87c4990706046e8.zip
lib: get rid of preprocessor macros for packages.
The identifiers user_package, system_package and keyword_package are preprocessor symbols that expand to other preprocessor symbols for no good reason. Time to get rid of this. * lib.c (system_package_var, keyword_package_var, user_package_var): Variables renamed to system_package, keyword_package and user_package. (symbol_package, keywordp, obj_init): Fix variable references to follow rename. * lib.h (keyword_package, user_package, system_package): Macros removed. (system_package_var, keyword_package_var, user_package_var): Variables renamed. * eval.c (eval_init): Fix variable references to follow rename. * parser.y (sym_helper): Likewise.
Diffstat (limited to 'lib.h')
-rw-r--r--lib.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/lib.h b/lib.h
index b473b4dd..3f63acfe 100644
--- a/lib.h
+++ b/lib.h
@@ -441,13 +441,10 @@ INLINE val chr(wchar_t ch)
#define lit(strlit) lit_noex(strlit)
-#define keyword_package keyword_package_var
-#define user_package user_package_var
-#define system_package system_package_var
#define cur_package (get_current_package())
#define cur_package_alist_loc (get_current_package_alist_loc())
-extern val packages, system_package_var, keyword_package_var, user_package_var;
+extern val packages, system_package, keyword_package, user_package;
extern val 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;