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

Replace DoxygenTranslator debug parameters with a single flags one.

Browse source 
This makes the code more readable and more extensible as more flags are easier
to add in the future than more boolean parameters.

No user-visible changes.
This commit is contained in:
Vadim Zeitlin 2014-06-11 19:36:49 +02:00
commit f684242467
8 changed files with 45 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Source/Modules/java.cxx
View file

@ -261,8 +261,7 @@ public:
SWIG_library_directory("java");
bool debug_doxygen_translator = false;
bool debug_doxygen_parser = false;
int doxygen_translator_flags = 0;
// Look for certain command line options
for (int i = 1; i < argc; i++) {
@ -289,12 +288,12 @@ public:
Swig_mark_arg(i);
doxygen = true;
scan_doxygen_comments = true;
} else if ((strcmp(argv[i], "-debug-doxygen-translator") == 0)) {
Swig_mark_arg(i);
debug_doxygen_translator = true;
} else if ((strcmp(argv[i], "-debug-doxygen-parser") == 0)) {
Swig_mark_arg(i);
debug_doxygen_parser = true;
} else if ((strcmp(argv[i], "-debug-doxygen-translator") == 0)) {
Swig_mark_arg(i);
doxygen_translator_flags |= DoxygenTranslator::debug_translator;
} else if ((strcmp(argv[i], "-debug-doxygen-parser") == 0)) {
Swig_mark_arg(i);
doxygen_translator_flags |= DoxygenTranslator::debug_parser;
} else if ((strcmp(argv[i], "-noproxy") == 0)) {
Swig_mark_arg(i);
proxy_flag = false;
@ -320,7 +319,7 @@ public:
}
if (doxygen)
doxygenTranslator = new JavaDocConverter(debug_doxygen_translator, debug_doxygen_parser);
doxygenTranslator = new JavaDocConverter(doxygen_translator_flags);
// Add a symbol to the parser for conditional compilation
Preprocessor_define("SWIGJAVA 1", 0);

17
Source/Modules/python.cxx
View file

@ -339,8 +339,7 @@ public:
SWIG_library_directory("python");
bool debug_doxygen_parser = false;
bool debug_doxygen_translator = false;
int doxygen_translator_flags = 0;
for (int i = 1; i < argc; i++) {
if (argv[i]) {
@ -436,12 +435,12 @@ public:
doxygen = 1;
scan_doxygen_comments = 1;
Swig_mark_arg(i);
} else if (strcmp(argv[i], "-debug-doxygen-translator") == 0) {
debug_doxygen_translator = true;
Swig_mark_arg(i);
} else if (strcmp(argv[i], "-debug-doxygen-parser") == 0) {
debug_doxygen_parser = true;
Swig_mark_arg(i);
} else if (strcmp(argv[i], "-debug-doxygen-translator") == 0) {
doxygen_translator_flags |= DoxygenTranslator::debug_translator;
Swig_mark_arg(i);
} else if (strcmp(argv[i], "-debug-doxygen-parser") == 0) {
doxygen_translator_flags |= DoxygenTranslator::debug_parser;
Swig_mark_arg(i);
} else if (strcmp(argv[i], "-fastunpack") == 0) {
fastunpack = 1;
Swig_mark_arg(i);
@ -564,7 +563,7 @@ public:
}
if (doxygen)
doxygenTranslator = new PyDocConverter(debug_doxygen_translator, debug_doxygen_parser);
doxygenTranslator = new PyDocConverter(doxygen_translator_flags);
if (!global_name)
global_name = NewString("cvar");