Round 8: __attribute__ after var name, brace init in constructor init list

Parser:
- __attribute__((...)) consumed after variable name in struct member
- parseConstructorInitEntry: handle brace initialization m{{1,0},{0,1}}

Author: pepc84

mode/CppMode.jar

@@ -945,15 +945,20 @@ private FunctionDecl parseFunctionOrConstructorOrDestructor(List<CppLexerToken>
     private FunctionDecl.ConstructorInit parseConstructorInitEntry() {
         // Base class names can be qualified: "std::runtime_error(msg)"
         String memberName = parseQualifiedTypeName();
-        expectPunct("(");
         List<Expr> args = new ArrayList<>();
-        if (!checkPunct(")")) {
-            args.add(parseExpr());
-            while (matchPunct(",")) {
+        if (checkPunct("{")) {
+            // Brace initialization: "m{{1,0},{0,1}}"
+            args.add(parseInitializerList());
+        } else {
+            expectPunct("(");
+            if (!checkPunct(")")) {
                 args.add(parseExpr());
+                while (matchPunct(",")) {
+                    args.add(parseExpr());
+                }
             }
+            expectPunct(")");
         }
-        expectPunct(")");
         return new FunctionDecl.ConstructorInit(memberName, args);
     }
 
@@ -1099,7 +1104,6 @@ && looksLikeParamList()) {
             }
             // Constructor initializer list: ": mem(val), mem2(val2)"
             if (matchPunct(":") && !checkPunct(":")) {
-                System.err.println("[INITV] consuming init list, next=" + peek().text());
                 // consume initializer list entries until { or ;
                 int _d = 0;
                 while (!isAtEnd()) {
@@ -1122,6 +1126,11 @@ && looksLikeParamList()) {
         if (checkPunct(":") && pos + 1 < tokens.size() && tokens.get(pos + 1).type() == CppLexerTokenType.INT_LITERAL) {
             advance(); advance(); // consume ":" and bit width
         }
+        // GCC __attribute__((...)): may appear after variable name
+        if (check(CppLexerTokenType.IDENTIFIER) && peek().text().equals("__attribute__")) {
+            advance();
+            if (checkPunct("(")) { advance(); int _ad=1; while(!isAtEnd()&&_ad>0){if(checkPunct("("))_ad++;else if(checkPunct(")"))_ad--;advance();} }
+        }
         List<TopLevelItem> result = new ArrayList<>();
         result.add(parseOneTopLevelDeclarator(type, name, isConst, isStatic, templateParams, start, leadingComments));
         while (matchPunct(",")) {