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

Handle primitive types when expanding "resolved_type" in typemaps

Browse source 
Although the default typemaps only use "resolved_type" for non-simple types,
the generic SWIGTYPE typemap can also be applied explicitly to other types as
"apply_strings" and "char_binary" unit tests do.

In this case just use the original type unchanged if we can, this is enough to
make these tests pass.
This commit is contained in:
Vadim Zeitlin 2016-04-20 23:41:32 +02:00
commit e39265ba13
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Source/Modules/c.cxx
View file

@ -251,9 +251,16 @@ public:
if (classname) {
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);
String* const typestr = SwigType_str(classnametype, 0);
SwigType *btype = SwigType_base(classnametype);
if (SwigType_isbuiltin(btype)) {
// This should work just as well in C without any changes.
Replaceall(tm, classnamespecialvariable, typestr);
} else {
Swig_error(Getfile(n), Getline(n), "Unhandled type \"%s\".\n", typestr);
}
Delete(btype);
Delete(typestr);
}
}
}