* Fix TokenIndexer failure on macros using the concat ## operato…

…r with empty arguments (issue #525)
bytedeco · Dec 19, 2021 · ed47300 · ed47300
1 parent 1c72e35
commit ed47300
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,5 @@
 
+ * Fix `TokenIndexer` failure on macros using the concat `##` operator with empty arguments ([issue #525](https://github.com/bytedeco/javacpp/issues/525))
  * Let `Parser` support arrays of anonymous `struct` or `union` containing another one ([discussion #528](https://github.com/bytedeco/javacpp/discussions/528))
  * Prevent `Parser` from outputting duplicate `Pointer` constructors for basic containers
  * Fix `Generator` compiler errors on callback functions returning objects without default constructors

diff --git a/src/main/java/org/bytedeco/javacpp/tools/TokenIndexer.java b/src/main/java/org/bytedeco/javacpp/tools/TokenIndexer.java
@@ -251,11 +251,16 @@ Token[] expand(Token[] array, int index) {
                     }
                     // concatenate tokens as required
                     for (int i = startToken; i < tokens.size(); i++) {
-                        if (tokens.get(i).match("##") && i > 0 && i + 1 < tokens.size()) {
-                            tokens.get(i - 1).value += tokens.get(i + 1).value;
-                            tokens.remove(i);
-                            tokens.remove(i);
-                            i--;
+                        if (tokens.get(i).match("##")) {
+                            if (i > 0 && i + 1 < tokens.size()) {
+                                tokens.get(i - 1).value += tokens.get(i + 1).value;
+                                tokens.remove(i);
+                                tokens.remove(i);
+                                i--;
+                            } else {
+                                // missing arguments, simply remove the "##" token
+                                tokens.remove(i);
+                            }
                         }
                     }
                     // copy the rest of the tokens from this point on