aboutsummaryrefslogtreecommitdiff
path: root/gcc/cpplex.c
diff options
context:
space:
mode:
authorNeil Booth <neil@cat.daikokuya.demon.co.uk>2001-07-29 17:27:57 +0000
committerNeil Booth <neil@gcc.gnu.org>2001-07-29 17:27:57 +0000
commit6d18adbc2c00b2919cbf6b59219a2287e6feecd7 (patch)
treeae3bf4ef61f7e71d609b714e200c82e7e441cba2 /gcc/cpplex.c
parent0068fd9637aa304ba7b27d720719bd589a7755ce (diff)
downloadgcc-6d18adbc2c00b2919cbf6b59219a2287e6feecd7.zip
gcc-6d18adbc2c00b2919cbf6b59219a2287e6feecd7.tar.gz
gcc-6d18adbc2c00b2919cbf6b59219a2287e6feecd7.tar.bz2
cppexp.c (parse_defined): Always record the macro name.
* cppexp.c (parse_defined): Always record the macro name. (lex): Don't worry about identifiers, or special-case CPP_NOT here. (_cpp_parse_expr): Figure out at the end of the routine whether we saw a valid !defined() expression. * cppfiles.c (stack_include_file): Update for mi_valid. (_cpp_pop_file_buffer): Similarly. * cpplex.c (_cpp_lex_token): Similarly. * cpphash.h (enum mi_state, enum mi_ind, mi_state, mi_if_not_defined, mi_lexed): Remove. (mi_valid): New. * cpplib.c (do_if): Simplify. (do_endif, push_conditional, _cpp_handle_directive): Update for renaming of mi_state to mi_valid. * cpp.texi: Add index entries for digraphs, and add comment that C++ refers to them as alternative tokens. From-SVN: r44459
Diffstat (limited to 'gcc/cpplex.c')
-rw-r--r--gcc/cpplex.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/cpplex.c b/gcc/cpplex.c
index 4821745..5248a42 100644
--- a/gcc/cpplex.c
+++ b/gcc/cpplex.c
@@ -1266,7 +1266,7 @@ _cpp_lex_token (pfile, result)
/* If not in a directive, this token invalidates controlling macros. */
if (!pfile->state.in_directive)
- pfile->mi_state = MI_FAILED;
+ pfile->mi_valid = false;
}
/* An upper bound on the number of bytes needed to spell a token,