diff options
| author | Neil Booth <neil@daikokuya.demon.co.uk> | 2001-09-15 10:18:03 +0000 |
|---|---|---|
| committer | Neil Booth <neil@gcc.gnu.org> | 2001-09-15 10:18:03 +0000 |
| commit | 5041042620988be8180d56e808f8efe66c56c79b (patch) | |
| tree | 8e0d501bff80d035729518382d4a712cf34238c5 /gcc/cpplex.c | |
| parent | 6131fd23f505853e49b7f394b2dcb5de50076ad1 (diff) | |
| download | gcc-5041042620988be8180d56e808f8efe66c56c79b.zip gcc-5041042620988be8180d56e808f8efe66c56c79b.tar.gz gcc-5041042620988be8180d56e808f8efe66c56c79b.tar.bz2 | |
cpphash.h (struct cpp_reader): Remove lexer_pos, directive_pos.
* cpphash.h (struct cpp_reader): Remove lexer_pos, directive_pos.
Split mlstring_pos into mls_line and mls_col.
* cppinit.c (cpp_create_reader): Initialize line to 1.
(cpp_destroy): Free tokenruns.
(push_include): Don't update lexer_pos.
* cpplex.c (unterminated, parse_string): Update.
(lex_token): Don't update lexer_pos, update.
* cpplib.c (if_stack): Save line instead of line + col.
(start_directive, _cpp_do__Pragma, do_else, do_elif,
push_conditional, _cpp_pop_buffer): Update.
* cppmacro.c (funlike_invocation_p): Don't save lexer_pos.
(_cpp_create_definition): Update.
From-SVN: r45627
Diffstat (limited to 'gcc/cpplex.c')
| -rw-r--r-- | gcc/cpplex.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/gcc/cpplex.c b/gcc/cpplex.c index 3243077..f57d482 100644 --- a/gcc/cpplex.c +++ b/gcc/cpplex.c @@ -656,13 +656,11 @@ unterminated (pfile, term) { cpp_error (pfile, "missing terminating %c character", term); - if (term == '\"' && pfile->mlstring_pos.line - && pfile->mlstring_pos.line != pfile->lexer_pos.line) + if (term == '\"' && pfile->mls_line && pfile->mls_line != pfile->line) { - cpp_error_with_line (pfile, pfile->mlstring_pos.line, - pfile->mlstring_pos.col, + cpp_error_with_line (pfile, pfile->mls_line, pfile->mls_col, "possible start of unterminated string literal"); - pfile->mlstring_pos.line = 0; + pfile->mls_line = 0; } } @@ -760,8 +758,11 @@ parse_string (pfile, token, terminator) cpp_pedwarn (pfile, "multi-line string literals are deprecated"); } - if (pfile->mlstring_pos.line == 0) - pfile->mlstring_pos = pfile->lexer_pos; + if (pfile->mls_line == 0) + { + pfile->mls_line = token->line; + pfile->mls_col = token->col; + } c = handle_newline (pfile, c); *dest++ = '\n'; @@ -998,7 +999,6 @@ lex_token (pfile, result) result->flags = buffer->saved_flags; buffer->saved_flags = 0; update_tokens_line: - pfile->lexer_pos.line = pfile->line; result->line = pfile->line; skipped_white: @@ -1006,7 +1006,6 @@ lex_token (pfile, result) if (c == EOF && buffer->cur < buffer->rlimit) c = *buffer->cur++; result->col = CPP_BUF_COLUMN (buffer, buffer->cur); - pfile->lexer_pos.col = result->col; buffer->read_ahead = EOF; trigraph: @@ -1171,9 +1170,7 @@ lex_token (pfile, result) /* Skip_line_comment updates buffer->read_ahead. */ if (skip_line_comment (pfile) && CPP_OPTION (pfile, warn_comments)) - cpp_warning_with_line (pfile, pfile->lexer_pos.line, - pfile->lexer_pos.col, - "multi-line comment"); + cpp_warning (pfile, "multi-line comment"); } /* Skipping the comment has updated buffer->read_ahead. */ |