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

interfaces branch merge fixes

Browse source
This commit is contained in:
William S Fulton 2016-02-11 20:21:25 +00:00
commit 212300c62b
3 changed files with 13 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Examples/test-suite/java/Makefile.in
View file

@ -39,7 +39,6 @@ CPP_TEST_CASES = \
java_throws \ java_throws \
java_typemaps_proxy \ java_typemaps_proxy \
java_typemaps_typewrapper \ java_typemaps_typewrapper \
multiple_inheritance_abstract
# li_boost_intrusive_ptr # li_boost_intrusive_ptr
CPP11_TEST_CASES = \ CPP11_TEST_CASES = \

26
Source/Modules/csharp.cxx
View file

@ -2060,19 +2060,16 @@ public:
f_proxy = getOutputFile(output_directory, proxy_class_name); f_proxy = getOutputFile(output_directory, proxy_class_name);
addOpenNamespace(nspace, f_proxy); addOpenNamespace(nspace, f_proxy);
Delete(output_directory);
} }
else else
++nesting_depth; ++nesting_depth;
// Start writing out the proxy class file proxy_class_def = NewString("");
emitBanner(f_proxy); proxy_class_code = NewString("");
addOpenNamespace(nspace, f_proxy); destructor_call = NewString("");
proxy_class_constants_code = NewString("");
Clear(proxy_class_def);
Clear(proxy_class_code);
destructor_call = NewStringEmpty();
proxy_class_constants_code = NewStringEmpty();
Swig_propagate_interface_methods(n); Swig_propagate_interface_methods(n);
if (Getattr(n, "feature:interface")) { if (Getattr(n, "feature:interface")) {
interface_class_code = NewStringEmpty(); interface_class_code = NewStringEmpty();
@ -2081,18 +2078,12 @@ public:
Swig_error(Getfile(n), Getline(n), "Interface %s has no name attribute", proxy_class_name); Swig_error(Getfile(n), Getline(n), "Interface %s has no name attribute", proxy_class_name);
SWIG_exit(EXIT_FAILURE); SWIG_exit(EXIT_FAILURE);
} }
filen = NewStringf("%s%s.cs", output_directory, iname); String *output_directory = outputDirectory(nspace);
f_interface = NewFile(filen, "w", SWIG_output_files()); f_interface = getOutputFile(output_directory, iname);
if (!f_interface) {
FileErrorDisplay(filen);
SWIG_exit(EXIT_FAILURE);
}
Append(filenames_list, filen); // file name ownership goes to the list
emitBanner(f_interface);
addOpenNamespace(nspace, f_interface); addOpenNamespace(nspace, f_interface);
emitInterfaceDeclaration(n, iname, f_interface); emitInterfaceDeclaration(n, iname, f_interface);
Delete(output_directory);
} }
Delete(output_directory);
} }
Language::classHandler(n); Language::classHandler(n);
@ -2182,6 +2173,7 @@ public:
Delete(norm_name); Delete(norm_name);
Delete(wname); Delete(wname);
Delete(downcast_method); Delete(downcast_method);
}
if (f_interface) { if (f_interface) {
Printv(f_interface, interface_class_code, "}\n", NIL); Printv(f_interface, interface_class_code, "}\n", NIL);

6
Source/Modules/java.cxx
View file

@ -2149,7 +2149,8 @@ public:
Swig_error(Getfile(n), Getline(n), "Interface %s has no name attribute", proxy_class_name); Swig_error(Getfile(n), Getline(n), "Interface %s has no name attribute", proxy_class_name);
SWIG_exit(EXIT_FAILURE); SWIG_exit(EXIT_FAILURE);
} }
filen = NewStringf("%s%s.java", output_directory, iname); String *output_directory = outputDirectory(nspace);
String *filen = NewStringf("%s%s.java", output_directory, iname);
f_interface = NewFile(filen, "w", SWIG_output_files()); f_interface = NewFile(filen, "w", SWIG_output_files());
if (!f_interface) { if (!f_interface) {
FileErrorDisplay(filen); FileErrorDisplay(filen);
@ -2158,8 +2159,9 @@ public:
Append(filenames_list, filen); // file name ownership goes to the list Append(filenames_list, filen); // file name ownership goes to the list
emitBanner(f_interface); emitBanner(f_interface);
emitInterfaceDeclaration(n, iname, f_interface, nspace); emitInterfaceDeclaration(n, iname, f_interface, nspace);
Delete(filen);
Delete(output_directory);
} }
Delete(output_directory);
} }
Language::classHandler(n); Language::classHandler(n);