From 1eefd16383bd0e3adb167ccf4e80f6563096594f Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Mon, 13 Jul 2009 12:05:29 +0200
Subject: Fixed a few typos and bugs in the ObjC++ support.

---
 src/shared/cplusplus/Lexer.cpp | 2 +-
 src/shared/cplusplus/Token.cpp | 2 +-
 src/shared/cplusplus/Token.h   | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/shared/cplusplus')

diff --git a/src/shared/cplusplus/Lexer.cpp b/src/shared/cplusplus/Lexer.cpp
index 2229b470bd..5f727ef4af 100644
--- a/src/shared/cplusplus/Lexer.cpp
+++ b/src/shared/cplusplus/Lexer.cpp
@@ -598,7 +598,7 @@ void Lexer::scan_helper(Token *tok)
 
                 do {
                     yyinp();
-                    if (! isalnum(_yychar))
+                    if (! (isalnum(_yychar) || _yychar == '_'))
                         break;
                 } while (_yychar);
 
diff --git a/src/shared/cplusplus/Token.cpp b/src/shared/cplusplus/Token.cpp
index bda5ecc583..828da8da31 100644
--- a/src/shared/cplusplus/Token.cpp
+++ b/src/shared/cplusplus/Token.cpp
@@ -56,7 +56,7 @@ static const char *token_names[] = {
 
     ("<comment>"), ("<doxy comment>"),
 
-    ("<identifier>"), ("<int literal>"), ("<float literal>"), ("<char literal>"),
+    ("<identifier>"), ("<numeric literal>"), ("<char literal>"),
     ("<wide char literal>"), ("<string literal>"), ("<wide char literal>"),
     ("<@string literal>"), ("<angle string literal>"),
 
diff --git a/src/shared/cplusplus/Token.h b/src/shared/cplusplus/Token.h
index 99b986c7ab..6809468a1a 100644
--- a/src/shared/cplusplus/Token.h
+++ b/src/shared/cplusplus/Token.h
@@ -224,9 +224,9 @@ enum Kind {
     T_AT_THROW,
     T_AT_TRY,
 
-    T_LAST_OBJC_AT_KEYWORD,
+    T_LAST_OBJC_AT_KEYWORD = T_AT_TRY,
 
-    T_FIRST_QT_KEYWORD = T_LAST_OBJC_AT_KEYWORD,
+    T_FIRST_QT_KEYWORD,
 
     // Qt keywords
     T_SIGNAL = T_FIRST_QT_KEYWORD,
@@ -300,7 +300,7 @@ public:
     { return kind == T_COMMENT || kind == T_DOXY_COMMENT; }
 
     inline bool isObjCAtKeyword() const
-    { return kind >= T_FIRST_OBJC_AT_KEYWORD && kind < T_LAST_OBJC_AT_KEYWORD; }
+    { return kind >= T_FIRST_OBJC_AT_KEYWORD && kind <= T_LAST_OBJC_AT_KEYWORD; }
 
     static const char *name(int kind);
 
-- 
cgit v1.2.1