* 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.

1 files changed, 8 insertions, 2 deletions

diff --git a/parser.l b/parser.l
index 0a19110a..66ccb4bd 100644
--- a/parser.l
+++ b/parser.l
@@ -989,7 +989,7 @@ val regex_parse(val string, val error_stream)
   return parser.errors ? nil : parser.syntax_tree;
 }
 
-val lisp_parse(val source_in, val error_stream)
+val lisp_parse(val source_in, val error_stream, val error_return_val)
 {
   uses_or2;
   val source = default_bool_arg(source_in);
@@ -1013,5 +1013,11 @@ val lisp_parse(val source_in, val error_stream)
     gc_state(gc);
   }
   std_error = save_stream;
-  return parser.errors ? nil : parser.syntax_tree;
+
+  if (parser.errors) {
+    if (missingp(error_return_val))
+      uw_throwf(syntax_error_s, lit("read: syntax error"), nao);
+    return error_return_val;
+  }
+  return parser.syntax_tree;
 }