From 9ad8bad3e65de0181fe4662ec5687738ae49087c Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Tue, 8 Nov 2016 21:00:34 -0800 Subject: 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. --- eval.c | 8 +++++--- tests/009/json.txr | 2 +- 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, -- cgit v1.2.3