jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add Doxygen test for constant and fix JavaDoc indentation

Browse source
This commit is contained in:
William S Fulton 2018-06-16 22:36:08 +01:00
commit ecc66fdcbd
3 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Examples/test-suite/doxygen_parsing.i
View file

@ -36,6 +36,11 @@ struct SomeStruct
*/ */
int someVar=42; int someVar=42;
/**
* The constant comment
*/
#define CONSTANT_VALUE 4242
class SomeAnotherClass class SomeAnotherClass
{ {
public: public:

3
Examples/test-suite/java/doxygen_parsing_runme.java
View file

@ -125,6 +125,9 @@ public class doxygen_parsing_runme {
wantedComments.put("doxygen_parsing.SomeAnotherClass.setClassAttr2(int)", wantedComments.put("doxygen_parsing.SomeAnotherClass.setClassAttr2(int)",
"The class attribute post-comment \n" + "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 // and ask the parser to check comments for us
System.exit(parser.check(wantedComments)); System.exit(parser.check(wantedComments));

2
Source/Modules/java.cxx
View file

@ -1558,7 +1558,7 @@ public:
// Translate and write javadoc comment if flagged // Translate and write javadoc comment if flagged
if (doxygen && doxygenTranslator->hasDocumentation(n)) { if (doxygen && doxygenTranslator->hasDocumentation(n)) {
String *doxygen_comments = doxygenTranslator->getDocumentation(n, 0); String *doxygen_comments = doxygenTranslator->getDocumentation(n, " ");
if (comment_creation_chatter) if (comment_creation_chatter)
Printf(constants_code, "/* This was generated from constantWrapper() */\n"); Printf(constants_code, "/* This was generated from constantWrapper() */\n");
Printv(constants_code, Char(doxygen_comments), NIL); Printv(constants_code, Char(doxygen_comments), NIL);