diff options
| author | Zack Weinberg <zack@gcc.gnu.org> | 2000-08-04 01:30:06 +0000 |
|---|---|---|
| committer | Zack Weinberg <zack@gcc.gnu.org> | 2000-08-04 01:30:06 +0000 |
| commit | ba89d661ac573f2402fa4f3b4cb117c8c74968e2 (patch) | |
| tree | 254d84e8b966d54bb05be43ebe0b47a16be7a4ea /gcc/c-lex.c | |
| parent | d31772ca70b9d2a315372456bfdf343c3806a3f8 (diff) | |
| download | gcc-ba89d661ac573f2402fa4f3b4cb117c8c74968e2.zip gcc-ba89d661ac573f2402fa4f3b4cb117c8c74968e2.tar.gz gcc-ba89d661ac573f2402fa4f3b4cb117c8c74968e2.tar.bz2 | |
cpplex.c (parse_name): Might have to glue a CPP_OTHER token before the name.
* cpplex.c (parse_name): Might have to glue a CPP_OTHER token
before the name.
(lex_line): Glue @ onto the beginning of identifiers and
string constants, in Objective-C mode.
(output_token, spell_token): Handle CPP_OSTRING.
(can_paste, maybe_paste_with_next): Handle pasting @ onto the
beginning of a NAME or a STRING, in objc mode.
* cpplib.c (get_define_node): Do not permit identifiers that
begin with @ to be #defined.
* cppmacro.c (CAN_PASTE_AFTER): Add CPP_OTHER.
* cpplib.h (TTYPE_TABLE): Add CPP_OSTRING.
* c-lang.c, objc/objc-act.c (build_objc_string): Delete.
* c-tree.h (build_objc_string): Delete prototype.
* objc/objc-tree.def: Delete OBJC_STRING_CST.
* c-lex.c (yylex): Use build_string for all three kinds of strings.
* gcc.dg/cpp/20000625-2.c: Don't expect a warning on line 4.
From-SVN: r35470
Diffstat (limited to 'gcc/c-lex.c')
| -rw-r--r-- | gcc/c-lex.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/gcc/c-lex.c b/gcc/c-lex.c index 9ceb2bf..616ecbe 100644 --- a/gcc/c-lex.c +++ b/gcc/c-lex.c @@ -2268,25 +2268,19 @@ yylex () /* We have read the entire constant. Construct a STRING_CST for the result. */ + yylval.ttype = build_string (p - (token_buffer + 1), token_buffer + 1); if (wide_flag) { - yylval.ttype = build_string (p - (token_buffer + 1), - token_buffer + 1); TREE_TYPE (yylval.ttype) = wchar_array_type_node; value = STRING; } else if (objc_flag) { - /* Return an Objective-C @"..." constant string object. */ - yylval.ttype = build_objc_string (p - (token_buffer + 1), - token_buffer + 1); TREE_TYPE (yylval.ttype) = char_array_type_node; value = OBJC_STRING; } else { - yylval.ttype = build_string (p - (token_buffer + 1), - token_buffer + 1); TREE_TYPE (yylval.ttype) = char_array_type_node; value = STRING; } |