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

Fix director operator pointer casts

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@9536 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2006-11-09 22:32:28 +00:00
commit 599d64e188
7 changed files with 83 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

24
SWIG/Source/Modules/csharp.cxx
View file

@ -3252,23 +3252,13 @@ public:
/* header declaration, start wrapper definition */ /* header declaration, start wrapper definition */
String *target; String *target;
SwigType *rtype = Getattr(n, "conversion_operator") ? 0 : type;
target = Swig_method_decl(decl, qualified_name, l, 0, 0); target = Swig_method_decl(rtype, decl, qualified_name, l, 0, 0);
String *rtype = SwigType_str(type, 0); Printf(w->def, "%s", target);
if (Getattr(n, "conversion_operator"))
Printf(w->def, "%s", target);
else
Printf(w->def, "%s %s", rtype, target);
Delete(qualified_name); Delete(qualified_name);
Delete(target); Delete(target);
target = Swig_method_decl(rtype, decl, name, l, 0, 1);
target = Swig_method_decl(decl, name, l, 0, 1); Printf(declaration, " virtual %s", target);
if (Getattr(n, "conversion_operator"))
Printf(declaration, " virtual %s", target);
else
Printf(declaration, " virtual %s %s", rtype, target);
Delete(rtype);
Delete(target); Delete(target);
// Get any Java exception classes in the throws typemap // Get any Java exception classes in the throws typemap
@ -3462,7 +3452,7 @@ public:
/* constructor */ /* constructor */
{ {
String *basetype = Getattr(parent, "classtype"); String *basetype = Getattr(parent, "classtype");
String *target = Swig_method_decl(decl, classname, parms, 0, 0); String *target = Swig_method_decl(0, decl, classname, parms, 0, 0);
String *call = Swig_csuperclass_call(0, basetype, superparms); String *call = Swig_csuperclass_call(0, basetype, superparms);
String *classtype = SwigType_namestr(Getattr(n, "name")); String *classtype = SwigType_namestr(Getattr(n, "name"));
@ -3477,7 +3467,7 @@ public:
/* constructor header */ /* constructor header */
{ {
String *target = Swig_method_decl(decl, classname, parms, 0, 1); String *target = Swig_method_decl(0, decl, classname, parms, 0, 1);
Printf(f_directors_h, " %s;\n", target); Printf(f_directors_h, " %s;\n", target);
Delete(target); Delete(target);
} }

81
SWIG/Source/Modules/directors.cxx
View file

@ -128,7 +128,7 @@ String *Swig_method_call(String_or_char *name, ParmList *parms) {
* *
*/ */
String *Swig_method_decl(SwigType *s, const String_or_char *id, List *args, int strip, int values) { String *Swig_method_decl(SwigType *returntype, SwigType *decl, const String_or_char *id, List *args, int strip, int values) {
String *result; String *result;
List *elements; List *elements;
String *element = 0, *nextelement; String *element = 0, *nextelement;
@ -143,7 +143,7 @@ String *Swig_method_decl(SwigType *s, const String_or_char *id, List *args, int
result = NewString(""); result = NewString("");
} }
elements = SwigType_split(s); elements = SwigType_split(decl);
nelements = Len(elements); nelements = Len(elements);
if (nelements > 0) { if (nelements > 0) {
element = Getitem(elements, 0); element = Getitem(elements, 0);
@ -172,31 +172,6 @@ String *Swig_method_decl(SwigType *s, const String_or_char *id, List *args, int
} }
Delete(q); Delete(q);
} }
} else if (SwigType_ispointer(element)) {
Insert(result, 0, "*");
if ((nextelement) && ((SwigType_isfunction(nextelement) || (SwigType_isarray(nextelement))))) {
Insert(result, 0, "(");
Append(result, ")");
}
} else if (SwigType_ismemberpointer(element)) {
String *q;
q = SwigType_parm(element);
Insert(result, 0, "::*");
Insert(result, 0, q);
if ((nextelement) && ((SwigType_isfunction(nextelement) || (SwigType_isarray(nextelement))))) {
Insert(result, 0, "(");
Append(result, ")");
}
Delete(q);
} else if (SwigType_isreference(element)) {
Insert(result, 0, "&");
} else if (SwigType_isarray(element)) {
DOH *size;
Append(result, "[");
size = SwigType_parm(element);
Append(result, size);
Append(result, "]");
Delete(size);
} else if (SwigType_isfunction(element)) { } else if (SwigType_isfunction(element)) {
Parm *parm; Parm *parm;
String *p; String *p;
@ -224,19 +199,48 @@ String *Swig_method_decl(SwigType *s, const String_or_char *id, List *args, int
Append(result, ", "); Append(result, ", ");
} }
Append(result, ")"); Append(result, ")");
} else { } else if (returntype) { // This check is intended for conversion operators to a pointer/reference which needs the pointer/reference ignoring in the declaration
if (Strcmp(element, "v(...)") == 0) { if (SwigType_ispointer(element)) {
Insert(result, 0, "..."); Insert(result, 0, "*");
if ((nextelement) && ((SwigType_isfunction(nextelement) || (SwigType_isarray(nextelement))))) {
Insert(result, 0, "(");
Append(result, ")");
}
} else if (SwigType_ismemberpointer(element)) {
String *q;
q = SwigType_parm(element);
Insert(result, 0, "::*");
Insert(result, 0, q);
if ((nextelement) && ((SwigType_isfunction(nextelement) || (SwigType_isarray(nextelement))))) {
Insert(result, 0, "(");
Append(result, ")");
}
Delete(q);
} else if (SwigType_isreference(element)) {
Insert(result, 0, "&");
} else if (SwigType_isarray(element)) {
DOH *size;
Append(result, "[");
size = SwigType_parm(element);
Append(result, size);
Append(result, "]");
Delete(size);
} else { } else {
String *bs = SwigType_namestr(element); if (Strcmp(element, "v(...)") == 0) {
Insert(result, 0, " "); Insert(result, 0, "...");
Insert(result, 0, bs); } else {
Delete(bs); String *bs = SwigType_namestr(element);
Insert(result, 0, " ");
Insert(result, 0, bs);
Delete(bs);
}
} }
} }
element = nextelement; element = nextelement;
} }
Delete(elements); Delete(elements);
if (is_const) { if (is_const) {
if (is_func) { if (is_func) {
Append(result, " "); Append(result, " ");
@ -245,6 +249,15 @@ String *Swig_method_decl(SwigType *s, const String_or_char *id, List *args, int
Insert(result, 0, "const "); Insert(result, 0, "const ");
} }
} }
Chop(result); Chop(result);
if (returntype) {
Insert(result, 0, " ");
String *rtype = SwigType_str(returntype, 0);
Insert(result, 0, rtype);
Delete(rtype);
}
return result; return result;
} }

24
SWIG/Source/Modules/java.cxx
View file

@ -3370,23 +3370,13 @@ public:
/* header declaration, start wrapper definition */ /* header declaration, start wrapper definition */
String *target; String *target;
SwigType *rtype = Getattr(n, "conversion_operator") ? 0 : type;
target = Swig_method_decl(decl, qualified_name, l, 0, 0); target = Swig_method_decl(rtype, decl, qualified_name, l, 0, 0);
String *rtype = SwigType_str(type, 0); Printf(w->def, "%s", target);
if (Getattr(n, "conversion_operator"))
Printf(w->def, "%s", target);
else
Printf(w->def, "%s %s", rtype, target);
Delete(qualified_name); Delete(qualified_name);
Delete(target); Delete(target);
target = Swig_method_decl(rtype, decl, name, l, 0, 1);
target = Swig_method_decl(decl, name, l, 0, 1); Printf(declaration, " virtual %s", target);
if (Getattr(n, "conversion_operator"))
Printf(declaration, " virtual %s", target);
else
Printf(declaration, " virtual %s %s", rtype, target);
Delete(rtype);
Delete(target); Delete(target);
// Get any Java exception classes in the throws typemap // Get any Java exception classes in the throws typemap
@ -3613,7 +3603,7 @@ public:
/* constructor */ /* constructor */
{ {
String *basetype = Getattr(parent, "classtype"); String *basetype = Getattr(parent, "classtype");
String *target = Swig_method_decl(decl, classname, parms, 0, 0); String *target = Swig_method_decl(0, decl, classname, parms, 0, 0);
String *call = Swig_csuperclass_call(0, basetype, superparms); String *call = Swig_csuperclass_call(0, basetype, superparms);
String *classtype = SwigType_namestr(Getattr(n, "name")); String *classtype = SwigType_namestr(Getattr(n, "name"));
@ -3627,7 +3617,7 @@ public:
/* constructor header */ /* constructor header */
{ {
String *target = Swig_method_decl(decl, classname, parms, 0, 1); String *target = Swig_method_decl(0, decl, classname, parms, 0, 1);
Printf(f_directors_h, " %s;\n", target); Printf(f_directors_h, " %s;\n", target);
Delete(target); Delete(target);
} }

21
SWIG/Source/Modules/ocaml.cxx
View file

@ -1440,20 +1440,14 @@ public:
String *target; String *target;
String *pclassname = NewStringf("SwigDirector_%s", classname); String *pclassname = NewStringf("SwigDirector_%s", classname);
String *qualified_name = NewStringf("%s::%s", pclassname, name); String *qualified_name = NewStringf("%s::%s", pclassname, name);
target = Swig_method_decl(decl, qualified_name, l, 0, 0); SwigType *rtype = Getattr(n, "conversion_operator") ? 0 : type;
String *rtype = SwigType_str(type, 0); target = Swig_method_decl(rtype, decl, qualified_name, l, 0, 0);
if (Getattr(n, "conversion_operator")) Printf(w->def, "%s {", target);
Printf(w->def, "%s {", target);
else
Printf(w->def, "%s %s {", rtype, target);
Delete(qualified_name); Delete(qualified_name);
Delete(target); Delete(target);
/* header declaration */ /* header declaration */
target = Swig_method_decl(decl, name, l, 0, 1); target = Swig_method_decl(rtype, decl, name, l, 0, 1);
if (Getattr(n, "conversion_operator")) Printf(declaration, " virtual %s;", target);
Printf(declaration, " virtual %s;", target);
else
Printf(declaration, " virtual %s %s;\n", rtype, target);
Delete(target); Delete(target);
/* declare method return value /* declare method return value
@ -1715,7 +1709,6 @@ public:
/* clean up */ /* clean up */
Delete(wrap_args); Delete(wrap_args);
Delete(rtype);
Delete(return_type); Delete(return_type);
Delete(pclassname); Delete(pclassname);
DelWrapper(w); DelWrapper(w);
@ -1751,7 +1744,7 @@ public:
Wrapper *w = NewWrapper(); Wrapper *w = NewWrapper();
String *call; String *call;
String *basetype = Getattr(parent, "classtype"); String *basetype = Getattr(parent, "classtype");
String *target = Swig_method_decl(decl, classname, parms, 0, 0); String *target = Swig_method_decl(0, decl, classname, parms, 0, 0);
call = Swig_csuperclass_call(0, basetype, superparms); call = Swig_csuperclass_call(0, basetype, superparms);
Printf(w->def, "%s::%s: %s, Swig::Director(self) { }", classname, target, call); Printf(w->def, "%s::%s: %s, Swig::Director(self) { }", classname, target, call);
Delete(target); Delete(target);
@ -1762,7 +1755,7 @@ public:
/* constructor header */ /* constructor header */
{ {
String *target = Swig_method_decl(decl, classname, parms, 0, 1); String *target = Swig_method_decl(0, decl, classname, parms, 0, 1);
Printf(f_directors_h, " %s;\n", target); Printf(f_directors_h, " %s;\n", target);
Delete(target); Delete(target);
} }

21
SWIG/Source/Modules/python.cxx
View file

@ -2362,7 +2362,7 @@ public:
Wrapper *w = NewWrapper(); Wrapper *w = NewWrapper();
String *call; String *call;
String *basetype = Getattr(parent, "classtype"); String *basetype = Getattr(parent, "classtype");
String *target = Swig_method_decl(decl, classname, parms, 0, 0); String *target = Swig_method_decl(0, decl, classname, parms, 0, 0);
call = Swig_csuperclass_call(0, basetype, superparms); call = Swig_csuperclass_call(0, basetype, superparms);
Printf(w->def, "%s::%s: %s, Swig::Director(self) { \n", classname, target, call); Printf(w->def, "%s::%s: %s, Swig::Director(self) { \n", classname, target, call);
Printf(w->def, " SWIG_DIRECTOR_RGTR((%s *)this, this); \n", basetype); Printf(w->def, " SWIG_DIRECTOR_RGTR((%s *)this, this); \n", basetype);
@ -2375,7 +2375,7 @@ public:
/* constructor header */ /* constructor header */
{ {
String *target = Swig_method_decl(decl, classname, parms, 0, 1); String *target = Swig_method_decl(0, decl, classname, parms, 0, 1);
Printf(f_directors_h, " %s;\n", target); Printf(f_directors_h, " %s;\n", target);
Delete(target); Delete(target);
} }
@ -3305,20 +3305,14 @@ int PYTHON::classDirectorMethod(Node *n, Node *parent, String *super) {
String *target; String *target;
String *pclassname = NewStringf("SwigDirector_%s", classname); String *pclassname = NewStringf("SwigDirector_%s", classname);
String *qualified_name = NewStringf("%s::%s", pclassname, name); String *qualified_name = NewStringf("%s::%s", pclassname, name);
target = Swig_method_decl(decl, qualified_name, l, 0, 0); SwigType *rtype = Getattr(n, "conversion_operator") ? 0 : type;
String *rtype = SwigType_str(type, 0); target = Swig_method_decl(rtype, decl, qualified_name, l, 0, 0);
if (Getattr(n, "conversion_operator")) Printf(w->def, "%s", target);
Printf(w->def, "%s", target);
else
Printf(w->def, "%s %s", rtype, target);
Delete(qualified_name); Delete(qualified_name);
Delete(target); Delete(target);
/* header declaration */ /* header declaration */
target = Swig_method_decl(decl, name, l, 0, 1); target = Swig_method_decl(rtype, decl, name, l, 0, 1);
if (Getattr(n, "conversion_operator")) Printf(declaration, " virtual %s", target);
Printf(declaration, " virtual %s", target);
else
Printf(declaration, " virtual %s %s", rtype, target);
Delete(target); Delete(target);
// Get any exception classes in the throws typemap // Get any exception classes in the throws typemap
@ -3737,7 +3731,6 @@ int PYTHON::classDirectorMethod(Node *n, Node *parent, String *super) {
/* clean up */ /* clean up */
Delete(wrap_args); Delete(wrap_args);
Delete(rtype);
Delete(return_type); Delete(return_type);
Delete(pclassname); Delete(pclassname);
DelWrapper(w); DelWrapper(w);

21
SWIG/Source/Modules/ruby.cxx
View file

@ -2073,7 +2073,7 @@ public:
Wrapper *w = NewWrapper(); Wrapper *w = NewWrapper();
String *call; String *call;
String *basetype = Getattr(parent, "classtype"); String *basetype = Getattr(parent, "classtype");
String *target = Swig_method_decl(decl, classname, parms, 0, 0); String *target = Swig_method_decl(0, decl, classname, parms, 0, 0);
call = Swig_csuperclass_call(0, basetype, superparms); call = Swig_csuperclass_call(0, basetype, superparms);
Printf(w->def, "%s::%s: %s, Swig::Director(self) { }", classname, target, call); Printf(w->def, "%s::%s: %s, Swig::Director(self) { }", classname, target, call);
Delete(target); Delete(target);
@ -2084,7 +2084,7 @@ public:
/* constructor header */ /* constructor header */
{ {
String *target = Swig_method_decl(decl, classname, parms, 0, 1); String *target = Swig_method_decl(0, decl, classname, parms, 0, 1);
Printf(f_directors_h, " %s;\n", target); Printf(f_directors_h, " %s;\n", target);
Delete(target); Delete(target);
} }
@ -2264,20 +2264,14 @@ public:
String *target; String *target;
String *pclassname = NewStringf("SwigDirector_%s", classname); String *pclassname = NewStringf("SwigDirector_%s", classname);
String *qualified_name = NewStringf("%s::%s", pclassname, name); String *qualified_name = NewStringf("%s::%s", pclassname, name);
target = Swig_method_decl(decl, qualified_name, l, 0, 0); SwigType *rtype = Getattr(n, "conversion_operator") ? 0 : type;
String *rtype = SwigType_str(type, 0); target = Swig_method_decl(rtype, decl, qualified_name, l, 0, 0);
if (Getattr(n, "conversion_operator")) Printf(w->def, "%s", target);
Printf(w->def, "%s", target);
else
Printf(w->def, "%s %s", rtype, target);
Delete(qualified_name); Delete(qualified_name);
Delete(target); Delete(target);
/* header declaration */ /* header declaration */
target = Swig_method_decl(decl, name, l, 0, 1); target = Swig_method_decl(rtype, decl, name, l, 0, 1);
if (Getattr(n, "conversion_operator")) Printf(declaration, " virtual %s", target);
Printf(declaration, " virtual %s", target);
else
Printf(declaration, " virtual %s %s", rtype, target);
Delete(target); Delete(target);
// Get any exception classes in the throws typemap // Get any exception classes in the throws typemap
@ -2579,7 +2573,6 @@ public:
/* clean up */ /* clean up */
Delete(wrap_args); Delete(wrap_args);
Delete(rtype);
Delete(return_type); Delete(return_type);
Delete(pclassname); Delete(pclassname);
DelWrapper(w); DelWrapper(w);

2
SWIG/Source/Modules/swigmod.h
View file

@ -321,7 +321,7 @@ String *Swig_csuperclass_call(String *base, String *method, ParmList *l);
String *Swig_class_declaration(Node *n, String *name); String *Swig_class_declaration(Node *n, String *name);
String *Swig_class_name(Node *n); String *Swig_class_name(Node *n);
String *Swig_method_call(String_or_char *name, ParmList *parms); String *Swig_method_call(String_or_char *name, ParmList *parms);
String *Swig_method_decl(SwigType *s, const String_or_char *id, List *args, int strip, int values); String *Swig_method_decl(SwigType *rtype, SwigType *decl, const String_or_char *id, List *args, int strip, int values);
String *Swig_director_declaration(Node *n); String *Swig_director_declaration(Node *n);
/* directors.cxx end */ /* directors.cxx end */