From cc937581390c3aebf39e5f36b61f6b6098b8a236 Mon Sep 17 00:00:00 2001 From: Zack Weinberg Date: Wed, 7 Mar 2001 01:32:01 +0000 Subject: c-parse.in (yylexname): New function, split out of _yylex. * c-parse.in (yylexname): New function, split out of _yylex. (objc_rid_sans_at): New table. (init_reswords): Initialize it. (_yylex): Give labels clearer names. Handle CPP_ATSIGN by retrieving the next token and checking it for significance as an ObjC keyword or string constant. * cpplex.c (_cpp_lex_token): Just return CPP_ATSIGN for '@'. * cpplib.h (TTYPE_TABLE): Add CPP_ATSIGN, drop CPP_OSTRING. * c-lex.c, c-parse.in, cppmacro.c, cpplex.c, cp/spew.c: Remove references to CPP_OSTRING. From-SVN: r40279 --- gcc/cpplib.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gcc/cpplib.h') diff --git a/gcc/cpplib.h b/gcc/cpplib.h index c0c3ff3..b9b706b 100644 --- a/gcc/cpplib.h +++ b/gcc/cpplib.h @@ -119,6 +119,7 @@ struct file_name_map_list; OP(CPP_SCOPE, "::") \ OP(CPP_DEREF_STAR, "->*") \ OP(CPP_DOT_STAR, ".*") \ + OP(CPP_ATSIGN, "@") /* used in Objective C */ \ \ TK(CPP_NAME, SPELL_IDENT) /* word */ \ TK(CPP_INT, SPELL_STRING) /* 23 */ \ @@ -131,7 +132,6 @@ struct file_name_map_list; \ TK(CPP_STRING, SPELL_STRING) /* "string" */ \ TK(CPP_WSTRING, SPELL_STRING) /* L"string" */ \ - TK(CPP_OSTRING, SPELL_STRING) /* @"string" - Objective C */ \ TK(CPP_HEADER_NAME, SPELL_STRING) /* in #include */ \ \ TK(CPP_COMMENT, SPELL_STRING) /* Only if output comments. */ \ -- cgit v1.1