summaryrefslogtreecommitdiff
path: root/src/libs/3rdparty/cplusplus/Parser.cpp
diff options
context:
space:
mode:
authorJohannes Lorenz <johannes89@ist-einmalig.de>2015-02-25 21:22:16 +0100
committerOrgad Shaneh <orgads@gmail.com>2015-06-02 08:24:17 +0000
commit2a966a89177612c42574c6700d878fe864df4d76 (patch)
tree5699499eec3d496164d859c8e5b066df882a1aff /src/libs/3rdparty/cplusplus/Parser.cpp
parent697479572f3eaf09a2e563a25502f972050fbb11 (diff)
downloadqt-creator-2a966a89177612c42574c6700d878fe864df4d76.tar.gz
C++: Support ellipsis on variadic inheritance parsing
Change-Id: I571aefdb1f2aba88ba0c7710f16b6d8ad2e8f5a8 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Diffstat (limited to 'src/libs/3rdparty/cplusplus/Parser.cpp')
-rw-r--r--src/libs/3rdparty/cplusplus/Parser.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/libs/3rdparty/cplusplus/Parser.cpp b/src/libs/3rdparty/cplusplus/Parser.cpp
index 7c330ce330..8229aff5ed 100644
--- a/src/libs/3rdparty/cplusplus/Parser.cpp
+++ b/src/libs/3rdparty/cplusplus/Parser.cpp
@@ -3006,6 +3006,11 @@ bool Parser::parseBaseSpecifier(BaseSpecifierListAST *&node)
if (! ast->name)
error(cursor(), "expected class-name");
+ // a name can have ellipsis in case of C++11
+ // note: the id must be unqualified then - TODO
+ if (_languageFeatures.cxx11Enabled && LA() == T_DOT_DOT_DOT)
+ ast->ellipsis_token = consumeToken();
+
node = new (_pool) BaseSpecifierListAST;
node->value = ast;
return true;