* Fix Parser prematurely expanding macros defined in class, `str…

…uct` or `union` (issue #674)
bytedeco · Apr 23, 2023 · be4df66 · be4df66
1 parent bc24d34
commit be4df66
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,5 @@
 
+ * Fix `Parser` prematurely expanding macros defined in `class`, `struct` or `union` ([issue #674](https://github.com/bytedeco/javacpp/issues/674))
  * Add `Info.upcast` to support class hierarchies with virtual inheritance ([pull #671](https://github.com/bytedeco/javacpp/pull/671))
  * Pick up `@Adapter`, `@SharedPtr`, etc annotations on `allocate()` as well ([pull #668](https://github.com/bytedeco/javacpp/pull/668))
  * Provide `@Virtual(subclasses=false)` to prevent `Generator` from subclassing subclasses ([pull #660](https://github.com/bytedeco/javacpp/pull/660))

diff --git a/src/main/java/org/bytedeco/javacpp/annotation/NoException.java b/src/main/java/org/bytedeco/javacpp/annotation/NoException.java
@@ -22,6 +22,6 @@
 @Documented @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE, ElementType.METHOD})
 public @interface NoException {
-    /** On override, indicates whether to use the C++ noexcept operator or not. */
+    /** On override, indicates whether to use the C++ noexcept specifier or not. */
     boolean value() default false;
 }
diff --git a/src/main/java/org/bytedeco/javacpp/tools/Parser.java b/src/main/java/org/bytedeco/javacpp/tools/Parser.java
@@ -1969,7 +1969,7 @@ Attribute attribute(boolean explicit) {
         return attr;
     }
 
-    String body() {
+    String body() throws ParserException {
         String text = "";
         if (!tokens.get().match('{')) {
             return null;
@@ -1978,6 +1978,11 @@ String body() {
         int count = 1;
         boolean catchBlock = false;
         for (Token token = tokens.next(); !token.match(Token.EOF) && count > 0; token = tokens.next()) {
+            while (tokens.get().match('#')) {
+                // prevent premature macro expansion
+                macro(null, null);
+                token = tokens.get();
+            }
             if (token.match('{')) {
                 if (catchBlock) {
                     catchBlock = false;
@@ -2888,9 +2893,11 @@ boolean macro(Context context, DeclarationList declList) throws ParserException
         Token keyword = tokens.next();
         if (keyword.spacing.indexOf('\n') >= 0) {
             // empty macro?
-            Declaration decl = new Declaration();
-            decl.text = spacing + "// #";
-            declList.add(decl);
+            if (declList != null) {
+                Declaration decl = new Declaration();
+                decl.text = spacing + "// #";
+                declList.add(decl);
+            }
             tokens.raw = false;
             return true;
         }
@@ -2903,6 +2910,11 @@ boolean macro(Context context, DeclarationList declList) throws ParserException
                 break;
             }
         }
+        if (context == null) {
+            // we just want to skip over the macro in this case
+            tokens.raw = false;
+            return true;
+        }
         int endIndex = tokens.index;
         while (tokens.get(-1).match(Token.COMMENT)) {
             tokens.index--;
@@ -3119,9 +3131,11 @@ boolean macro(Context context, DeclarationList declList) throws ParserException
             decl.text = comment + decl.text;
         }
         tokens.raw = false;
-        declList.spacing = spacing;
-        declList.add(decl);
-        declList.spacing = null;
+        if (declList != null) {
+            declList.spacing = spacing;
+            declList.add(decl);
+            declList.spacing = null;
+        }
         return true;
     }