aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs/3rdparty/cplusplus/Token.h
diff options
context:
space:
mode:
authorLeandro Melo <leandro.melo@nokia.com>2012-06-06 13:41:22 +0200
committerhjk <qthjk@ovi.com>2012-06-06 14:55:07 +0200
commit23c637c4f677ab2f19793f409297b0131b21dcaa (patch)
treec940f0eddbc83bfc5ba3ee9e39c3833f45729cde /src/libs/3rdparty/cplusplus/Token.h
parentb88a5f5d381b4279f6aa93e1400d78d910f1ed15 (diff)
C++: Introduce unicode char/strings support
Those are the types char16_t and char32_t along with the new char/string literals u'', U'', u"", u8"", and U"". This is particularly important for the use of QStringLiteral since in some platforms it relies on expansion such as above. Note: The string literals quickfixes still need some tunning. Task-number: QTCREATORBUG-7449 Change-Id: Iebcfea15677dc8e0ebb6143def89a5477e1be7d4 Reviewed-by: hjk <qthjk@ovi.com>
Diffstat (limited to 'src/libs/3rdparty/cplusplus/Token.h')
-rw-r--r--src/libs/3rdparty/cplusplus/Token.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/libs/3rdparty/cplusplus/Token.h b/src/libs/3rdparty/cplusplus/Token.h
index 72dd948678..37a7a725c1 100644
--- a/src/libs/3rdparty/cplusplus/Token.h
+++ b/src/libs/3rdparty/cplusplus/Token.h
@@ -40,10 +40,15 @@ enum Kind {
T_FIRST_CHAR_LITERAL,
T_CHAR_LITERAL = T_FIRST_CHAR_LITERAL,
T_WIDE_CHAR_LITERAL,
- T_LAST_CHAR_LITERAL = T_WIDE_CHAR_LITERAL,
+ T_UTF16_CHAR_LITERAL,
+ T_UTF32_CHAR_LITERAL,
+ T_LAST_CHAR_LITERAL = T_UTF32_CHAR_LITERAL,
T_FIRST_STRING_LITERAL,
T_STRING_LITERAL = T_FIRST_STRING_LITERAL,
T_WIDE_STRING_LITERAL,
+ T_UTF8_STRING_LITERAL,
+ T_UTF16_STRING_LITERAL,
+ T_UTF32_STRING_LITERAL,
T_AT_STRING_LITERAL,
T_ANGLE_STRING_LITERAL,
T_LAST_STRING_LITERAL = T_ANGLE_STRING_LITERAL,
@@ -112,6 +117,8 @@ enum Kind {
T_CASE,
T_CATCH,
T_CHAR,
+ T_CHAR16_T,
+ T_CHAR32_T,
T_CLASS,
T_CONST,
T_CONST_CAST,