diff options
author | Olly Betts <olly@survex.com> | 2015-03-16 15:04:50 +1300 |
---|---|---|
committer | Olly Betts <olly@survex.com> | 2015-03-16 15:04:50 +1300 |
commit | a9e35e06d7947f542d621228434b3ffbfa6b8eab (patch) | |
tree | a3db2cb2a841f092d779e46e8a18f9827a2f443f | |
parent | 739254d8c5bddefbbe06fc77fbde340c59996ff5 (diff) | |
download | swig-a9e35e06d7947f542d621228434b3ffbfa6b8eab.tar.gz |
Eliminate pointless whitespace differences from master
-rw-r--r-- | Source/Modules/java.cxx | 41 | ||||
-rw-r--r-- | Source/Modules/python.cxx | 2 | ||||
-rw-r--r-- | Source/Modules/swigmod.h | 4 | ||||
-rw-r--r-- | Source/Swig/swig.h | 1 |
4 files changed, 22 insertions, 26 deletions
diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx index da0bf5bf3..0905ec8fb 100644 --- a/Source/Modules/java.cxx +++ b/Source/Modules/java.cxx @@ -49,7 +49,7 @@ class JAVA:public Language { bool member_func_flag; // flag set when wrapping a member function bool doxygen; //flag for converting found doxygen to javadoc bool comment_creation_chatter; //flag for getting information about where comments were created in java.cxx - + String *imclass_name; // intermediary class name String *module_class_name; // module class name String *constants_interface_name; // constants interface name @@ -169,7 +169,7 @@ public: director_multiple_inheritance = 0; director_language = 1; } - + ~JAVA() { delete doxygenTranslator; } @@ -317,7 +317,7 @@ public: } } } - + if (doxygen) doxygenTranslator = new JavaDocConverter(doxygen_translator_flags); @@ -589,7 +589,7 @@ public: if (module_imports) Printf(f_module, "%s\n", module_imports); - + if (doxygen && doxygenTranslator->hasDocumentation(n)){ String *doxygen_comments=doxygenTranslator->getDocumentation(n); if(comment_creation_chatter) @@ -1020,7 +1020,7 @@ public: Delete(c_param_type); Delete(arg); } - + Printv(f->code, nondir_args, NIL); Delete(nondir_args); @@ -1347,7 +1347,7 @@ public: // Add extra indentation Replaceall(enum_code, "\n", "\n "); Replaceall(enum_code, " \n", "\n"); - + Printv(proxy_class_constants_code, " ", enum_code, "\n\n", NIL); } else { // Global enums are defined in their own file @@ -1376,7 +1376,7 @@ public: Printv(f_enum, typemapLookup(n, "javaimports", typemap_lookup_type, WARN_NONE), // Import statements "\n\n", NIL); - + //translate and write javadoc comment if flagged if (doxygen && doxygenTranslator->hasDocumentation(n)){ String *doxygen_comments=doxygenTranslator->getDocumentation(n); @@ -1385,7 +1385,7 @@ public: Printv(f_enum, Char(doxygen_comments), NIL); Delete(doxygen_comments); } - + Printv(f_enum, enum_code, "\n", NIL); Printf(f_enum, "\n"); @@ -1438,7 +1438,7 @@ public: tmpValue = NewString(name); // Note that this is used in enumValue() amongst other places Setattr(n, "value", tmpValue); - + // Deal with enum values that are not int int swigtype = SwigType_type(Getattr(n, "type")); if (swigtype == T_BOOL) { @@ -1479,7 +1479,7 @@ public: } if (!addSymbol(symname, n, scope)) return SWIG_ERROR; - + //translate and write javadoc comment if flagged if (doxygen && doxygenTranslator->hasDocumentation(n)){ String *doxygen_comments=doxygenTranslator->getDocumentation(n); @@ -1561,7 +1561,7 @@ public: } return SWIG_OK; } - + /* ----------------------------------------------------------------------- * constantWrapper() * Used for wrapping constants - #define or %constant. @@ -1580,7 +1580,6 @@ public: String *tm; String *return_type = NewString(""); String *constants_code = NewString(""); - Swig_save("constantWrapper", n, "value", NIL); //translate and write javadoc comment if flagged @@ -1591,7 +1590,7 @@ public: Printv(constants_code, Char(doxygen_comments), NIL); Delete(doxygen_comments); } - + bool is_enum_item = (Cmp(nodeType(n), "enumitem") == 0); const String *itemname = (proxy_flag && wrapping_member_flag) ? variable_name : symname; @@ -1898,7 +1897,7 @@ public: // Pure Java interfaces const String *pure_interfaces = typemapLookup(n, "javainterfaces", typemap_lookup_type, WARN_NONE); - + //translate and write javadoc comment if flagged if (doxygen && doxygenTranslator->hasDocumentation(n)){ String *doxygen_comments=doxygenTranslator->getDocumentation(n); @@ -1907,7 +1906,7 @@ public: Printv(proxy_class_def, Char(doxygen_comments), NIL); Delete(doxygen_comments); } - + // Start writing the proxy class if (!has_outerclass) // Import statements Printv(proxy_class_def, typemapLookup(n, "javaimports", typemap_lookup_type, WARN_NONE),"\n", NIL); @@ -2364,7 +2363,7 @@ public: // For wrapping member variables (Javabean setter) setter_flag = (Cmp(Getattr(n, "sym:name"), Swig_name_set(getNSpace(), Swig_name_member(0, getClassPrefix(), variable_name))) == 0); } - + //translate and write javadoc comment if flagged if (doxygen && doxygenTranslator->hasDocumentation(n)){ String *doxygen_comments=doxygenTranslator->getDocumentation(n); @@ -2373,7 +2372,7 @@ public: Printv(function_code, Char(doxygen_comments), NIL); Delete(doxygen_comments); } - + /* Start generating the proxy function */ const String *methodmods = Getattr(n, "feature:java:methodmodifiers"); methodmods = methodmods ? methodmods : (is_public(n) ? public_string : protected_string); @@ -2595,7 +2594,7 @@ public: tm = Getattr(n, "tmap:jtype"); // typemaps were attached earlier to the node Printf(im_return_type, "%s", tm); - + //translate and write javadoc comment if flagged if (doxygen && doxygenTranslator->hasDocumentation(n)){ String *doxygen_comments=doxygenTranslator->getDocumentation(n); @@ -2604,7 +2603,7 @@ public: Printv(function_code, Char(doxygen_comments), NIL); Delete(doxygen_comments); } - + Printf(function_code, " %s %s(", methodmods, proxy_class_name); Printf(helper_code, " static private %s SwigConstruct%s(", im_return_type, proxy_class_name); @@ -2865,7 +2864,7 @@ public: bool setter_flag = false; String *pre_code = NewString(""); String *post_code = NewString(""); - + // translate and write javadoc comment if flagged if (doxygen && doxygenTranslator->hasDocumentation(n)){ String *doxygen_comments=doxygenTranslator->getDocumentation(n); @@ -3293,7 +3292,6 @@ public: const String *pure_baseclass = typemapLookup(n, "javabase", type, WARN_NONE); const String *pure_interfaces = typemapLookup(n, "javainterfaces", type, WARN_NONE); - // Emit the class Printv(swigtype, typemapLookup(n, "javaimports", type, WARN_NONE), // Import statements "\n", typemapLookup(n, "javaclassmodifiers", type, WARN_JAVA_TYPEMAP_CLASSMOD_UNDEF), // Class modifiers @@ -4758,4 +4756,3 @@ Java Options (available with -java)\n\ -oldvarnames - Old intermediary method names for variable wrappers\n\ -package <name> - Set name of the Java package to <name>\n\ \n"; - diff --git a/Source/Modules/python.cxx b/Source/Modules/python.cxx index a3bcbb6a9..036e58082 100644 --- a/Source/Modules/python.cxx +++ b/Source/Modules/python.cxx @@ -563,7 +563,7 @@ public: if (cppcast) { Preprocessor_define((DOH *) "SWIG_CPLUSPLUS_CAST", 0); } - + if (doxygen) doxygenTranslator = new PyDocConverter(doxygen_translator_flags); diff --git a/Source/Modules/swigmod.h b/Source/Modules/swigmod.h index 311fd514c..09f0460df 100644 --- a/Source/Modules/swigmod.h +++ b/Source/Modules/swigmod.h @@ -86,7 +86,7 @@ public: /* Doxygen Comment */ virtual int doxygenComment(Node *n); - + /* C/C++ parsing */ virtual int cDeclaration(Node *n); @@ -169,7 +169,7 @@ public: /* C/C++ parsing */ virtual int doxygenComment(Node *n); - + /* Function handlers */ virtual int functionHandler(Node *n); diff --git a/Source/Swig/swig.h b/Source/Swig/swig.h index ea30dceba..ea3607de8 100644 --- a/Source/Swig/swig.h +++ b/Source/Swig/swig.h @@ -335,7 +335,6 @@ extern int ParmList_is_compactdefargs(ParmList *p); extern void Swig_offset_string(String *s, int number); extern String *Swig_pcre_version(void); extern void Swig_init(void); - extern int Swig_value_wrapper_mode(int mode); extern int Swig_is_generated_overload(Node *n); |