From 4e92a8df0c154f55f60a8ecef97bf6b0b5a1243f Mon Sep 17 00:00:00 2001 From: law Date: Wed, 8 Apr 1998 23:29:09 +0000 Subject: * c-lex.c (finput): New global. (init_parse): Always included. Handle !USE_CPPLIB using code originally in compile_file. (finish_parse): Update for CPPLIB. * toplev.c (init_parse, finish_parse): Declare. (finput): Delete variable. Now in front-ends. (compile_file): Remove code which is now handled by init_parse which is unconditionally called. Similarly for finish_parse. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@19063 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/c-lex.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) (limited to 'gcc/c-lex.c') diff --git a/gcc/c-lex.c b/gcc/c-lex.c index 8e9e10c8fef..3a2eb0a7cc0 100644 --- a/gcc/c-lex.c +++ b/gcc/c-lex.c @@ -47,6 +47,9 @@ Boston, MA 02111-1307, USA. */ cpp_reader parse_in; cpp_options parse_options; static enum cpp_token cpp_token; +#else +/* Stream for reading from the input file. */ +FILE *finput; #endif /* The elements of `ridpointers' are identifier nodes @@ -182,12 +185,30 @@ remember_protocol_qualifiers () wordlist[i].name = "oneway"; } -#if USE_CPPLIB void init_parse (filename) char *filename; { +#if !USE_CPPLIB + /* Open input file. */ + if (filename == 0 || !strcmp (filename, "-")) + { + finput = stdin; + filename = "stdin"; + } + else + finput = fopen (filename, "r"); + if (finput == 0) + pfatal_with_name (filename); + +#ifdef IO_BUFFER_SIZE + setvbuf (finput, (char *) xmalloc (IO_BUFFER_SIZE), _IOFBF, IO_BUFFER_SIZE); +#endif +#endif /* !USE_CPPLIB */ + init_lex (); + +#if USE_CPPLIB yy_cur = "\n"; yy_lim = yy_cur+1; @@ -198,14 +219,18 @@ init_parse (filename) parse_in.show_column = 1; if (! cpp_start_read (&parse_in, filename)) abort (); +#endif } void finish_parse () { +#if USE_CPPLIB cpp_finish (&parse_in); -} +#else + fclose (finput); #endif +} void init_lex () -- cgit v1.2.1