From: <che...@us...> - 2008-08-18 05:08:04
|
Revision: 10779 http://swig.svn.sourceforge.net/swig/?rev=10779&view=rev Author: cherylfoil Date: 2008-08-18 05:08:01 +0000 (Mon, 18 Aug 2008) Log Message: ----------- Silencing of some diagnostic print statements for what method generated what javadoc Modified Paths: -------------- branches/gsoc2008-cherylfoil/Source/Modules/java.cxx Modified: branches/gsoc2008-cherylfoil/Source/Modules/java.cxx =================================================================== --- branches/gsoc2008-cherylfoil/Source/Modules/java.cxx 2008-08-18 04:57:05 UTC (rev 10778) +++ branches/gsoc2008-cherylfoil/Source/Modules/java.cxx 2008-08-18 05:08:01 UTC (rev 10779) @@ -91,6 +91,7 @@ } /* DOXYGEN TO JAVADOC globals */ bool doxygen_javadoc_flag; //flag for converting found doxygen to javadoc + bool comment_creation_chatter; //flag for getting information about where comments were created in java.cxx //TODO make this bool a command line option DoxygenTranslator doxyTranslator; @@ -123,6 +124,7 @@ global_variable_flag(false), old_variable_names(false), member_func_flag(false), + comment_creation_chatter(true), imclass_name(NULL), module_class_name(NULL), imclass_class_code(NULL), @@ -507,8 +509,8 @@ if (doxygen_javadoc_flag){ if (Getattr(n,"DoxygenComment")){ - Printf(f_module, "/* This was generated from top() */"); - Printf(f_module, doxyTranslator.convert(Char((String *)Getattr(n,"DoxygenComment")),"JAVADOC")); + if(comment_creation_chatter) Printf(f_module, "/* This was generated from top() */"); + Printf(f_module, doxyTranslator.convert(Char(Getattr(n,"DoxygenComment")),"JAVADOC")); } } if (Len(module_class_modifiers) > 0) @@ -1231,9 +1233,9 @@ //translate and write javadoc comment if flagged if (doxygen_javadoc_flag){ if (Getattr(n,"DoxygenComment")){ - Printv(proxy_class_constants_code, "/* This was generated from enumvalueDeclaration */", NIL ); - - Printv(proxy_class_constants_code, doxyTranslator.convert(Char((const String *)Getattr(n,"DoxygenComment")),"JAVADOC"), NIL); + if(comment_creation_chatter) Printv(proxy_class_constants_code, "/* This was generated from enumvalueDeclaration */", NIL ); + Printv(proxy_class_constants_code, + doxyTranslator.convert(Char(Getattr(n,"DoxygenComment")),"JAVADOC"), NIL); } } @@ -1302,8 +1304,8 @@ //translate and write javadoc comment if flagged if (doxygen_javadoc_flag){ if (Getattr(n,"DoxygenComment")){ - Printf(enum_code, "/* This was generated from enumvalueDeclaration() */" ); - Printf(enum_code, doxyTranslator.convert(Char((String *)Getattr(n,"DoxygenComment")),"JAVADOC")); + if(comment_creation_chatter) Printf(enum_code, "/* This was generated from enumvalueDeclaration() */" ); + Printf(enum_code, doxyTranslator.convert(Char(Getattr(n,"DoxygenComment")),"JAVADOC")); } } { @@ -1372,8 +1374,8 @@ virtual int doxygenComment(Node *n){ if (doxygen_javadoc_flag){ if (Getattr(n,"DoxygenComment")){ - Printv(structuralComments, "/* This was generated from doxygenComment() */\n", NIL); - Printv(structuralComments, doxyTranslator.convert(Char((String *)Getattr(n,"DoxygenComment")),"JAVADOC"), NIL); + if(comment_creation_chatter) Printv(structuralComments, "/* This was generated from doxygenComment() */\n", NIL); + Printv(structuralComments, doxyTranslator.convert(Char(Getattr(n,"DoxygenComment")),"JAVADOC"), NIL); } } return SWIG_OK; @@ -1400,8 +1402,8 @@ //translate and write javadoc comment if flagged if (doxygen_javadoc_flag){ if (Getattr(n,"DoxygenComment")){ - Printf(constants_code, "/* This was generated from enumvalueDeclaration */\n"); - Printf(constants_code, doxyTranslator.convert(Char((String *)Getattr(n,"DoxygenComment")),"JAVADOC")); + if(comment_creation_chatter) Printf(constants_code, "/* This was generated from enumvalueDeclaration */\n"); + Printf(constants_code, doxyTranslator.convert(Char(Getattr(n,"DoxygenComment")),"JAVADOC")); } } @@ -1669,8 +1671,8 @@ //translate and write javadoc comment if flagged if (doxygen_javadoc_flag){ if (Getattr(n,"DoxygenComment")){ - Printv(proxy_class_def, "/* This was generated from emitProxyClassDefAndCPPCasts() */\n", NIL ); - Printv(proxy_class_def, doxyTranslator.convert(Char((String *)Getattr(n,"DoxygenComment")),"JAVADOC"), NIL); + if(comment_creation_chatter) Printv(proxy_class_def, "/* This was generated from emitProxyClassDefAndCPPCasts() */\n", NIL ); + Printv(proxy_class_def, doxyTranslator.convert(Char(Getattr(n,"DoxygenComment")),"JAVADOC"), NIL); } } @@ -2010,8 +2012,8 @@ //translate and write javadoc comment if flagged if (doxygen_javadoc_flag){ if (Getattr(n,"DoxygenComment")){ - Printf(function_code, "/* This was generated from proxyclassfunctionhandler */"); - Printf(function_code, doxyTranslator.convert(Char((String *)Getattr(n,"DoxygenComment")),"JAVADOC")); + if(comment_creation_chatter) Printf(function_code, "/* This was generated from proxyclassfunctionhandler */"); + Printf(function_code, doxyTranslator.convert(Char(Getattr(n,"DoxygenComment")),"JAVADOC")); } } @@ -2240,8 +2242,8 @@ //translate and write javadoc comment if flagged if (doxygen_javadoc_flag){ if (Getattr(n,"DoxygenComment")){ - Printf(function_code, "/* This was generated from constructionhandler */\n" ); - Printf(function_code, doxyTranslator.convert(Char((String *)Getattr(n,"DoxygenComment")),"JAVADOC")); + if(comment_creation_chatter) Printf(function_code, "/* This was generated from constructionhandler */\n" ); + Printf(function_code, doxyTranslator.convert(Char(Getattr(n,"DoxygenComment")),"JAVADOC")); } } @@ -2509,8 +2511,8 @@ //translate and write javadoc comment if flagged if (doxygen_javadoc_flag){ if (Getattr(n,"DoxygenComment")){ - Printf(function_code, "/* This was generated from moduleClassFunctionHandler() */\n" ); - Printf(function_code, doxyTranslator.convert(Char((String *)Getattr(n,"DoxygenComment")),"JAVADOC")); + if(comment_creation_chatter) Printf(function_code, "/* This was generated from moduleClassFunctionHandler() */\n" ); + Printf(function_code, doxyTranslator.convert(Char(Getattr(n,"DoxygenComment")),"JAVADOC")); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <che...@us...> - 2008-08-18 07:34:29
|
Revision: 10782 http://swig.svn.sourceforge.net/swig/?rev=10782&view=rev Author: cherylfoil Date: 2008-08-18 07:34:27 +0000 (Mon, 18 Aug 2008) Log Message: ----------- Memory usage fix in java.cxx Modified Paths: -------------- branches/gsoc2008-cherylfoil/Source/Modules/java.cxx Modified: branches/gsoc2008-cherylfoil/Source/Modules/java.cxx =================================================================== --- branches/gsoc2008-cherylfoil/Source/Modules/java.cxx 2008-08-18 07:23:41 UTC (rev 10781) +++ branches/gsoc2008-cherylfoil/Source/Modules/java.cxx 2008-08-18 07:34:27 UTC (rev 10782) @@ -124,7 +124,7 @@ global_variable_flag(false), old_variable_names(false), member_func_flag(false), - comment_creation_chatter(true), + comment_creation_chatter(false), imclass_name(NULL), module_class_name(NULL), imclass_class_code(NULL), @@ -510,7 +510,9 @@ if (doxygen_javadoc_flag){ if (Getattr(n,"DoxygenComment")){ if(comment_creation_chatter) Printf(f_module, "/* This was generated from top() */"); - Printf(f_module, doxyTranslator.convert(Char(Getattr(n,"DoxygenComment")),"JAVADOC")); + char *convertedString = doxyTranslator.convert(Char(Getattr(n,"DoxygenComment")),"JAVADOC"); + Printf(f_module, convertedString); + free(convertedString); } } if (Len(module_class_modifiers) > 0) @@ -640,6 +642,8 @@ module_imports = NULL; Delete(module_class_modifiers); module_class_modifiers = NULL; + Delete(structuralComments); + structuralComments = NULL; Delete(imclass_imports); imclass_imports = NULL; Delete(imclass_cppcasts_code); @@ -1234,8 +1238,9 @@ if (doxygen_javadoc_flag){ if (Getattr(n,"DoxygenComment")){ if(comment_creation_chatter) Printv(proxy_class_constants_code, "/* This was generated from enumvalueDeclaration */", NIL ); - Printv(proxy_class_constants_code, - doxyTranslator.convert(Char(Getattr(n,"DoxygenComment")),"JAVADOC"), NIL); + char *convertedString = doxyTranslator.convert(Char(Getattr(n,"DoxygenComment")),"JAVADOC"); + Printv(proxy_class_constants_code, convertedString, NIL); + free(convertedString); } } @@ -1305,7 +1310,9 @@ if (doxygen_javadoc_flag){ if (Getattr(n,"DoxygenComment")){ if(comment_creation_chatter) Printf(enum_code, "/* This was generated from enumvalueDeclaration() */" ); - Printf(enum_code, doxyTranslator.convert(Char(Getattr(n,"DoxygenComment")),"JAVADOC")); + char *convertedString = doxyTranslator.convert(Char(Getattr(n,"DoxygenComment")),"JAVADOC"); + Printf(enum_code, convertedString); + free(convertedString); } } { @@ -1375,7 +1382,9 @@ if (doxygen_javadoc_flag){ if (Getattr(n,"DoxygenComment")){ if(comment_creation_chatter) Printv(structuralComments, "/* This was generated from doxygenComment() */\n", NIL); - Printv(structuralComments, doxyTranslator.convert(Char(Getattr(n,"DoxygenComment")),"JAVADOC"), NIL); + char *convertedString = doxyTranslator.convert(Char(Getattr(n,"DoxygenComment")),"JAVADOC"); + Printv(structuralComments, convertedString, NIL); + free(convertedString); } } return SWIG_OK; @@ -1403,7 +1412,9 @@ if (doxygen_javadoc_flag){ if (Getattr(n,"DoxygenComment")){ if(comment_creation_chatter) Printf(constants_code, "/* This was generated from enumvalueDeclaration */\n"); - Printf(constants_code, doxyTranslator.convert(Char(Getattr(n,"DoxygenComment")),"JAVADOC")); + char *convertedString = doxyTranslator.convert(Char(Getattr(n,"DoxygenComment")),"JAVADOC"); + Printf(constants_code, convertedString); + free(convertedString); } } @@ -1672,7 +1683,9 @@ if (doxygen_javadoc_flag){ if (Getattr(n,"DoxygenComment")){ if(comment_creation_chatter) Printv(proxy_class_def, "/* This was generated from emitProxyClassDefAndCPPCasts() */\n", NIL ); - Printv(proxy_class_def, doxyTranslator.convert(Char(Getattr(n,"DoxygenComment")),"JAVADOC"), NIL); + char *convertedString = doxyTranslator.convert(Char(Getattr(n,"DoxygenComment")),"JAVADOC"); + Printv(proxy_class_def, convertedString, NIL); + free(convertedString); } } @@ -2013,7 +2026,9 @@ if (doxygen_javadoc_flag){ if (Getattr(n,"DoxygenComment")){ if(comment_creation_chatter) Printf(function_code, "/* This was generated from proxyclassfunctionhandler */"); - Printf(function_code, doxyTranslator.convert(Char(Getattr(n,"DoxygenComment")),"JAVADOC")); + char *convertedString = doxyTranslator.convert(Char(Getattr(n,"DoxygenComment")),"JAVADOC"); + Printf(function_code, convertedString); + free(convertedString); } } @@ -2243,7 +2258,9 @@ if (doxygen_javadoc_flag){ if (Getattr(n,"DoxygenComment")){ if(comment_creation_chatter) Printf(function_code, "/* This was generated from constructionhandler */\n" ); - Printf(function_code, doxyTranslator.convert(Char(Getattr(n,"DoxygenComment")),"JAVADOC")); + char *convertedString = doxyTranslator.convert(Char(Getattr(n,"DoxygenComment")),"JAVADOC"); + Printf(function_code, convertedString); + free(convertedString); } } @@ -2512,7 +2529,9 @@ if (doxygen_javadoc_flag){ if (Getattr(n,"DoxygenComment")){ if(comment_creation_chatter) Printf(function_code, "/* This was generated from moduleClassFunctionHandler() */\n" ); - Printf(function_code, doxyTranslator.convert(Char(Getattr(n,"DoxygenComment")),"JAVADOC")); + char *convertedString = doxyTranslator.convert(Char(Getattr(n,"DoxygenComment")),"JAVADOC"); + Printf(function_code, convertedString); + free(convertedString); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |