Typemap attribute fixes
Fix for breakages in previous few commits: - Perl test-suite - the "varout" typemap "type" attribute is now expanded in typemap.c instead of Perl.cxx. - The swig_typemap_warn errors testcase showed that $1 was no longer being expanded correctly when used in output typemaps (lname not set).
This commit is contained in:
parent
beabf61ef6
commit
457e0bfa81
2 changed files with 52 additions and 50 deletions
|
|
@ -1045,21 +1045,9 @@ public:
|
|||
|
||||
String *tt = Getattr(n, "tmap:varout:type");
|
||||
if (tt) {
|
||||
String *tm = NewStringf("&SWIGTYPE%s", SwigType_manglestr(t));
|
||||
if (Replaceall(tt, "$1_descriptor", tm)) {
|
||||
SwigType_remember(t);
|
||||
}
|
||||
Delete(tm);
|
||||
SwigType *st = Copy(t);
|
||||
SwigType_add_pointer(st);
|
||||
tm = NewStringf("&SWIGTYPE%s", SwigType_manglestr(st));
|
||||
if (Replaceall(tt, "$&1_descriptor", tm)) {
|
||||
SwigType_remember(st);
|
||||
}
|
||||
Delete(tm);
|
||||
Delete(st);
|
||||
tt = NewStringf("&%s", tt);
|
||||
} else {
|
||||
tt = (String *) "0";
|
||||
tt = NewString("0");
|
||||
}
|
||||
/* Now add symbol to the PERL interpreter */
|
||||
if (GetFlag(n, "feature:immutable")) {
|
||||
|
|
@ -1087,6 +1075,7 @@ public:
|
|||
if (export_all)
|
||||
Printf(exported, "$%s ", iname);
|
||||
|
||||
Delete(tt);
|
||||
DelWrapper(setf);
|
||||
DelWrapper(getf);
|
||||
Delete(getname);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue