From 9a178bcb364eeb8a9aa334f4de65d30722596cdb Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Fri, 24 Feb 2012 04:26:35 -0800 Subject: First cut at @(load) directive. Incomplete: debug location info needs to record file name, not only line number; absolute paths not handled, etc. * match.c (load_s): New symbol variable. (v_load): New static function. (syms_init): load_s initialized. (dir_tables_init): Load directive registered. * match.h (load_s): Declared. * parser.h (parse_reset): New function declared. * parser.l (spec_file_str): Global variable moved from txr.c. (parse_reset): New function. * parser.y (clause): Special handling for @(load ...) directive. parent file path inserted into the syntax at parse time, so when the load directive executes, it can load the file from the same directory as the parent file. * txr.c (spec_file_str): Global variable moved to parser.l. --- parser.y | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'parser.y') diff --git a/parser.y b/parser.y index ebcf63b3..bf58d9ff 100644 --- a/parser.y +++ b/parser.y @@ -141,7 +141,15 @@ clause : all_clause { $$ = list($1, nao); rlcp($$, $1); } rlcp($$, $1); } | try_clause { $$ = list($1, nao); rlcp($$, $1); } | output_clause { $$ = list($1, nao); rlcp($$, $1); } - | line { $$ = $1; } + | line { val elem = car($1); + + if (consp(elem) && car(elem) == load_s) + { elem = rlcp(cons(load_s, + cons(spec_file_str, + cdr(elem))), elem); + $$ = rlcp(cons(elem, cdr($1)), $1); } + else + { $$ = $1; } } | repeat_clause { $$ = nil; yyerror("repeat outside of output"); } ; -- cgit v1.2.3