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

C: Parser: Support parsing of c99 designated initializers

Browse Source 
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:
Wang Hoi
2014-05-05 22:56:15 +08:00
committed by Nikolai Kosjar
parent d70485180a
commit c56b999fff
27 changed files with 529 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/libs/3rdparty/cplusplus/ASTClone.cpp vendored
View File

@@ -1762,3 +1762,21 @@ BracedInitializerAST *BracedInitializerAST::clone(MemoryPool *pool) const
return ast;
}
DesignatorAST *DesignatorAST::clone(MemoryPool *pool) const
{
DesignatorAST *ast = new (pool) DesignatorAST;
return ast;
}
DesignatedInitializerAST *DesignatedInitializerAST::clone(MemoryPool *pool) const
{
DesignatedInitializerAST *ast = new (pool) DesignatedInitializerAST;
for (DesignatorListAST *iter = designator_list, **ast_iter = &ast->designator_list;
iter; iter = iter->next, ast_iter = &(*ast_iter)->next)
*ast_iter = new (pool) DesignatorListAST((iter->value) ? iter->value->clone(pool) : 0);
ast->equal_token = equal_token;
if (initializer)
ast->initializer = initializer->clone(pool);
return ast;
}