aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs/3rdparty/cplusplus/ASTMatcher.cpp
diff options
context:
space:
mode:
authorWang Hoi <wanghoi@126.com>2014-05-05 22:56:15 +0800
committerNikolai Kosjar <nikolai.kosjar@digia.com>2014-06-17 16:23:23 +0200
commitc56b999ffff249d4cb7dc7e8026a3297b63ff56d (patch)
tree007d1f5208cd7e03fdc2eceb4cefe3dd4a12ded8 /src/libs/3rdparty/cplusplus/ASTMatcher.cpp
parentd70485180a676c3d97108bb87ec1c32223ee0f2b (diff)
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>
Diffstat (limited to 'src/libs/3rdparty/cplusplus/ASTMatcher.cpp')
-rw-r--r--src/libs/3rdparty/cplusplus/ASTMatcher.cpp28
1 files changed, 28 insertions, 0 deletions
diff --git a/src/libs/3rdparty/cplusplus/ASTMatcher.cpp b/src/libs/3rdparty/cplusplus/ASTMatcher.cpp
index 105f236070..02cdb9f068 100644
--- a/src/libs/3rdparty/cplusplus/ASTMatcher.cpp
+++ b/src/libs/3rdparty/cplusplus/ASTMatcher.cpp
@@ -2999,3 +2999,31 @@ bool ASTMatcher::match(BracedInitializerAST *node, BracedInitializerAST *pattern
return true;
}
+bool ASTMatcher::match(DesignatorAST *node, DesignatorAST *pattern)
+{
+ (void) node;
+ (void) pattern;
+
+ return true;
+}
+
+bool ASTMatcher::match(DesignatedInitializerAST *node, DesignatedInitializerAST *pattern)
+{
+ (void) node;
+ (void) pattern;
+
+ if (! pattern->designator_list)
+ pattern->designator_list = node->designator_list;
+ else if (! AST::match(node->designator_list, pattern->designator_list, this))
+ return false;
+
+ pattern->equal_token = node->equal_token;
+
+ if (! pattern->initializer)
+ pattern->initializer = node->initializer;
+ else if (! AST::match(node->initializer, pattern->initializer, this))
+ return false;
+
+ return true;
+}
+