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

Improve interface feature checks

Browse source 
Use common code for missing feature:interface:name attribute checks
Check that all base classes are also marked as interfaces
This commit is contained in:
William S Fulton 2016-02-13 12:57:39 +00:00
commit c33b4dc34e
3 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Source/Modules/csharp.cxx
View file

@ -2071,10 +2071,6 @@ public:
if (Getattr(n, "feature:interface")) { if (Getattr(n, "feature:interface")) {
interface_class_code = NewStringEmpty(); interface_class_code = NewStringEmpty();
String *interface_name = Getattr(n, "feature:interface:name"); String *interface_name = Getattr(n, "feature:interface:name");
if (!interface_name) {
Swig_error(Getfile(n), Getline(n), "Interface %s has no name attribute", proxy_class_name);
SWIG_exit(EXIT_FAILURE);
}
String *output_directory = outputDirectory(nspace); String *output_directory = outputDirectory(nspace);
f_interface = getOutputFile(output_directory, interface_name); f_interface = getOutputFile(output_directory, interface_name);
addOpenNamespace(nspace, f_interface); addOpenNamespace(nspace, f_interface);

4
Source/Modules/java.cxx
View file

@ -2148,10 +2148,6 @@ public:
if (Getattr(n, "feature:interface")) { if (Getattr(n, "feature:interface")) {
interface_class_code = NewStringEmpty(); interface_class_code = NewStringEmpty();
String *interface_name = Getattr(n, "feature:interface:name"); String *interface_name = Getattr(n, "feature:interface:name");
if (!interface_name) {
Swig_error(Getfile(n), Getline(n), "Interface %s has no name attribute", proxy_class_name);
SWIG_exit(EXIT_FAILURE);
}
String *output_directory = outputDirectory(nspace); String *output_directory = outputDirectory(nspace);
String *filen = NewStringf("%s%s.java", output_directory, interface_name); String *filen = NewStringf("%s%s.java", output_directory, interface_name);
f_interface = NewFile(filen, "w", SWIG_output_files()); f_interface = NewFile(filen, "w", SWIG_output_files());

18
Source/Modules/lang.cxx
View file

@ -3883,6 +3883,24 @@ static void collect_interface_bases(Hash *bases, Node *n) {
* ----------------------------------------------------------------------------- */ * ----------------------------------------------------------------------------- */
static void collect_interface_base_classes(Node *n) { static void collect_interface_base_classes(Node *n) {
if (Getattr(n, "feature:interface")) {
if (!Getattr(n, "feature:interface:name")) {
Swig_error(Getfile(n), Getline(n), "The interface feature for '%s' is missing the name attribute.\n", SwigType_namestr(Getattr(n, "name")));
SWIG_exit(EXIT_FAILURE);
}
// check all bases are also interfaces
if (List *baselist = Getattr(n, "bases")) {
for (Iterator base = First(baselist); base.item; base = Next(base)) {
if (!GetFlag(base.item, "feature:ignore")) {
if (!Getattr(base.item, "feature:interface")) {
Swig_error(Getfile(n), Getline(n), "Base class '%s' of '%s' is not similarly marked as an interface.\n", SwigType_namestr(Getattr(base.item, "name")), SwigType_namestr(Getattr(n, "name")));
SWIG_exit(EXIT_FAILURE);
}
}
}
}
}
Hash *interface_bases = NewHash(); Hash *interface_bases = NewHash();
collect_interface_bases(interface_bases, n); collect_interface_bases(interface_bases, n);
if (Len(interface_bases) == 0) if (Len(interface_bases) == 0)