summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2016-11-08 21:00:34 -0800
committerKaz Kylheku <kaz@kylheku.com>2016-11-08 21:00:34 -0800
commit9ad8bad3e65de0181fe4662ec5687738ae49087c (patch)
treeb10e7b0619ff94121783e402d47d5b897012cdbb
parenta2ea64e158ad9be884482747b45a90e27579f9f1 (diff)
downloadtxr-9ad8bad3e65de0181fe4662ec5687738ae49087c.tar.gz
txr-9ad8bad3e65de0181fe4662ec5687738ae49087c.tar.bz2
txr-9ad8bad3e65de0181fe4662ec5687738ae49087c.zip
Deprecated undocumented *user-package* etc.
* eval.c (eval_init): Do not register *user-package*, or *system-package* or *keyword-package* variables unless in compatibility mode. We don't document this in the compatibility notes since the variables are not documented. * tests/009/json.txr: Change use of *keyword-package* to keyword-package.
-rw-r--r--eval.c8
-rw-r--r--tests/009/json.txr2
2 files changed, 6 insertions, 4 deletions
diff --git a/eval.c b/eval.c
index ec7af348..c3392acd 100644
--- a/eval.c
+++ b/eval.c
@@ -5194,9 +5194,11 @@ void eval_init(void)
reg_varl(keyword_package_s = intern(lit("keyword-package"), user_package_var),
keyword_package_var);
- reg_varl(intern(lit("*user-package*"), user_package), user_package_var);
- reg_varl(intern(lit("*system-package*"), user_package), system_package_var);
- reg_varl(intern(lit("*keyword-package*"), user_package), keyword_package_var);
+ if (opt_compat && opt_compat <= 156) {
+ reg_varl(intern(lit("*user-package*"), user_package), user_package_var);
+ reg_varl(intern(lit("*system-package*"), user_package), system_package_var);
+ reg_varl(intern(lit("*keyword-package*"), user_package), keyword_package_var);
+ }
reg_fun(intern(lit("make-sym"), user_package), func_n1(make_sym));
reg_fun(intern(lit("gensym"), user_package), func_n1o(gensym, 0));
diff --git a/tests/009/json.txr b/tests/009/json.txr
index e450b6bb..5c2732e8 100644
--- a/tests/009/json.txr
+++ b/tests/009/json.txr
@@ -53,7 +53,7 @@
@(define keyword (k))@\
@(local tok)@\
@(all)@(ws)@{tok /true|false|null/}@(trailer)@/[^A-Za-z0-9_]/@(end)@(ws)@\
- @(bind k @(intern tok *keyword-package*))@\
+ @(bind k @(intern tok keyword-package))@\
@(end)
@;
@; Recognize an object: a collection of string/value pairs,