From 5285db54f7199cf75c0b740faaeee15cc9cc8c6a Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Wed, 27 Nov 2013 21:05:51 -0800 Subject: * configure: Added check to detect POSIX sleep function. * eval.c (eval_init): Register new open_tail function as intrinsic. * match.c (complex_snarf, complex_stream): Update calls to make_stdio_stream and make_pipe_stream to take fewer arguments. (match_files): Support a stream object as a data source specification in place of a string. * parser.l (parse_reset): Update call to make_stdio_stream to take fewer arguments. * stream.c: Inclusion of made properly conditional. (struct stdio_handle): pid member defined as pid_t only if we have fork functionality, otherwise defined as int. (tail_get_line, tail_get_char, tail_get_byte): New static functions. (tail_ops): New static structure. (make_stdio_stream_common): New static structure. (make_stdio_stream, make_pipe_stream): These functions lose the input and output parameters, which ended up never used. Reimplemented in terms of new common function. (make_tail_stream): New function. (make_pipevp_stream): Reimplemented in terms of new common function. (open_file, open_command): Simplified by removal of useless local variables and their computation, which used to be extra arguments to make_stdio_stream and make_pipe_stream. (open_tail): New function. (stream_init): Calls to make_stdio_stream updated. * stream.h (make_stdio_stream, make_pipe_stream): Declarations updated. (make_tail_stream, open_tail): Declared. * txr.c (txr_main): Calls to make_stdio_stream updated. --- txr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'txr.c') diff --git a/txr.c b/txr.c index 2edfb80d..5f423b03 100644 --- a/txr.c +++ b/txr.c @@ -389,7 +389,7 @@ int txr_main(int argc, char **argv) FILE *in = w_fopen(c_str(spec_file_str), L"r"); if (in == 0) uw_throwf(file_error_s, lit("unable to open ~a"), spec_file_str, nao); - yyin_stream = make_stdio_stream(in, spec_file_str, t, nil); + yyin_stream = make_stdio_stream(in, spec_file_str); } else { spec_file = L"stdin"; } @@ -404,7 +404,7 @@ int txr_main(int argc, char **argv) val name = string_utf8(*argv); if (in == 0) uw_throwf(file_error_s, lit("unable to open ~a"), name, nao); - yyin_stream = make_stdio_stream(in, name, t, nil); + yyin_stream = make_stdio_stream(in, name); spec_file = utf8_dup_from(*argv); } else { spec_file = L"stdin"; -- cgit v1.2.3