feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

C++11: Make 'enum struct', enum-base and opaque enum decls work.

Browse Source 
For declarations like:
enum struct Foo : long int;

Change-Id: Id813efdbc31c8d70a4b40bb0101dc33a8dd2556a
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Christian Kamm
2012-09-18 11:17:29 +02:00
committed by hjk
parent 8711121197
commit 44c9cef30a
10 changed files with 75 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/libs/3rdparty/cplusplus/Parser.cpp vendored
View File

@@ -28,7 +28,7 @@
#include "QtContextKeywords.h"
#include <string>
#include <cstdio> // for putchar
#include <QDebug>
#ifdef _MSC_VER
# define va_copy(dst, src) ((dst) = (src))
#elif defined(__INTEL_COMPILER) && !defined(va_copy)
@@ -1684,16 +1684,19 @@ bool Parser::parseEnumSpecifier(SpecifierListAST *&node)
{
DEBUG_THIS_RULE();
if (LA() == T_ENUM) {
unsigned enum_token = consumeToken();
if (_cxx0xEnabled && LA() == T_CLASS)
consumeToken();
EnumSpecifierAST *ast = new (_pool) EnumSpecifierAST;
NameAST *name = 0;
parseName(name);
ast->enum_token = consumeToken();
if (_cxx0xEnabled && (LA() == T_CLASS || LA() == T_STRUCT))
ast->key_token = consumeToken();
parseName(ast->name);
if (_cxx0xEnabled && LA() == T_COLON) {
ast->colon_token = consumeToken();
parseTypeSpecifier(ast->type_specifier_list);
}
if (LA() == T_LBRACE) {
EnumSpecifierAST *ast = new (_pool) EnumSpecifierAST;
ast->enum_token = enum_token;
ast->name = name;
ast->lbrace_token = consumeToken();
unsigned comma_token = 0;
EnumeratorListAST **enumerator_ptr = &ast->enumerator_list;
@@ -1717,9 +1720,12 @@ bool Parser::parseEnumSpecifier(SpecifierListAST *&node)
match(T_COMMA, &comma_token);
}
match(T_RBRACE, &ast->rbrace_token);
node = new (_pool) SpecifierListAST(ast);
return true;
} else if (!_cxx0xEnabled) {
return false;
}
node = new (_pool) SpecifierListAST(ast);
return true;
}
return false;
}
@@ -3920,7 +3926,9 @@ bool Parser::parseSimpleDeclaration(DeclarationAST *&node, ClassSpecifierAST *de
}
} else if (! has_type_specifier && LA() == T_ENUM) {
unsigned startOfTypeSpecifier = cursor();
if (! parseElaboratedTypeSpecifier(*decl_specifier_seq_ptr) || LA() == T_LBRACE) {
if (! parseElaboratedTypeSpecifier(*decl_specifier_seq_ptr)
|| LA() == T_LBRACE
|| (_cxx0xEnabled && LA() == T_COLON)) {
rewind(startOfTypeSpecifier);
if (! parseEnumSpecifier(*decl_specifier_seq_ptr)) {
error(startOfTypeSpecifier,