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, 2 insertions, 1 deletions

diff --git a/genvim.txr b/genvim.txr
index ac9dc5d0..e49f8416 100644
--- a/genvim.txr
+++ b/genvim.txr
@@ -37,7 +37,8 @@ static void dir_tables_init(void)
 @(do (set [txr-sym 0..0] '("rep" "end" "and" "or"
                            "catch" "finally"
                            "until" "last"
-                           "if" "else" "elif")))
+                           "if" "else" "elif"
+                           "include")))
 @(do (set [txl-sym 0..0] '("macro-time" "macrolet" "symacrolet")))
 @(set (txr-sym txl-sym) (@(sort (uniq txr-sym)) @(sort (uniq txl-sym))))
 @(output)