Source file inclusion implemented: needed for macros.

* match.c (include_s): New symbol variable.
(v_load): Function extended to handle include semantics.
(include): External wrapper function for doing inclusion
via v_load.
(syms_init): include_s initialized.

* match.h (include_s): Declared.
(include): Declared.

* parser.y (check_for_include): New static function.
(clauses_rev): Use check_for_include to replace @(include ..)
directive.

* txr.1: Documented include.

* genvim.txr: Added include symbol.

* txr.vim: Regenerated.

1 files changed, 3 insertions, 1 deletions

diff --git a/match.h b/match.h
index 176edcc7..705290f2 100644
--- a/match.h
+++ b/match.h
@@ -25,9 +25,11 @@
  */
 
 extern val text_s, choose_s, gather_s, do_s, require_s;
-extern val close_s, load_s, mod_s, modlast_s, line_s, counter_k, env_k;
+extern val close_s, load_s, include_s, mod_s, modlast_s, line_s;
+extern val counter_k, env_k;
 val format_field(val string_or_list, val modifier, val filter, val eval_fun);
 val match_filter(val name, val arg, val other_args);
 val match_fun(val name, val args, val input, val files);
+val include(val specline);
 int extract(val spec, val filenames, val bindings);
 void match_init(void);