diff options
| author | Erik Verbruggen <erik.verbruggen@nokia.com> | 2010-02-15 12:23:48 +0100 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@nokia.com> | 2010-02-15 12:24:31 +0100 |
| commit | 8de6ccc7755d855f23b2f05f5094490832a8ab32 (patch) | |
| tree | d5f49c3172f8c77d297fce0102cc729bf7e4d5b7 /src/shared/cplusplus/Token.cpp | |
| parent | a0071f1ce968a3c01d034227f0c01042447dfb43 (diff) | |
| download | qt-creator-8de6ccc7755d855f23b2f05f5094490832a8ab32.tar.gz | |
Revert "Split Objective-C keyword parsing to handle the '@' separately."
This reverts commit 2a59d2ae0c889fe6e4ac50a3f110b0103f880c15.
Diffstat (limited to 'src/shared/cplusplus/Token.cpp')
| -rw-r--r-- | src/shared/cplusplus/Token.cpp | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/src/shared/cplusplus/Token.cpp b/src/shared/cplusplus/Token.cpp index e4f2baba4d..e86038271f 100644 --- a/src/shared/cplusplus/Token.cpp +++ b/src/shared/cplusplus/Token.cpp @@ -59,14 +59,14 @@ static const char *token_names[] = { ("<identifier>"), ("<numeric literal>"), ("<char literal>"), ("<wide char literal>"), ("<string literal>"), ("<wide char literal>"), - ("<angle string literal>"), + ("<@string literal>"), ("<angle string literal>"), - ("&"), ("&&"), ("&="), ("->"), ("->*"), ("@"), ("^"), ("^="), (":"), - ("::"), (","), ("/"), ("/="), ("."), ("..."), (".*"), ("="), ("=="), - ("!"), ("!="), (">"), (">="), (">>"), (">>="), ("{"), ("["), ("<"), - ("<="), ("<<"), ("<<="), ("("), ("-"), ("-="), ("--"), ("%"), ("%="), - ("|"), ("|="), ("||"), ("+"), ("+="), ("++"), ("#"), ("##"), ("?"), - ("}"), ("]"), (")"), (";"), ("*"), ("*="), ("~"), ("~="), + ("&"), ("&&"), ("&="), ("->"), ("->*"), ("^"), ("^="), (":"), ("::"), + (","), ("/"), ("/="), ("."), ("..."), (".*"), ("="), ("=="), ("!"), + ("!="), (">"), (">="), (">>"), (">>="), ("{"), ("["), ("<"), ("<="), + ("<<"), ("<<="), ("("), ("-"), ("-="), ("--"), ("%"), ("%="), ("|"), + ("|="), ("||"), ("+"), ("+="), ("++"), ("#"), ("##"), ("?"), ("}"), + ("]"), (")"), (";"), ("*"), ("*="), ("~"), ("~="), ("asm"), ("auto"), ("bool"), ("break"), ("case"), ("catch"), ("char"), ("class"), ("const"), ("const_cast"), ("continue"), ("default"), @@ -84,11 +84,12 @@ static const char *token_names[] = { // gnu ("__attribute__"), ("__typeof__"), - // objc keywords - ("@compatibility_alias"), ("@defs"), ("@dynamic"), ("@encode"), ("@end"), - ("@finally"), ("@implementation"), ("@interface"), ("@not_keyword"), - ("@optional"), ("@package"), ("@property"), ("@protocol"), ("@required"), - ("@selector"), ("@synchronized"), ("@synthesize"), + // objc @keywords + ("@catch"), ("@class"), ("@compatibility_alias"), ("@defs"), ("@dynamic"), + ("@encode"), ("@end"), ("@finally"), ("@implementation"), ("@interface"), + ("@not_keyword"), ("@optional"), ("@package"), ("@private"), ("@property"), + ("@protected"), ("@protocol"), ("@public"), ("@required"), ("@selector"), + ("@synchronized"), ("@synthesize"), ("@throw"), ("@try"), ("SIGNAL"), ("SLOT"), ("Q_SIGNAL"), ("Q_SLOT"), ("signals"), ("slots"), ("Q_FOREACH"), ("Q_D"), ("Q_Q"), @@ -123,6 +124,7 @@ const char *Token::spell() const case T_NUMERIC_LITERAL: case T_CHAR_LITERAL: case T_STRING_LITERAL: + case T_AT_STRING_LITERAL: case T_ANGLE_STRING_LITERAL: case T_WIDE_CHAR_LITERAL: case T_WIDE_STRING_LITERAL: |