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

Clean up local variable name that store the director class's name to prevent confusion with the class name.

Browse source
This commit is contained in:
Brant K. Kyser 2013-01-08 21:38:57 -06:00
commit e1a59ae2c7
3 changed files with 35 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Source/Modules/csharp.cxx
View file

@ -3890,7 +3890,7 @@ public:
Node *parent = parentNode(n); Node *parent = parentNode(n);
String *decl = Getattr(n, "decl"); String *decl = Getattr(n, "decl");
String *supername = Swig_class_name(parent); String *supername = Swig_class_name(parent);
String *classname = directorClassName(parent); String *dirclassname = directorClassName(parent);
String *sub = NewString(""); String *sub = NewString("");
Parm *p; Parm *p;
ParmList *superparms = Getattr(n, "parms"); ParmList *superparms = Getattr(n, "parms");
@ -3914,11 +3914,11 @@ public:
/* constructor */ /* constructor */
{ {
String *basetype = Getattr(parent, "classtype"); String *basetype = Getattr(parent, "classtype");
String *target = Swig_method_decl(0, decl, classname, parms, 0, 0); String *target = Swig_method_decl(0, decl, dirclassname, 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"));
Printf(f_directors, "%s::%s : %s, %s {\n", classname, target, call, Getattr(parent, "director:ctor")); Printf(f_directors, "%s::%s : %s, %s {\n", dirclassname, target, call, Getattr(parent, "director:ctor"));
Printf(f_directors, " swig_init_callbacks();\n"); Printf(f_directors, " swig_init_callbacks();\n");
Printf(f_directors, "}\n\n"); Printf(f_directors, "}\n\n");
@ -3929,7 +3929,7 @@ public:
/* constructor header */ /* constructor header */
{ {
String *target = Swig_method_decl(0, decl, classname, parms, 0, 1); String *target = Swig_method_decl(0, decl, dirclassname, parms, 0, 1);
Printf(f_directors_h, " %s;\n", target); Printf(f_directors_h, " %s;\n", target);
Delete(target); Delete(target);
} }
@ -3938,6 +3938,7 @@ public:
Delete(sub); Delete(sub);
Delete(supername); Delete(supername);
Delete(parms); Delete(parms);
Delete(dirclassname);
return Language::classDirectorConstructor(n); return Language::classDirectorConstructor(n);
} }
@ -3946,18 +3947,18 @@ public:
* ------------------------------------------------------------ */ * ------------------------------------------------------------ */
int classDirectorDefaultConstructor(Node *n) { int classDirectorDefaultConstructor(Node *n) {
String *classname = directorClassName(n); String *dirclassname = directorClassName(n);
String *classtype = SwigType_namestr(Getattr(n, "name")); String *classtype = SwigType_namestr(Getattr(n, "name"));
Wrapper *w = NewWrapper(); Wrapper *w = NewWrapper();
Printf(w->def, "%s::%s() : %s {", classname, classname, Getattr(n, "director:ctor")); Printf(w->def, "%s::%s() : %s {", dirclassname, dirclassname, Getattr(n, "director:ctor"));
Printf(w->code, "}\n"); Printf(w->code, "}\n");
Wrapper_print(w, f_directors); Wrapper_print(w, f_directors);
Printf(f_directors_h, " %s();\n", classname); Printf(f_directors_h, " %s();\n", dirclassname);
DelWrapper(w); DelWrapper(w);
Delete(classtype); Delete(classtype);
Delete(classname); Delete(dirclassname);
return Language::classDirectorDefaultConstructor(n); return Language::classDirectorDefaultConstructor(n);
} }
@ -3998,15 +3999,15 @@ public:
int classDirectorDestructor(Node *n) { int classDirectorDestructor(Node *n) {
Node *current_class = getCurrentClass(); Node *current_class = getCurrentClass();
String *classname = directorClassName(current_class); String *dirclassname = directorClassName(current_class);
Wrapper *w = NewWrapper(); Wrapper *w = NewWrapper();
if (Getattr(n, "throw")) { if (Getattr(n, "throw")) {
Printf(f_directors_h, " virtual ~%s() throw ();\n", classname); Printf(f_directors_h, " virtual ~%s() throw ();\n", dirclassname);
Printf(w->def, "%s::~%s() throw () {\n", classname, classname); Printf(w->def, "%s::~%s() throw () {\n", dirclassname, dirclassname);
} else { } else {
Printf(f_directors_h, " virtual ~%s();\n", classname); Printf(f_directors_h, " virtual ~%s();\n", dirclassname);
Printf(w->def, "%s::~%s() {\n", classname, classname); Printf(w->def, "%s::~%s() {\n", dirclassname, dirclassname);
} }
Printv(w->code, "}\n", NIL); Printv(w->code, "}\n", NIL);
@ -4014,7 +4015,7 @@ public:
Wrapper_print(w, f_directors); Wrapper_print(w, f_directors);
DelWrapper(w); DelWrapper(w);
Delete(classname); Delete(dirclassname);
return SWIG_OK; return SWIG_OK;
} }

29
Source/Modules/d.cxx
View file

@ -2401,7 +2401,7 @@ public:
Node *parent = parentNode(n); Node *parent = parentNode(n);
String *decl = Getattr(n, "decl");; String *decl = Getattr(n, "decl");;
String *supername = Swig_class_name(parent); String *supername = Swig_class_name(parent);
String *classname = directorClassName(parent); String *dirclassname = directorClassName(parent);
String *sub = NewString(""); String *sub = NewString("");
Parm *p; Parm *p;
ParmList *superparms = Getattr(n, "parms"); ParmList *superparms = Getattr(n, "parms");
@ -2425,11 +2425,11 @@ public:
/* constructor */ /* constructor */
{ {
String *basetype = Getattr(parent, "classtype"); String *basetype = Getattr(parent, "classtype");
String *target = Swig_method_decl(0, decl, classname, parms, 0, 0); String *target = Swig_method_decl(0, decl, dirclassname, 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"));
Printf(f_directors, "%s::%s : %s, %s {\n", classname, target, call, Getattr(parent, "director:ctor")); Printf(f_directors, "%s::%s : %s, %s {\n", dirclassname, target, call, Getattr(parent, "director:ctor"));
Printf(f_directors, " swig_init_callbacks();\n"); Printf(f_directors, " swig_init_callbacks();\n");
Printf(f_directors, "}\n\n"); Printf(f_directors, "}\n\n");
@ -2440,7 +2440,7 @@ public:
/* constructor header */ /* constructor header */
{ {
String *target = Swig_method_decl(0, decl, classname, parms, 0, 1); String *target = Swig_method_decl(0, decl, dirclassname, parms, 0, 1);
Printf(f_directors_h, " %s;\n", target); Printf(f_directors_h, " %s;\n", target);
Delete(target); Delete(target);
} }
@ -2449,6 +2449,7 @@ public:
Delete(sub); Delete(sub);
Delete(supername); Delete(supername);
Delete(parms); Delete(parms);
Delete(dirclassname);
return Language::classDirectorConstructor(n); return Language::classDirectorConstructor(n);
} }
@ -2456,18 +2457,18 @@ public:
* D::classDirectorDefaultConstructor() * D::classDirectorDefaultConstructor()
* --------------------------------------------------------------------------- */ * --------------------------------------------------------------------------- */
virtual int classDirectorDefaultConstructor(Node *n) { virtual int classDirectorDefaultConstructor(Node *n) {
String *classname = directorClassName(n); String *dirclassname = directorClassName(n);
String *classtype = SwigType_namestr(Getattr(n, "name")); String *classtype = SwigType_namestr(Getattr(n, "name"));
Wrapper *w = NewWrapper(); Wrapper *w = NewWrapper();
Printf(w->def, "%s::%s() : %s {", classname, classname, Getattr(n, "director:ctor")); Printf(w->def, "%s::%s() : %s {", dirclassname, dirclassname, Getattr(n, "director:ctor"));
Printf(w->code, "}\n"); Printf(w->code, "}\n");
Wrapper_print(w, f_directors); Wrapper_print(w, f_directors);
Printf(f_directors_h, " %s();\n", classname); Printf(f_directors_h, " %s();\n", dirclassname);
DelWrapper(w); DelWrapper(w);
Delete(classtype); Delete(classtype);
Delete(classname); Delete(dirclassname);
return Language::classDirectorDefaultConstructor(n); return Language::classDirectorDefaultConstructor(n);
} }
@ -2476,15 +2477,15 @@ public:
* --------------------------------------------------------------------------- */ * --------------------------------------------------------------------------- */
virtual int classDirectorDestructor(Node *n) { virtual int classDirectorDestructor(Node *n) {
Node *current_class = getCurrentClass(); Node *current_class = getCurrentClass();
String *classname = directorClassName(current_class); String *dirclassname = directorClassName(current_class);
Wrapper *w = NewWrapper(); Wrapper *w = NewWrapper();
if (Getattr(n, "throw")) { if (Getattr(n, "throw")) {
Printf(f_directors_h, " virtual ~%s() throw ();\n", classname); Printf(f_directors_h, " virtual ~%s() throw ();\n", dirclassname);
Printf(w->def, "%s::~%s() throw () {\n", classname, classname); Printf(w->def, "%s::~%s() throw () {\n", dirclassname, dirclassname);
} else { } else {
Printf(f_directors_h, " virtual ~%s();\n", classname); Printf(f_directors_h, " virtual ~%s();\n", dirclassname);
Printf(w->def, "%s::~%s() {\n", classname, classname); Printf(w->def, "%s::~%s() {\n", dirclassname, dirclassname);
} }
Printv(w->code, "}\n", NIL); Printv(w->code, "}\n", NIL);
@ -2492,7 +2493,7 @@ public:
Wrapper_print(w, f_directors); Wrapper_print(w, f_directors);
DelWrapper(w); DelWrapper(w);
Delete(classname); Delete(dirclassname);
return SWIG_OK; return SWIG_OK;
} }

9
Source/Modules/java.cxx
View file

@ -4099,7 +4099,7 @@ public:
Node *parent = parentNode(n); Node *parent = parentNode(n);
String *decl = Getattr(n, "decl"); String *decl = Getattr(n, "decl");
String *supername = Swig_class_name(parent); String *supername = Swig_class_name(parent);
String *classname = directorClassName(parent); String *dirclassname = directorClassName(parent);
String *sub = NewString(""); String *sub = NewString("");
Parm *p; Parm *p;
ParmList *superparms = Getattr(n, "parms"); ParmList *superparms = Getattr(n, "parms");
@ -4131,11 +4131,11 @@ public:
/* constructor */ /* constructor */
{ {
String *basetype = Getattr(parent, "classtype"); String *basetype = Getattr(parent, "classtype");
String *target = Swig_method_decl(0, decl, classname, parms, 0, 0); String *target = Swig_method_decl(0, decl, dirclassname, 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"));
Printf(f_directors, "%s::%s : %s, %s {\n", classname, target, call, Getattr(parent, "director:ctor")); Printf(f_directors, "%s::%s : %s, %s {\n", dirclassname, target, call, Getattr(parent, "director:ctor"));
Printf(f_directors, "}\n\n"); Printf(f_directors, "}\n\n");
Delete(classtype); Delete(classtype);
@ -4145,7 +4145,7 @@ public:
/* constructor header */ /* constructor header */
{ {
String *target = Swig_method_decl(0, decl, classname, parms, 0, 1); String *target = Swig_method_decl(0, decl, dirclassname, parms, 0, 1);
Printf(f_directors_h, " %s;\n", target); Printf(f_directors_h, " %s;\n", target);
Delete(target); Delete(target);
} }
@ -4155,6 +4155,7 @@ public:
Delete(supername); Delete(supername);
Delete(jenv_type); Delete(jenv_type);
Delete(parms); Delete(parms);
Delete(dirclassname);
return Language::classDirectorConstructor(n); return Language::classDirectorConstructor(n);
} }