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

Whitespace fixup

Browse source
This commit is contained in:
William S Fulton 2013-01-19 00:34:05 +00:00
commit 36ce54da8d
1 changed files with 34 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

68
Source/Modules/java.cxx
View file

@ -67,7 +67,7 @@ class JAVA:public Language {
String *imclass_imports; //intermediary class imports from %pragma String *imclass_imports; //intermediary class imports from %pragma
String *module_imports; //module imports from %pragma String *module_imports; //module imports from %pragma
String *imclass_baseclass; //inheritance for intermediary class class from %pragma String *imclass_baseclass; //inheritance for intermediary class class from %pragma
String *imclass_package; //package in which to generate the jni class String *imclass_package; //package in which to generate the jni class
String *module_baseclass; //inheritance for module class from %pragma String *module_baseclass; //inheritance for module class from %pragma
String *imclass_interfaces; //interfaces for intermediary class class from %pragma String *imclass_interfaces; //interfaces for intermediary class class from %pragma
String *module_interfaces; //interfaces for module class from %pragma String *module_interfaces; //interfaces for module class from %pragma
@ -1208,9 +1208,9 @@ public:
String *nspace = Getattr(n, "sym:nspace"); // NSpace/getNSpace() only works during Language::enumDeclaration call String *nspace = Getattr(n, "sym:nspace"); // NSpace/getNSpace() only works during Language::enumDeclaration call
if (proxy_flag && !is_wrapping_class()) { if (proxy_flag && !is_wrapping_class()) {
// Global enums / enums in a namespace // Global enums / enums in a namespace
assert(!full_imclass_name); assert(!full_imclass_name);
constructIntermediateClassName(n); constructIntermediateClassName(n);
} }
enum_code = NewString(""); enum_code = NewString("");
@ -1625,24 +1625,24 @@ public:
Delete(imclass_baseclass); Delete(imclass_baseclass);
imclass_baseclass = Copy(strvalue); imclass_baseclass = Copy(strvalue);
} else if (Strcmp(code, "jniclasspackage") == 0) { } else if (Strcmp(code, "jniclasspackage") == 0) {
Delete(imclass_package); Delete(imclass_package);
imclass_package = Copy(strvalue); imclass_package = Copy(strvalue);
String *imclass_class_package_jniname = makeValidJniName(imclass_package); String *imclass_class_package_jniname = makeValidJniName(imclass_package);
Printv(jnipackage, imclass_class_package_jniname, NIL); Printv(jnipackage, imclass_class_package_jniname, NIL);
Delete(imclass_class_package_jniname); Delete(imclass_class_package_jniname);
Replaceall(jnipackage, NSPACE_SEPARATOR, "_"); Replaceall(jnipackage, NSPACE_SEPARATOR, "_");
Append(jnipackage, "_"); Append(jnipackage, "_");
String *wrapper_name = NewString(""); String *wrapper_name = NewString("");
String *imclass_class_jniname = makeValidJniName(imclass_name); String *imclass_class_jniname = makeValidJniName(imclass_name);
Printf(wrapper_name, "Java_%s%s_%%f", jnipackage, imclass_class_jniname); Printf(wrapper_name, "Java_%s%s_%%f", jnipackage, imclass_class_jniname);
Delete(imclass_class_jniname); Delete(imclass_class_jniname);
Swig_name_unregister("wrapper"); Swig_name_unregister("wrapper");
Swig_name_register("wrapper", Char(wrapper_name)); Swig_name_register("wrapper", Char(wrapper_name));
Delete(wrapper_name); Delete(wrapper_name);
} else if (Strcmp(code, "jniclassclassmodifiers") == 0) { } else if (Strcmp(code, "jniclassclassmodifiers") == 0) {
Delete(imclass_class_modifiers); Delete(imclass_class_modifiers);
imclass_class_modifiers = Copy(strvalue); imclass_class_modifiers = Copy(strvalue);
} else if (Strcmp(code, "jniclasscode") == 0) { } else if (Strcmp(code, "jniclasscode") == 0) {
@ -1918,22 +1918,22 @@ public:
constructIntermediateClassName(n); constructIntermediateClassName(n);
if (!nspace) { if (!nspace) {
full_proxy_class_name = NewStringf("%s", proxy_class_name); full_proxy_class_name = NewStringf("%s", proxy_class_name);
if (Cmp(proxy_class_name, imclass_name) == 0) { if (Cmp(proxy_class_name, imclass_name) == 0) {
Printf(stderr, "Class name cannot be equal to intermediary class name: %s\n", proxy_class_name); Printf(stderr, "Class name cannot be equal to intermediary class name: %s\n", proxy_class_name);
SWIG_exit(EXIT_FAILURE); SWIG_exit(EXIT_FAILURE);
} }
if (Cmp(proxy_class_name, module_class_name) == 0) { if (Cmp(proxy_class_name, module_class_name) == 0) {
Printf(stderr, "Class name cannot be equal to module class name: %s\n", proxy_class_name); Printf(stderr, "Class name cannot be equal to module class name: %s\n", proxy_class_name);
SWIG_exit(EXIT_FAILURE); SWIG_exit(EXIT_FAILURE);
} }
} else { } else {
if (package) if (package)
full_proxy_class_name = NewStringf("%s.%s.%s", package, nspace, proxy_class_name); full_proxy_class_name = NewStringf("%s.%s.%s", package, nspace, proxy_class_name);
else else
full_proxy_class_name = NewStringf("%s.%s", nspace, proxy_class_name); full_proxy_class_name = NewStringf("%s.%s", nspace, proxy_class_name);
} }
if (!addSymbol(proxy_class_name, n, nspace)) if (!addSymbol(proxy_class_name, n, nspace))
@ -1943,8 +1943,8 @@ public:
String *filen = NewStringf("%s%s.java", output_directory, proxy_class_name); String *filen = NewStringf("%s%s.java", output_directory, proxy_class_name);
f_proxy = NewFile(filen, "w", SWIG_output_files()); f_proxy = NewFile(filen, "w", SWIG_output_files());
if (!f_proxy) { if (!f_proxy) {
FileErrorDisplay(filen); FileErrorDisplay(filen);
SWIG_exit(EXIT_FAILURE); SWIG_exit(EXIT_FAILURE);
} }
Append(filenames_list, Copy(filen)); Append(filenames_list, Copy(filen));
Delete(filen); Delete(filen);