summaryrefslogtreecommitdiff
path: root/shared/cplusplus/Token.h
diff options
context:
space:
mode:
authorRoberto Raggi <qtc-committer@nokia.com>2008-12-10 13:27:59 +0100
committerRoberto Raggi <qtc-committer@nokia.com>2008-12-10 13:30:19 +0100
commit65f07aa2de0fa24430a6deccc72334dfe883174f (patch)
treeb2b393978bd4b428af507735cec104d0c76fa305 /shared/cplusplus/Token.h
parent824db4c6e70ad7b76662cd7e5d0bc7df14ad6628 (diff)
downloadqt-creator-65f07aa2de0fa24430a6deccc72334dfe883174f.tar.gz
Implemented support for C++ and iso646 operators.
Diffstat (limited to 'shared/cplusplus/Token.h')
-rw-r--r--shared/cplusplus/Token.h14
1 files changed, 13 insertions, 1 deletions
diff --git a/shared/cplusplus/Token.h b/shared/cplusplus/Token.h
index e172fea568..f017bbc8e7 100644
--- a/shared/cplusplus/Token.h
+++ b/shared/cplusplus/Token.h
@@ -209,7 +209,19 @@ enum Kind {
T_LAST_KEYWORD = T_SLOTS,
- // ### aliases
+ // aliases
+ T_OR = T_PIPE_PIPE,
+ T_AND = T_AMPER_AMPER,
+ T_NOT = T_EXCLAIM,
+ T_XOR = T_CARET,
+ T_BITOR = T_PIPE,
+ T_COMPL = T_TILDE,
+ T_OR_EQ = T_PIPE_EQUAL,
+ T_AND_EQ = T_AMPER_EQUAL,
+ T_BITAND = T_AMPER,
+ T_NOT_EQ = T_EXCLAIM_EQUAL,
+ T_XOR_EQ = T_CARET_EQUAL,
+
T___ASM = T_ASM,
T___ASM__ = T_ASM,