Refine Parser skipping over C++11 style { ... } member initialize…

…r lists (pull bytedeco/javacpp-presets#642)
bytedeco · Jan 4, 2019 · 2cf75e5 · 2cf75e5
1 parent 3da3c7a
commit 2cf75e5
Showing 1 changed file with 24 additions and 3 deletions.
diff --git a/src/main/java/org/bytedeco/javacpp/tools/Parser.java b/src/main/java/org/bytedeco/javacpp/tools/Parser.java
@@ -1840,9 +1840,16 @@ boolean function(Context context, DeclarationList declList) throws ParserExcepti
                 tokens.next();
             }
             if (tokens.get().match(':')) {
+                int count = 0;
                 for (Token token = tokens.next(); !token.match(Token.EOF); token = tokens.next()) {
+                    if (token.match('(')) {
+                        count++;
+                    } else if (token.match(')')) {
+                        count--;
+                    }
+
                     // consider { ... } preceded by an identifier as an initializer list
-                    if (!token.match(Token.IDENTIFIER) && tokens.get(1).match('{')) {
+                    if (count == 0 && !token.match(Token.IDENTIFIER) && tokens.get(1).match('{')) {
                         tokens.next();
                         break;
                     }
@@ -1958,9 +1965,16 @@ boolean function(Context context, DeclarationList declList) throws ParserExcepti
                 }
             }
             if (tokens.get().match(':')) {
+                int count = 0;
                 for (Token token = tokens.next(); !token.match(Token.EOF); token = tokens.next()) {
+                    if (token.match('(')) {
+                        count++;
+                    } else if (token.match(')')) {
+                        count--;
+                    }
+
                     // consider { ... } preceded by an identifier as an initializer list
-                    if (!token.match(Token.IDENTIFIER) && tokens.get(1).match('{')) {
+                    if (count == 0 && !token.match(Token.IDENTIFIER) && tokens.get(1).match('{')) {
                         tokens.next();
                         break;
                     }
@@ -2008,9 +2022,16 @@ boolean function(Context context, DeclarationList declList) throws ParserExcepti
                 }
                 dcl.signature = dcl.javaName + params.signature;
                 if (tokens.get().match(':')) {
+                    int count = 0;
                     for (Token token = tokens.next(); !token.match(Token.EOF); token = tokens.next()) {
+                        if (token.match('(')) {
+                            count++;
+                        } else if (token.match(')')) {
+                            count--;
+                        }
+
                         // consider { ... } preceded by an identifier as an initializer list
-                        if (!token.match(Token.IDENTIFIER) && tokens.get(1).match('{')) {
+                        if (count == 0 && !token.match(Token.IDENTIFIER) && tokens.get(1).match('{')) {
                             tokens.next();
                             break;
                         }