From 46c2514e82bf5f6ed45ef6ac8b123c9283bf8d6a Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 13 Sep 2007 20:18:38 +0000 Subject: c-common.c (fname_as_string): Update. gcc * c-common.c (fname_as_string): Update. * c-parser.c (c_parser) : New field. (c_lex_one_token): Update. Add 'parser' argument. (c_parser_simple_asm_expr): Update. (c_parser_attributes): Update. (c_parser_asm_statement): Update. (c_parser_asm_operands): Update. (c_parser_peek_token): Update. (c_parser_peek_2nd_token): Update. * c-lex.c (c_lex_string_translate): Remove. (c_lex_return_raw_strings): Likewise. (c_lex_with_flags): Added 'lex_flags' argument. (lex_string): Added 'translate' argument. * c-pragma.h (c_lex_with_flags): Update. (c_lex_string_translate, c_lex_return_raw_strings): Remove. (C_LEX_STRING_NO_TRANSLATE): New define. (C_LEX_RAW_STRINGS): Likewise. gcc/cp * parser.c (cp_lexer_new_main): Don't use c_lex_return_raw_strings. (cp_lexer_get_preprocessor_token): Update. Add special case when lexer is NULL. From-SVN: r128479 --- gcc/c-pragma.h | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'gcc/c-pragma.h') diff --git a/gcc/c-pragma.h b/gcc/c-pragma.h index 8ccf4ba..9896f43 100644 --- a/gcc/c-pragma.h +++ b/gcc/c-pragma.h @@ -110,19 +110,18 @@ extern void add_to_renaming_pragma_list (tree, tree); extern enum cpp_ttype pragma_lex (tree *); +/* Flags for use with c_lex_with_flags. The values here were picked + so that 0 means to translate and join strings. */ +#define C_LEX_STRING_NO_TRANSLATE 1 /* Do not lex strings into + execution character set. */ +#define C_LEX_RAW_STRINGS 2 /* Return raw strings -- no + concatenation, no + translation. */ + /* This is not actually available to pragma parsers. It's merely a convenient location to declare this function for c-lex, after having enum cpp_ttype declared. */ -extern enum cpp_ttype c_lex_with_flags (tree *, location_t *, unsigned char *); - -/* If 1, then lex strings into the execution character set. - If 0, lex strings into the host character set. - If -1, lex both, and chain them together, such that the former - is the TREE_CHAIN of the latter. */ -extern int c_lex_string_translate; - -/* If true, strings should be passed to the caller of c_lex completely - unmolested (no concatenation, no translation). */ -extern bool c_lex_return_raw_strings; +extern enum cpp_ttype c_lex_with_flags (tree *, location_t *, unsigned char *, + int); #endif /* GCC_C_PRAGMA_H */ -- cgit v1.1