summaryrefslogtreecommitdiff
path: root/gcc/cpphash.h
diff options
context:
space:
mode:
authorNeil Booth <neil@daikokuya.demon.co.uk>2001-02-01 19:13:53 +0000
committerNeil Booth <neil@gcc.gnu.org>2001-02-01 19:13:53 +0000
commitbd9697727ba8f11b7015a5e7e4ab20cd172ddc81 (patch)
treecb3461c1cc22fa95ff3bb51b1b2b2dbad2132830 /gcc/cpphash.h
parent8c0abc88e8dc5593bebe1f4e10b9a545cc183dad (diff)
downloadgcc-bd9697727ba8f11b7015a5e7e4ab20cd172ddc81.tar.gz
cpphash.h (struct cpp_buffer): Move saved_flags from cpp_reader.
* cpphash.h (struct cpp_buffer): Move saved_flags from cpp_reader. * cpplex.c (_cpp_lex_token): New token picks up the saved flags, and AVOID_LPASTE is cleared on meeting an unescaped newline. * cppmacro.c (builtin_macro): Set builtin flags here. (paste_all_tokens): Preserve AVOID_LPASTE on pasted token. (replace_args): Clarify intent. (cpp_get_token): Macro expansion tokens get the saved flags. Update. * cppmain.c (scan_buffer): Remove now-redundant print.printed check. From-SVN: r39393
Diffstat (limited to 'gcc/cpphash.h')
-rw-r--r--gcc/cpphash.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/gcc/cpphash.h b/gcc/cpphash.h
index 6874c21d41c..77c80cdc00d 100644
--- a/gcc/cpphash.h
+++ b/gcc/cpphash.h
@@ -194,6 +194,9 @@ struct cpp_buffer
/* Line number at line_base (above). */
unsigned int lineno;
+ /* Contains PREV_WHITE and/or AVOID_LPASTE. */
+ unsigned char saved_flags;
+
/* Because of the way the lexer works, -Wtrigraphs can sometimes
warn twice for the same trigraph. This helps prevent that. */
const unsigned char *last_Wtrigraphs;
@@ -331,9 +334,6 @@ struct cpp_reader
/* We're printed a warning recommending against using #import. */
unsigned char import_warning;
- /* Used to flag the token after a paste AVOID_LPASTE. */
- unsigned char saved_flags;
-
/* True after cpp_start_read completes. Used to inhibit some
warnings while parsing the command line. */
unsigned char done_initializing;