@(load) and @(include) now load Lisp code.

* match.c (v_load): Check txr_lisp_p flag coming out of
open_txr_file and handle the Lisp case usin read_eval_stream.

* parser.c (read_eval_stream, get_parser, parser_errors):
New functions.

* parser.h (read_eval_stream, get_parser, parser_errors):
Declared.

1 files changed, 30 insertions, 0 deletions

diff --git a/parser.c b/parser.c
index 2cebed04..86511fdf 100644
--- a/parser.c
+++ b/parser.c
@@ -251,6 +251,36 @@ val lisp_parse(val source_in, val error_stream, val error_return_val, val name_i
   return pi->syntax_tree;
 }
 
+val read_eval_stream(val stream, val error_stream)
+{
+  val error_val = gensym(nil);
+
+  for (;;) {
+    val form = lisp_parse(stream, error_stream, error_val, nil);
+
+    if (form == error_val) {
+      if (parser_errors(get_parser(stream)) == zero)
+        break;
+      return nil;
+    }
+
+    (void) eval_intrinsic(form, nil);
+  }
+
+  return t;
+}
+
+val get_parser(val stream)
+{
+  return gethash(stream_parser_hash, stream);
+}
+
+val parser_errors(val parser)
+{
+  parser_t *p = coerce(parser_t *, cobj_handle(parser, parser_s));
+  return num(p->errors);
+}
+
 void parse_init(void)
 {
   parser_s = intern(lit("parser"), user_package);