From ecc66fdcbdf86e1dd945f6ea9d393fa4476495a4 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 16 Jun 2018 22:36:08 +0100 Subject: [PATCH] Add Doxygen test for constant and fix JavaDoc indentation --- Examples/test-suite/doxygen_parsing.i | 5 +++++ Examples/test-suite/java/doxygen_parsing_runme.java | 3 +++ Source/Modules/java.cxx | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Examples/test-suite/doxygen_parsing.i b/Examples/test-suite/doxygen_parsing.i index 670d8699b..7ff19ecfa 100644 --- a/Examples/test-suite/doxygen_parsing.i +++ b/Examples/test-suite/doxygen_parsing.i @@ -36,6 +36,11 @@ struct SomeStruct */ int someVar=42; +/** + * The constant comment + */ +#define CONSTANT_VALUE 4242 + class SomeAnotherClass { public: diff --git a/Examples/test-suite/java/doxygen_parsing_runme.java b/Examples/test-suite/java/doxygen_parsing_runme.java index 7a8b0fae9..167010544 100644 --- a/Examples/test-suite/java/doxygen_parsing_runme.java +++ b/Examples/test-suite/java/doxygen_parsing_runme.java @@ -125,6 +125,9 @@ public class doxygen_parsing_runme { wantedComments.put("doxygen_parsing.SomeAnotherClass.setClassAttr2(int)", "The class attribute post-comment \n" + ""); + wantedComments.put("doxygen_parsing.doxygen_parsingConstants.CONSTANT_VALUE", + "The constant comment \n" + + ""); // and ask the parser to check comments for us System.exit(parser.check(wantedComments)); diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx index 195ad5a90..a245da208 100644 --- a/Source/Modules/java.cxx +++ b/Source/Modules/java.cxx @@ -1558,7 +1558,7 @@ public: // Translate and write javadoc comment if flagged if (doxygen && doxygenTranslator->hasDocumentation(n)) { - String *doxygen_comments = doxygenTranslator->getDocumentation(n, 0); + String *doxygen_comments = doxygenTranslator->getDocumentation(n, " "); if (comment_creation_chatter) Printf(constants_code, "/* This was generated from constantWrapper() */\n"); Printv(constants_code, Char(doxygen_comments), NIL);