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

Correct interface name attributes that are internal

Browse source 
Attributes with 'feature:' prefix are reserved for %feature, not internal usage.
This commit is contained in:
William S Fulton 2016-02-09 07:22:07 +00:00
commit dd6af222f4
3 changed files with 23 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Source/Modules/java.cxx
View file

@ -1704,9 +1704,8 @@ public:
return Language::pragmaDirective(n);
}
String* getQualifiedInterfaceName(Node* n)
{
String* ret = Getattr(n, "feature:interface:qname");
String* getQualifiedInterfaceName(Node* n) {
String* ret = Getattr(n, "interface:qname");
if (!ret) {
String *nspace = Getattr(n, "sym:nspace");
String *symname = Getattr(n, "feature:interface:name");
@ -1721,7 +1720,7 @@ public:
else
ret = Copy(symname);
}
Setattr(n, "feature:interface:qname", ret);
Setattr(n, "interface:qname", ret);
}
return ret;
}
@ -1815,9 +1814,9 @@ public:
}
}
Hash* interface_classes = Getattr(n, "feature:interface:bases");
if (interface_classes)
addInterfaceNameAndUpcasts(interface_list, interface_upcasts, interface_classes, c_classname);
Hash* interface_bases = Getattr(n, "interface:bases");
if (interface_bases)
addInterfaceNameAndUpcasts(interface_list, interface_upcasts, interface_bases, c_classname);
bool derived = baseclass && getProxyName(c_baseclassname);
if (derived && purebase_notderived)
@ -2259,7 +2258,7 @@ public:
String *pre_code = NewString("");
String *post_code = NewString("");
bool is_interface = Getattr(parentNode(n), "feature:interface") != 0
&& !static_flag && Getattr(n, "feature:interface:owner") == 0;
&& !static_flag && Getattr(n, "interface:owner") == 0;
if (!proxy_flag)
return;