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

Expand symname special variable in director typemaps

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@12887 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2011-12-23 16:27:15 +00:00
commit de5a78c781
4 changed files with 40 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Source/Modules/csharp.cxx
View file

@ -3856,7 +3856,7 @@ public:
Delete(extra_method_name); Delete(extra_method_name);
} }
/* emit code */ /* emit the director method */
if (status == SWIG_OK && output_director) { if (status == SWIG_OK && output_director) {
if (!is_void) { if (!is_void) {
Replaceall(w->code, "$null", qualified_return); Replaceall(w->code, "$null", qualified_return);
@ -3866,6 +3866,7 @@ public:
if (!ignored_method) if (!ignored_method)
Printv(director_delegate_callback, "\n", callback_def, callback_code, NIL); Printv(director_delegate_callback, "\n", callback_def, callback_code, NIL);
if (!Getattr(n, "defaultargs")) { if (!Getattr(n, "defaultargs")) {
Replaceall(w->code, "$symname", symname);
Wrapper_print(w, f_directors); Wrapper_print(w, f_directors);
Printv(f_directors_h, declaration, NIL); Printv(f_directors_h, declaration, NIL);
Printv(f_directors_h, inline_extra_method, NIL); Printv(f_directors_h, inline_extra_method, NIL);

3
Source/Modules/d.cxx
View file

@ -2344,7 +2344,7 @@ public:
Delete(extra_method_name); Delete(extra_method_name);
} }
/* emit code */ /* emit the director method */
if (status == SWIG_OK && output_director) { if (status == SWIG_OK && output_director) {
if (!is_void) { if (!is_void) {
Replaceall(w->code, "$null", qualified_return); Replaceall(w->code, "$null", qualified_return);
@ -2354,6 +2354,7 @@ public:
if (!ignored_method) if (!ignored_method)
Printv(director_dcallbacks_code, callback_def, callback_code, NIL); Printv(director_dcallbacks_code, callback_def, callback_code, NIL);
if (!Getattr(n, "defaultargs")) { if (!Getattr(n, "defaultargs")) {
Replaceall(w->code, "$symname", symname);
Wrapper_print(w, f_directors); Wrapper_print(w, f_directors);
Printv(f_directors_h, declaration, NIL); Printv(f_directors_h, declaration, NIL);
Printv(f_directors_h, inline_extra_method, NIL); Printv(f_directors_h, inline_extra_method, NIL);

66
Source/Modules/go.cxx
View file

@ -2859,6 +2859,7 @@ private:
* ------------------------------------------------------------ */ * ------------------------------------------------------------ */
int oneClassDirectorMethod(Node *n, Node *parent, String *super) { int oneClassDirectorMethod(Node *n, Node *parent, String *super) {
String *symname = Getattr(n, "sym:name");
if (!checkFunctionVisibility(n, parent)) { if (!checkFunctionVisibility(n, parent)) {
return SWIG_OK; return SWIG_OK;
} }
@ -2942,12 +2943,12 @@ private:
} }
Parm *p = 0; Parm *p = 0;
Wrapper *f = NewWrapper(); Wrapper *w = NewWrapper();
Swig_director_parms_fixup(parms); Swig_director_parms_fixup(parms);
Swig_typemap_attach_parms("directorin", parms, f); Swig_typemap_attach_parms("directorin", parms, w);
Swig_typemap_attach_parms("directorargout", parms, f); Swig_typemap_attach_parms("directorargout", parms, w);
if (!is_ignored) { if (!is_ignored) {
// We use an interface to see if this method is defined in Go. // We use an interface to see if this method is defined in Go.
@ -3354,29 +3355,29 @@ private:
String *qname = NewString(""); String *qname = NewString("");
Printv(qname, "SwigDirector_", class_name, "::", Getattr(n, "name"), NULL); Printv(qname, "SwigDirector_", class_name, "::", Getattr(n, "name"), NULL);
decl = Swig_method_decl(rtype, Getattr(n, "decl"), qname, parms, 0, 0); decl = Swig_method_decl(rtype, Getattr(n, "decl"), qname, parms, 0, 0);
Printv(f->def, decl, NULL); Printv(w->def, decl, NULL);
Delete(decl); Delete(decl);
Delete(qname); Delete(qname);
String *throws = buildThrow(n); String *throws = buildThrow(n);
if (throws) { if (throws) {
Printv(f_c_directors_h, " ", throws, NULL); Printv(f_c_directors_h, " ", throws, NULL);
Printv(f->def, " ", throws, NULL); Printv(w->def, " ", throws, NULL);
Delete(throws); Delete(throws);
} }
Printv(f_c_directors_h, ";\n", NULL); Printv(f_c_directors_h, ";\n", NULL);
Printv(f->def, " {\n", NULL); Printv(w->def, " {\n", NULL);
if (SwigType_type(result) != T_VOID) { if (SwigType_type(result) != T_VOID) {
Wrapper_add_local(f, "c_result", SwigType_lstr(Getattr(n, "returntype"), "c_result")); Wrapper_add_local(w, "c_result", SwigType_lstr(Getattr(n, "returntype"), "c_result"));
} }
if (!is_ignored) { if (!is_ignored) {
if (!gccgo_flag) { if (!gccgo_flag) {
Printv(f->code, " struct {\n", NULL); Printv(w->code, " struct {\n", NULL);
Printv(f->code, " void *go_val;\n", NULL); Printv(w->code, " void *go_val;\n", NULL);
p = parms; p = parms;
while (p) { while (p) {
@ -3385,21 +3386,21 @@ private:
} }
String *ln = Getattr(p, "lname"); String *ln = Getattr(p, "lname");
String *cg = gcCTypeForGoValue(p, Getattr(p, "type"), ln); String *cg = gcCTypeForGoValue(p, Getattr(p, "type"), ln);
Printv(f->code, " ", cg, ";\n", NULL); Printv(w->code, " ", cg, ";\n", NULL);
Delete(cg); Delete(cg);
p = Getattr(p, "tmap:directorin:next"); p = Getattr(p, "tmap:directorin:next");
} }
if (SwigType_type(result) != T_VOID) { if (SwigType_type(result) != T_VOID) {
Printv(f->code, " long : 0;\n", NULL); Printv(w->code, " long : 0;\n", NULL);
String *rname = NewString(Swig_cresult_name()); String *rname = NewString(Swig_cresult_name());
String *cg = gcCTypeForGoValue(n, result, rname); String *cg = gcCTypeForGoValue(n, result, rname);
Printv(f->code, " ", cg, ";\n", NULL); Printv(w->code, " ", cg, ";\n", NULL);
Delete(cg); Delete(cg);
Delete(rname); Delete(rname);
} }
Printv(f->code, " } swig_a;\n", NULL); Printv(w->code, " } swig_a;\n", NULL);
Printv(f->code, " swig_a.go_val = go_val;\n", NULL); Printv(w->code, " swig_a.go_val = go_val;\n", NULL);
p = parms; p = parms;
while (p) { while (p) {
@ -3418,12 +3419,12 @@ private:
Replaceall(tm, "$input", input); Replaceall(tm, "$input", input);
Replaceall(tm, "$owner", "0"); Replaceall(tm, "$owner", "0");
Delete(input); Delete(input);
Printv(f->code, "\t", tm, "\n", NULL); Printv(w->code, "\t", tm, "\n", NULL);
} }
p = Getattr(p, "tmap:directorin:next"); p = Getattr(p, "tmap:directorin:next");
} }
Printv(f->code, " crosscall2(", callback_wname, ", &swig_a, (int) sizeof swig_a);\n", NULL); Printv(w->code, " crosscall2(", callback_wname, ", &swig_a, (int) sizeof swig_a);\n", NULL);
if (SwigType_type(result) != T_VOID) { if (SwigType_type(result) != T_VOID) {
String *rname = NewString("c_result"); String *rname = NewString("c_result");
@ -3436,9 +3437,9 @@ private:
static const String *swig_a_result = NewStringf("swig_a.%s", Swig_cresult_name()); static const String *swig_a_result = NewStringf("swig_a.%s", Swig_cresult_name());
Replaceall(tm, "$input", swig_a_result); Replaceall(tm, "$input", swig_a_result);
Replaceall(tm, "$result", "c_result"); Replaceall(tm, "$result", "c_result");
Printv(f->code, " ", tm, "\n", NULL); Printv(w->code, " ", tm, "\n", NULL);
String *retstr = SwigType_rcaststr(Getattr(n, "returntype"), "c_result"); String *retstr = SwigType_rcaststr(Getattr(n, "returntype"), "c_result");
Printv(f->code, " return ", retstr, ";\n", NULL); Printv(w->code, " return ", retstr, ";\n", NULL);
Delete(retstr); Delete(retstr);
Delete(tm); Delete(tm);
} }
@ -3458,7 +3459,7 @@ private:
if (SwigType_type(result) != T_VOID) { if (SwigType_type(result) != T_VOID) {
String *r = NewString(Swig_cresult_name()); String *r = NewString(Swig_cresult_name());
String *tm = gccgoCTypeForGoValue(n, result, r); String *tm = gccgoCTypeForGoValue(n, result, r);
Wrapper_add_local(f, r, tm); Wrapper_add_local(w, r, tm);
Delete(tm); Delete(tm);
Delete(r); Delete(r);
} }
@ -3476,7 +3477,7 @@ private:
Setattr(p, "emit:input", pn); Setattr(p, "emit:input", pn);
String *tm = gccgoCTypeForGoValue(n, Getattr(p, "type"), pn); String *tm = gccgoCTypeForGoValue(n, Getattr(p, "type"), pn);
Wrapper_add_local(f, pn, tm); Wrapper_add_local(w, pn, tm);
Delete(tm); Delete(tm);
tm = Getattr(p, "tmap:directorin"); tm = Getattr(p, "tmap:directorin");
@ -3486,7 +3487,7 @@ private:
} else { } else {
Replaceall(tm, "$input", pn); Replaceall(tm, "$input", pn);
Replaceall(tm, "$owner", 0); Replaceall(tm, "$owner", 0);
Printv(f->code, " ", tm, "\n", NULL); Printv(w->code, " ", tm, "\n", NULL);
Printv(args, ", ", pn, NULL); Printv(args, ", ", pn, NULL);
} }
@ -3494,11 +3495,11 @@ private:
p = Getattr(p, "tmap:directorin:next"); p = Getattr(p, "tmap:directorin:next");
} }
Printv(f->code, " ", NULL); Printv(w->code, " ", NULL);
if (SwigType_type(result) != T_VOID) { if (SwigType_type(result) != T_VOID) {
Printv(f->code, Swig_cresult_name(), " = ", NULL); Printv(w->code, Swig_cresult_name(), " = ", NULL);
} }
Printv(f->code, callback_wname, "(go_val", args, ");\n", NULL); Printv(w->code, callback_wname, "(go_val", args, ");\n", NULL);
if (SwigType_type(result) != T_VOID) { if (SwigType_type(result) != T_VOID) {
String *rname = NewString("c_result"); String *rname = NewString("c_result");
@ -3510,9 +3511,9 @@ private:
} else { } else {
Replaceall(tm, "$input", Swig_cresult_name()); Replaceall(tm, "$input", Swig_cresult_name());
Replaceall(tm, "$result", "c_result"); Replaceall(tm, "$result", "c_result");
Printv(f->code, " ", tm, "\n", NULL); Printv(w->code, " ", tm, "\n", NULL);
String *retstr = SwigType_rcaststr(Getattr(n, "returntype"), "c_result"); String *retstr = SwigType_rcaststr(Getattr(n, "returntype"), "c_result");
Printv(f->code, " return ", retstr, ";\n", NULL); Printv(w->code, " return ", retstr, ";\n", NULL);
Delete(retstr); Delete(retstr);
Delete(tm); Delete(tm);
} }
@ -3527,7 +3528,7 @@ private:
if ((tm = Getattr(p, "tmap:directorargout"))) { if ((tm = Getattr(p, "tmap:directorargout"))) {
Replaceall(tm, "$result", "jresult"); Replaceall(tm, "$result", "jresult");
Replaceall(tm, "$input", Getattr(p, "emit:directorinput")); Replaceall(tm, "$input", Getattr(p, "emit:directorinput"));
Printv(f->code, tm, "\n", NIL); Printv(w->code, tm, "\n", NIL);
p = Getattr(p, "tmap:directorargout:next"); p = Getattr(p, "tmap:directorargout:next");
} else { } else {
p = nextSibling(p); p = nextSibling(p);
@ -3535,19 +3536,20 @@ private:
} }
} else { } else {
assert(is_pure_virtual); assert(is_pure_virtual);
Printv(f->code, " _swig_gopanic(\"call to pure virtual function ", Getattr(parent, "sym:name"), name, "\");\n", NULL); Printv(w->code, " _swig_gopanic(\"call to pure virtual function ", Getattr(parent, "sym:name"), name, "\");\n", NULL);
if (SwigType_type(result) != T_VOID) { if (SwigType_type(result) != T_VOID) {
String *retstr = SwigType_rcaststr(Getattr(n, "returntype"), "c_result"); String *retstr = SwigType_rcaststr(Getattr(n, "returntype"), "c_result");
Printv(f->code, " return ", retstr, ";\n", NULL); Printv(w->code, " return ", retstr, ";\n", NULL);
Delete(retstr); Delete(retstr);
} }
} }
Printv(f->code, "}", NULL); Printv(w->code, "}", NULL);
Wrapper_print(f, f_c_directors); Wrapper_print(w, f_c_directors);
Replaceall(w->code, "$symname", symname);
DelWrapper(f); DelWrapper(w);
} }
Delete(cn); Delete(cn);

3
Source/Modules/java.cxx
View file

@ -4048,7 +4048,7 @@ public:
Delete(extra_method_name); Delete(extra_method_name);
} }
/* emit code */ /* emit the director method */
if (status == SWIG_OK && output_director) { if (status == SWIG_OK && output_director) {
if (!is_void) { if (!is_void) {
Replaceall(w->code, "$null", qualified_return); Replaceall(w->code, "$null", qualified_return);
@ -4058,6 +4058,7 @@ public:
if (!GetFlag(n, "feature:ignore")) if (!GetFlag(n, "feature:ignore"))
Printv(imclass_directors, callback_def, callback_code, NIL); Printv(imclass_directors, callback_def, callback_code, NIL);
if (!Getattr(n, "defaultargs")) { if (!Getattr(n, "defaultargs")) {
Replaceall(w->code, "$symname", symname);
Wrapper_print(w, f_directors); Wrapper_print(w, f_directors);
Printv(f_directors_h, declaration, NIL); Printv(f_directors_h, declaration, NIL);
Printv(f_directors_h, inline_extra_method, NIL); Printv(f_directors_h, inline_extra_method, NIL);