forked from qt-creator/qt-creator
C: Parser: Support parsing of c99 designated initializers
In case:
int a[6] = { [4] = 29, [2] = 15 };
struct point { int x, y; };
struct point p = { .y = 3, .x = 2 };
Grammar change when c99 language feature is enabled:
old grammar:
braced-init-list :: '{' initializer-list '}'
new grammar:
braced-init-list :: '{' designated-initializer-list '}'
designated-initializer-list :: designated-initializer (',' designated-initializer )*
designated-initializer :: designator* initializer-clause
designator :: '.' identifier
| '[' constant-expression ']'
Task-number: QTCREATORBUG-1902
Change-Id: Ib99d6f553f8d0f50ba3eff86f3a2e86d73372426
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
This commit is contained in:
@@ -495,6 +495,13 @@ bool CheckSymbols::visit(EnumeratorAST *ast)
|
||||
return true;
|
||||
}
|
||||
|
||||
bool CheckSymbols::visit(DesignatorAST *ast)
|
||||
{
|
||||
if (ast->type == DesignatorAST::Dot)
|
||||
addUse(ast->u.dot.identifier_token, CppHighlightingSupport::FieldUse);
|
||||
return true;
|
||||
}
|
||||
|
||||
bool CheckSymbols::visit(SimpleDeclarationAST *ast)
|
||||
{
|
||||
NameAST *declrIdNameAST = 0;
|
||||
|
||||
@@ -160,6 +160,8 @@ protected:
|
||||
virtual bool visit(CPlusPlus::MemInitializerAST *ast);
|
||||
virtual bool visit(CPlusPlus::EnumeratorAST *ast);
|
||||
|
||||
virtual bool visit(CPlusPlus::DesignatorAST *ast);
|
||||
|
||||
CPlusPlus::NameAST *declaratorId(CPlusPlus::DeclaratorAST *ast) const;
|
||||
|
||||
static unsigned referenceToken(CPlusPlus::NameAST *name);
|
||||
|
||||
@@ -83,6 +83,7 @@ QFuture<TextEditor::HighlightingResult> CppHighlightingSupportInternal::highligh
|
||||
// FIXME: Check default values or get from document.
|
||||
LanguageFeatures features;
|
||||
features.cxx11Enabled = true;
|
||||
features.c99Enabled = true;
|
||||
|
||||
SimpleLexer tokenize;
|
||||
tokenize.setLanguageFeatures(features);
|
||||
|
||||
Reference in New Issue
Block a user