summaryrefslogtreecommitdiffstats
path: root/txr.c
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2015-05-07 06:39:07 -0700
committerKaz Kylheku <kaz@kylheku.com>2015-05-07 06:39:07 -0700
commit7025b2c547d3611301e3e6fde8422aaba2acfd3f (patch)
tree606737c602e6f607c10750b3c03cf895585d12af /txr.c
parent535fff2f4e9d8a84521296c77c01e90122fcdd48 (diff)
downloadtxr-7025b2c547d3611301e3e6fde8422aaba2acfd3f.tar.gz
txr-7025b2c547d3611301e3e6fde8422aaba2acfd3f.tar.bz2
txr-7025b2c547d3611301e3e6fde8422aaba2acfd3f.zip
* Makefile (LISP_TO_C_STRING): Strip comments, but not comment lines,
so line numbers don't change. * eval.c (eval_init): Fix registrations of lisp-parse and read. * lisplib.c (place_instantiate): Give name to parsed string stream using new lisp_parse argument. * parser.c (lisp_parse): Takes new argument to override name. * parser.h (lisp_parse): Declaration updated. * txr.c (txr_main): Call lisp_parse with four args, defaulting the new one. * txr.1: Documented new argument.
Diffstat (limited to 'txr.c')
-rw-r--r--txr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/txr.c b/txr.c
index 392fba95..03b11a89 100644
--- a/txr.c
+++ b/txr.c
@@ -530,7 +530,7 @@ int txr_main(int argc, char **argv)
spec_file = arg;
break;
case 'e':
- eval_intrinsic(lisp_parse(arg, std_error, colon_k),
+ eval_intrinsic(lisp_parse(arg, std_error, colon_k, colon_k),
make_env(bindings, nil, nil));
evaled = t;
break;
@@ -543,7 +543,7 @@ int txr_main(int argc, char **argv)
if3(c_chr(opt) == 'P',
pprinl,
tprint));
- pf(eval_intrinsic(lisp_parse(arg, std_error, colon_k),
+ pf(eval_intrinsic(lisp_parse(arg, std_error, colon_k, colon_k),
make_env(bindings, nil, nil)), std_output);
evaled = t;
}