diff options
| author | Zack Weinberg <zack@wolery.cumb.org> | 2000-03-13 22:01:08 +0000 |
|---|---|---|
| committer | Zack Weinberg <zack@gcc.gnu.org> | 2000-03-13 22:01:08 +0000 |
| commit | 45b966db65e4ab054d31f01f65b7a98023dbcb54 (patch) | |
| tree | 665428b0af6694941ce92f0755dc66596d94fa55 /gcc/cppinit.c | |
| parent | 46089b8642e5054073af90a85cfdd07f0f09353b (diff) | |
| download | gcc-45b966db65e4ab054d31f01f65b7a98023dbcb54.zip gcc-45b966db65e4ab054d31f01f65b7a98023dbcb54.tar.gz gcc-45b966db65e4ab054d31f01f65b7a98023dbcb54.tar.bz2 | |
Makefile.in (LIBCPP_OBJS): Add cpplex.o.
* Makefile.in (LIBCPP_OBJS): Add cpplex.o.
(cpplex.o): New target.
* po/POTFILES.in: Add cpplex.c.
* cpplex.c (_cpp_grow_token_buffer, null_cleanup,
cpp_push_buffer, cpp_pop_buffer, cpp_scan_buffer,
cpp_expand_to_buffer, cpp_buf_line_and_col, cpp_file_buffer,
skip_block_comment, skip_line_comment, skip_comment,
copy_comment, _cpp_skip_hspace, _cpp_skip_rest_of_line,
_cpp_parse_name, skip_string, parse_string,
_cpp_parse_assertion, cpp_get_token, cpp_get_non_space_token,
_cpp_get_directive_token, find_position,
_cpp_read_and_prescan, _cpp_init_input_buffer): Move here.
(maybe_macroexpand, _cpp_lex_token): New functions.
* cpplib.c (SKIP_WHITE_SPACE, eval_if_expr, parse_set_mark,
parse_goto_mark): Delete.
(_cpp_handle_eof): New function.
(_cpp_handle_directive): Rename from handle_directive.
(_cpp_output_line_command): Rename from output_line_command.
(do_if, do_elif): Call _cpp_parse_expr directly.
* cppfiles.c (_cpp_read_include_file): Don't call
init_input_buffer here.
* cpphash.c (quote_string): Move here, rename _cpp_quote_string.
* cppexp.c (_cpp_parse_expr): Diddle parsing_if_directive
here; pop the token_buffer and skip the rest of the line here.
* cppinit.c (cpp_start_read): Call _cpp_init_input_buffer
here.
* cpphash.h (CPP_RESERVE, CPP_IS_MACRO_BUFFER, ACTIVE_MARK_P):
Define here.
(CPP_SET_BUF_MARK, CPP_GOTO_BUF_MARK, CPP_SET_MARK,
CPP_GOTO_MARK): New macros.
(_cpp_quote_string, _cpp_parse_name, _cpp_skip_rest_of_line,
_cpp_skip_hspace, _cpp_parse_assertion, _cpp_lex_token,
_cpp_read_and_prescan, _cpp_init_input_buffer,
_cpp_grow_token_buffer, _cpp_get_directive_token,
_cpp_handle_directive, _cpp_handle_eof,
_cpp_output_line_command): Prototype them here.
* cpplib.h (enum cpp_token): Add CPP_MACRO.
(CPP_RESERVE, get_directive_token, cpp_grow_buffer,
quote_string, output_line_command): Remove.
From-SVN: r32513
Diffstat (limited to 'gcc/cppinit.c')
| -rw-r--r-- | gcc/cppinit.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/gcc/cppinit.c b/gcc/cppinit.c index 0eb2a29..674e140 100644 --- a/gcc/cppinit.c +++ b/gcc/cppinit.c @@ -519,7 +519,7 @@ dump_special_to_buffer (pfile, macro_name) { static const char define_directive[] = "#define "; int macro_name_length = strlen (macro_name); - output_line_command (pfile, same_file); + _cpp_output_line_command (pfile, same_file); CPP_RESERVE (pfile, sizeof(define_directive) + macro_name_length); CPP_PUTS_Q (pfile, define_directive, sizeof(define_directive)-1); CPP_PUTS_Q (pfile, macro_name, macro_name_length); @@ -872,6 +872,9 @@ cpp_start_read (pfile, fname) with a compiler that supports C99 designated initializers. */ init_IStable (); + /* Set up the tables used by read_and_prescan. */ + _cpp_init_input_buffer (pfile); + /* Set up the include search path now. */ if (! opts->no_standard_includes) initialize_standard_includes (pfile); @@ -933,7 +936,7 @@ cpp_start_read (pfile, fname) counter accordingly. */ pfile->lineno = CPP_BUFFER (pfile)->lineno; else - output_line_command (pfile, same_file); + _cpp_output_line_command (pfile, same_file); pfile->only_seen_white = 2; /* The -imacros files can be scanned now, but the -include files @@ -957,7 +960,7 @@ cpp_start_read (pfile, fname) while (p) { if (cpp_read_file (pfile, p->arg)) - output_line_command (pfile, enter_file); + _cpp_output_line_command (pfile, enter_file); q = p->next; free (p); |