summaryrefslogtreecommitdiffstats
path: root/eval.c
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2014-09-02 19:46:18 -0700
committerKaz Kylheku <kaz@kylheku.com>2014-09-02 19:46:18 -0700
commit1572c93478c55ff14738a4b6f1b38dc41878a816 (patch)
tree3d02c3c2ab4c76af0ae6ce7f049edfa64405d04c /eval.c
parent0207bdeab644efddce25225c7344aabfb6d73f1f (diff)
downloadtxr-1572c93478c55ff14738a4b6f1b38dc41878a816.tar.gz
txr-1572c93478c55ff14738a4b6f1b38dc41878a816.tar.bz2
txr-1572c93478c55ff14738a4b6f1b38dc41878a816.zip
* eval.c (eval_init): Update registration of lisp-parse and read
to account for new parameter. * lib.c (syntax_error_s): New symbol_variable. (obj_init): New symbol variable initialized. * lib.h (syntax_error_s): Declared. * parser.h (lisp_parse): Declaration updated. * parser.l (lisp_parse): Takes third parameter. * txr.1: Third parameter of read described. * txr.c (txr_main): Pass colon_k to third parameter of lisp_parse to obtain exception throwing behavior. * unwind.c (uw_init): Register syntax-error as subtype of error.
Diffstat (limited to 'eval.c')
-rw-r--r--eval.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/eval.c b/eval.c
index 56eb844e..a3272d6a 100644
--- a/eval.c
+++ b/eval.c
@@ -3787,8 +3787,8 @@ void eval_init(void)
func_n4o(hash_update_1, 3));
reg_fun(intern(lit("eval"), user_package), func_n2o(eval_intrinsic, 1));
- reg_fun(intern(lit("lisp-parse"), user_package), func_n2o(lisp_parse, 0));
- reg_fun(intern(lit("read"), user_package), func_n2o(lisp_parse, 0));
+ reg_fun(intern(lit("lisp-parse"), user_package), func_n3o(lisp_parse, 0));
+ reg_fun(intern(lit("read"), user_package), func_n3o(lisp_parse, 0));
reg_fun(intern(lit("expand"), system_package), func_n2o(expand, 1));
reg_fun(intern(lit("macro-form-p"), user_package), func_n2o(macro_form_p, 1));
reg_fun(intern(lit("macroexpand-1"), user_package),