forked from qt-creator/qt-creator
C++11: Add the alignof and alignas tokens.
Change-Id: I7f60057953787b3300aafa4d3f230f10b1e9a50f Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
20
src/libs/3rdparty/cplusplus/Keywords.cpp
vendored
20
src/libs/3rdparty/cplusplus/Keywords.cpp
vendored
@@ -573,6 +573,26 @@ static inline int classify7(const char *s, bool q, bool x) {
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (x && s[0] == 'a') {
|
||||
if (s[1] == 'l') {
|
||||
if (s[2] == 'i') {
|
||||
if (s[3] == 'g') {
|
||||
if (s[4] == 'n') {
|
||||
if (s[5] == 'a') {
|
||||
if (s[6] == 's') {
|
||||
return T_ALIGNAS;
|
||||
}
|
||||
}
|
||||
else if (s[5] == 'o') {
|
||||
if (s[6] == 'f') {
|
||||
return T_ALIGNOF;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (s[0] == 'd') {
|
||||
if (s[1] == 'e') {
|
||||
if (s[2] == 'f') {
|
||||
|
||||
2
src/libs/3rdparty/cplusplus/Token.cpp
vendored
2
src/libs/3rdparty/cplusplus/Token.cpp
vendored
@@ -46,7 +46,7 @@ static const char *token_names[] = {
|
||||
("|="), ("||"), ("+"), ("+="), ("++"), ("#"), ("##"), ("?"), ("}"),
|
||||
("]"), (")"), (";"), ("*"), ("*="), ("~"), ("~="),
|
||||
|
||||
("asm"), ("auto"), ("bool"), ("break"), ("case"), ("catch"),
|
||||
("alignas"), ("alignof"), ("asm"), ("auto"), ("bool"), ("break"), ("case"), ("catch"),
|
||||
("char"), ("char16_t"), ("char32_t"),
|
||||
("class"), ("const"), ("const_cast"), ("constexpr"), ("continue"),
|
||||
("decltype"), ("default"),
|
||||
|
||||
4
src/libs/3rdparty/cplusplus/Token.h
vendored
4
src/libs/3rdparty/cplusplus/Token.h
vendored
@@ -115,7 +115,9 @@ enum Kind {
|
||||
T_LAST_OPERATOR = T_TILDE_EQUAL,
|
||||
|
||||
T_FIRST_KEYWORD,
|
||||
T_ASM = T_FIRST_KEYWORD,
|
||||
T_ALIGNAS = T_FIRST_KEYWORD,
|
||||
T_ALIGNOF,
|
||||
T_ASM,
|
||||
T_AUTO,
|
||||
T_BOOL,
|
||||
T_BREAK,
|
||||
|
||||
Reference in New Issue
Block a user