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

Give an error if unsupported type is encountered

Browse source 
This is better than silently generating completely wrong code with
$resolved_type in it and makes it easier to understand what exactly went wrong
and where.
This commit is contained in:
Vadim Zeitlin 2016-04-20 23:16:48 +02:00
commit 4c654d9369
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Source/Modules/c.cxx
View file

@ -230,7 +230,7 @@ public:
* substituteResolvedTypeSpecialVariable() * substituteResolvedTypeSpecialVariable()
* ----------------------------------------------------------------------------- */ * ----------------------------------------------------------------------------- */
void substituteResolvedTypeSpecialVariable(SwigType *classnametype, String *tm, const char *classnamespecialvariable) { void substituteResolvedTypeSpecialVariable(Node* n, SwigType *classnametype, String *tm, const char *classnamespecialvariable) {
if (!CPlusPlus) { if (!CPlusPlus) {
// Just use the original C type when not using C++, we know that this type can be used in the wrappers. // Just use the original C type when not using C++, we know that this type can be used in the wrappers.
Clear(tm); Clear(tm);
@ -250,6 +250,10 @@ public:
String *classname = getProxyName(classnametype); String *classname = getProxyName(classnametype);
if (classname) { if (classname) {
Replaceall(tm, classnamespecialvariable, classname); // getProxyName() works for pointers to classes too Replaceall(tm, classnamespecialvariable, classname); // getProxyName() works for pointers to classes too
} else {
String* const s = SwigType_str(classnametype, 0);
Swig_error(Getfile(n), Getline(n), "Unhandled type \"%s\".\n", s);
Delete(s);
} }
} }
} }
@ -270,14 +274,14 @@ public:
* substitution_performed - flag indicating if a substitution was performed * substitution_performed - flag indicating if a substitution was performed
* ----------------------------------------------------------------------------- */ * ----------------------------------------------------------------------------- */
bool substituteResolvedType(SwigType *pt, String *tm) { bool substituteResolvedType(Node* n, SwigType *pt, String *tm) {
bool substitution_performed = false; bool substitution_performed = false;
SwigType *type = Copy(SwigType_typedef_resolve_all(pt)); SwigType *type = Copy(SwigType_typedef_resolve_all(pt));
SwigType *strippedtype = SwigType_strip_qualifiers(type); SwigType *strippedtype = SwigType_strip_qualifiers(type);
if (Strstr(tm, "$resolved_type")) { if (Strstr(tm, "$resolved_type")) {
SwigType *classnametype = Copy(strippedtype); SwigType *classnametype = Copy(strippedtype);
substituteResolvedTypeSpecialVariable(classnametype, tm, "$resolved_type"); substituteResolvedTypeSpecialVariable(n, classnametype, tm, "$resolved_type");
substitution_performed = true; substitution_performed = true;
Delete(classnametype); Delete(classnametype);
} }
@ -285,7 +289,7 @@ public:
SwigType *classnametype = Copy(strippedtype); SwigType *classnametype = Copy(strippedtype);
Delete(SwigType_pop(classnametype)); Delete(SwigType_pop(classnametype));
if (Len(classnametype) > 0) { if (Len(classnametype) > 0) {
substituteResolvedTypeSpecialVariable(classnametype, tm, "$*resolved_type"); substituteResolvedTypeSpecialVariable(n, classnametype, tm, "$*resolved_type");
substitution_performed = true; substitution_performed = true;
} }
Delete(classnametype); Delete(classnametype);
@ -293,7 +297,7 @@ public:
if (Strstr(tm, "$&resolved_type")) { if (Strstr(tm, "$&resolved_type")) {
SwigType *classnametype = Copy(strippedtype); SwigType *classnametype = Copy(strippedtype);
SwigType_add_pointer(classnametype); SwigType_add_pointer(classnametype);
substituteResolvedTypeSpecialVariable(classnametype, tm, "$&resolved_type"); substituteResolvedTypeSpecialVariable(n, classnametype, tm, "$&resolved_type");
substitution_performed = true; substitution_performed = true;
Delete(classnametype); Delete(classnametype);
} }
@ -744,7 +748,7 @@ ready:
} }
else else
{ {
substituteResolvedType(type, tm); substituteResolvedType(n, type, tm);
return_type = tm; return_type = tm;
} }
} }
@ -808,7 +812,7 @@ ready:
if ((stype = Getattr(p, "c:stype"))) { if ((stype = Getattr(p, "c:stype"))) {
proxy_parm_type = SwigType_lstr(stype, 0); proxy_parm_type = SwigType_lstr(stype, 0);
} else { } else {
substituteResolvedType(type, tm); substituteResolvedType(n, type, tm);
proxy_parm_type = tm; proxy_parm_type = tm;
} }