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/cpphash.h | |
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/cpphash.h')
-rw-r--r-- | gcc/cpphash.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/gcc/cpphash.h b/gcc/cpphash.h index dd851dc..292b05e 100644 --- a/gcc/cpphash.h +++ b/gcc/cpphash.h @@ -242,9 +242,7 @@ struct cpp_reader const struct line_map *map; unsigned int line; - /* The position of the last lexed token and last lexed directive. */ - cpp_lexer_pos lexer_pos; - cpp_lexer_pos directive_pos; + /* The line of the '#' of the current directive. */ unsigned int directive_line; /* Memory pools. */ @@ -278,7 +276,8 @@ struct cpp_reader /* Line and column where a newline was first seen in a string constant (multi-line strings). */ - cpp_lexer_pos mlstring_pos; + unsigned int mls_line; + unsigned int mls_col; /* Buffer to hold macro definition string. */ unsigned char *macro_buffer; |