diff options
author | Kaz Kylheku <kaz@kylheku.com> | 2015-09-07 13:16:58 -0700 |
---|---|---|
committer | Kaz Kylheku <kaz@kylheku.com> | 2015-09-07 13:16:58 -0700 |
commit | 2d5fcd953cd1632dece9d4202e477a5b2cc95663 (patch) | |
tree | 04708e458c3a407e8afb23a3eeb2a6da41f06d89 /match.c | |
parent | b6a1545715cdef21f6a2989436775e45bada14a9 (diff) | |
download | txr-2d5fcd953cd1632dece9d4202e477a5b2cc95663.tar.gz txr-2d5fcd953cd1632dece9d4202e477a5b2cc95663.tar.bz2 txr-2d5fcd953cd1632dece9d4202e477a5b2cc95663.zip |
Go into repl after processing txr file also.
* match.c (extract): Return match result as cons, rather than
int termination status.
* match.h (extract): Declaration updated.
* txr.c (txr_main): Handle result cons. If repl mode is selected,
pass bindings from car(result) to repl. Otherwise use match success
indication in cdr(result) to determine termination status.
Diffstat (limited to 'match.c')
-rw-r--r-- | match.c | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -4051,15 +4051,16 @@ val include(val specline) return v_load(&c); } -int extract(val spec, val files, val predefined_bindings) +val extract(val spec, val files, val predefined_bindings) { - cons_bind (bindings, success, match_files(mf_all(spec, files, - predefined_bindings, - t, nil))); + val result = match_files(mf_all(spec, files, predefined_bindings, + t, nil)); + cons_bind (bindings, success, result); if (opt_print_bindings) { if (bindings) { bindings = nreverse(bindings); + rplaca(result, bindings); dump_bindings(bindings); } @@ -4067,7 +4068,7 @@ int extract(val spec, val files, val predefined_bindings) put_line(lit("false"), std_output); } - return success ? 0 : EXIT_FAILURE; + return result; } static void syms_init(void) |