summaryrefslogtreecommitdiffstats
path: root/txr.1
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.1
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.1')
-rw-r--r--txr.114
1 files changed, 13 insertions, 1 deletions
diff --git a/txr.1 b/txr.1
index f1c07fa6..02bf58c1 100644
--- a/txr.1
+++ b/txr.1
@@ -23464,7 +23464,7 @@ Examples of strings which are not absolute paths.
.coNP Function @ read
.synb
-.mets (read >> [ source >> [ error-stream <> [ error-return-value ]]])
+.mets (read >> [ source >> [ error-stream >> [ error-return-value <> [ name ]]]])
.syne
.desc
The
@@ -23488,6 +23488,18 @@ The optional
argument can be used to specify a stream to which
parse errors diagnostics are sent. If absent, the diagnostics are suppressed.
+The optional
+.meta name
+argument can be used to specify the file name which is used for reporting
+errors. If this argument is missing, the name is taken from the name
+property of the
+.meta source
+argument if it is a stream, or else the word
+.code string
+is used as the name if
+.meta source
+is a string.
+
If there are no parse errors, the function returns the parsed data
structure. If there are parse errors, and the
.meta error-return-value