From f9b5f7426b95ed5809c2ef8257b962306844f87b Mon Sep 17 00:00:00 2001 From: neil Date: Mon, 24 Sep 2001 22:53:12 +0000 Subject: * c-lex.c (cb_def_pragma): Update. (c_lex): Update, and skip padding. * cppexp.c (lex, parse_defined): Update, remove unused variable. * cpphash.h (struct toklist): Delete. (union utoken): New. (struct cpp_context): Update. (struct cpp_reader): New members eof, avoid_paste. (_cpp_temp_token): New. * cppinit.c (cpp_create_reader): Update. * cpplex.c (_cpp_temp_token): New. (_cpp_lex_direct): Add PREV_WHITE when parsing args. (cpp_output_token): Don't print leading whitespace. (cpp_output_line): Update. * cpplib.c (glue_header_name, parse_include, get__Pragma_string, do_include_common, do_line, do_ident, do_pragma, do_pragma_dependency, _cpp_do__Pragma, parse_answer, parse_assertion): Update. (get_token_no_padding): New. * cpplib.h (CPP_PADDING): New. (AVOID_LPASTE): Delete. (struct cpp_token): New union member source. (cpp_get_token): Update. * cppmacro.c (macro_arg): Convert to use pointers to const tokens. (builtin_macro, paste_all_tokens, paste_tokens, funlike_invocation_p, replace_args, quote_string, stringify_arg, parse_arg, next_context, enter_macro_context, expand_arg, _cpp_pop_context, cpp_scan_nooutput, _cpp_backup_tokens, _cpp_create_definition): Update. (push_arg_context): Delete. (padding_token, push_token_context, push_ptoken_context): New. (make_string_token, make_number_token): Update, rename. (cpp_get_token): Update to handle tokens as pointers to const, and insert padding appropriately. * cppmain.c (struct printer): New member prev. (check_multiline_token): Constify. (do_preprocessing, cb_line_change): Update. (scan_translation_unit): Update to handle spacing. * scan-decls.c (get_a_token): New. (skip_to_closing_brace, scan_decls): Update. * fix-header.c (read_scan_file): Update. * doc/cpp.texi: Update. * gcc.dg/cpp/macro10.c: New test. * gcc.dg/cpp/strify3.c: New test. * gcc.dg/cpp/spacing1.c: Add tests. * gcc.dg/cpp/19990703-1.c: Remove bogus test. * gcc.dg/cpp/20000625-2.c: Fudge to pass. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@45793 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/cpplib.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'gcc/cpplib.h') diff --git a/gcc/cpplib.h b/gcc/cpplib.h index ad7418755a5..b8db3663794 100644 --- a/gcc/cpplib.h +++ b/gcc/cpplib.h @@ -134,6 +134,7 @@ struct file_name_map_list; \ TK(CPP_COMMENT, SPELL_STRING) /* Only if output comments. */ \ TK(CPP_MACRO_ARG, SPELL_NONE) /* Macro argument. */ \ + OP(CPP_PADDING, "") /* Whitespace for cpp0. */ \ OP(CPP_EOF, "EOL") /* End of line or file. */ #define OP(e, s) e, @@ -164,8 +165,7 @@ struct cpp_string #define PASTE_LEFT (1 << 3) /* If on LHS of a ## operator. */ #define NAMED_OP (1 << 4) /* C++ named operators. */ #define NO_EXPAND (1 << 5) /* Do not macro-expand this token. */ -#define AVOID_LPASTE (1 << 6) /* Check left for accidental pastes. */ -#define BOL (1 << 7) /* Token at beginning of line. */ +#define BOL (1 << 6) /* Token at beginning of line. */ /* A preprocessing token. This has been carefully packed and should occupy 12 bytes on 32-bit hosts and 16 bytes on 64-bit hosts. */ @@ -179,6 +179,7 @@ struct cpp_token union { cpp_hashnode *node; /* An identifier. */ + const cpp_token *source; /* Inherit padding from this token. */ struct cpp_string str; /* A string, or number. */ unsigned int arg_no; /* Argument no. for a CPP_MACRO_ARG. */ unsigned char c; /* Character represented by CPP_OTHER. */ @@ -235,6 +236,9 @@ struct cpp_options /* The language we're preprocessing. */ enum c_lang lang; + /* Nonzero means to return spacing characters for stand-alone CPP. */ + unsigned char spacing; + /* Non-0 means -v, so print the full set of include dirs. */ unsigned char verbose; @@ -497,7 +501,7 @@ extern int cpp_avoid_paste PARAMS ((cpp_reader *, const cpp_token *, const cpp_token *)); extern enum cpp_ttype cpp_can_paste PARAMS ((cpp_reader *, const cpp_token *, const cpp_token *, int *)); -extern void cpp_get_token PARAMS ((cpp_reader *, cpp_token *)); +extern const cpp_token *cpp_get_token PARAMS ((cpp_reader *)); extern const unsigned char *cpp_macro_definition PARAMS ((cpp_reader *, const cpp_hashnode *)); extern void _cpp_backup_tokens PARAMS ((cpp_reader *, unsigned int)); -- cgit v1.2.1