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

Director code mods:

Browse source 
- Compliance with ISO/IEC 14882:1998(E) 17.4.3.1.2 -> eg double underscores removed
- Potential member variable and method name clashes remove by preceding with 'swig'
- consistent use of C++ booleans for the swig_disown flag across and within the modules that use this it in director code.


git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@5140 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2003-09-22 22:57:16 +00:00
commit 89b91e44f0
5 changed files with 88 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

85
Source/Modules/java.cxx
View file

@ -348,8 +348,8 @@ class JAVA : public Language {
/* Emit initial director header and director code: */
if (directorsEnabled()) {
Swig_banner(f_directors_h);
Printf(f_directors_h, "#ifndef __%s_WRAP_H__\n", module);
Printf(f_directors_h, "#define __%s_WRAP_H__\n\n", module);
Printf(f_directors_h, "#ifndef SWIG_%s_WRAP_H_\n", module);
Printf(f_directors_h, "#define SWIG_%s_WRAP_H_\n\n", module);
Printf(f_directors_h, "class Swig::Director;\n\n");
Printf(f_directors, "\n\n");
@ -538,7 +538,7 @@ class JAVA : public Language {
Dump(f_directors_h, f_runtime_h);
Printf(f_runtime_h, "\n");
Printf(f_runtime_h, "#endif /* __%s_WRAP_H__ */\n", module);
Printf(f_runtime_h, "#endif\n");
}
Delete(swig_types_hash); swig_types_hash = NULL;
@ -711,7 +711,7 @@ class JAVA : public Language {
bool recursive_upcall = false;
bool feature_extend = !Cmp(Getattr(n, "feature:extend"), "1");
String *director_class = NULL;
String *director_uargs = NewString("director->__get_self()");
String *director_uargs = NewString("director->swig_get_self()");
String *dirimclass_meth = NewStringf("__DIRECTOR__%s", overloaded_name);
UpcallData *udata = NULL;
String *class_methodidx = NULL;
@ -913,7 +913,7 @@ class JAVA : public Language {
if (director_method && i == 0) {
Printf(f->code, "director = dynamic_cast<%s *>(arg1);\n", director_class);
Printf(f->code, "if (director == NULL || !director->__overrides(%s)) {\n", class_methodidx);
Printf(f->code, "if (director == NULL || !director->swig_overrides(%s)) {\n", class_methodidx);
}
Delete(im_param_type);
@ -1047,8 +1047,8 @@ class JAVA : public Language {
if (upcall_method != NULL) {
if (!recursive_upcall) {
Printf(f->code, " if (!director->__get_ricochet(%s)) {\n", class_methodidx);
Printf(f->code, " director->__set_ricochet(%s);\n", class_methodidx);
Printf(f->code, " if (!director->swig_get_ricochet(%s)) {\n", class_methodidx);
Printf(f->code, " director->swig_set_ricochet(%s);\n", class_methodidx);
}
if (!is_void_return)
@ -1059,7 +1059,7 @@ class JAVA : public Language {
upcall_method, imclass_methodidx, director_uargs);
if (!recursive_upcall)
Printf(f->code, " director->__clear_ricochet(%s);\n", class_methodidx);
Printf(f->code, " director->swig_clear_ricochet(%s);\n", class_methodidx);
Printf(f->code, "if (jenv->ExceptionOccurred()) return $null;\n");
@ -1510,7 +1510,7 @@ class JAVA : public Language {
Printf(proxy_class_def, " private final native static void __director_connect(%s self, long cptr);\n\n",
proxy_class_name);
Printf(proxy_class_def, " protected void __director_disconnect()\n");
Printf(proxy_class_def, " protected void swig_director_disconnect()\n");
Printf(proxy_class_def, " {\n");
Printf(proxy_class_def, " swigCPtr = 0;\n");
Printf(proxy_class_def, " swigCMemOwn = false;\n");
@ -1935,7 +1935,7 @@ class JAVA : public Language {
Printf(conn_wrap->code, " __DIRECTOR__%s *director = dynamic_cast<__DIRECTOR__%s *>(obj);\n",
Getattr(n, "sym:name"), Getattr(n, "sym:name"));
Printf(conn_wrap->code, " if (director) {\n");
Printf(conn_wrap->code, " director->__connect_director(jenv, jself, jenv->GetObjectClass(jself));\n");
Printf(conn_wrap->code, " director->swig_connect_director(jenv, jself, jenv->GetObjectClass(jself));\n");
Printf(conn_wrap->code, " }\n");
Printf(conn_wrap->code, "}\n");
@ -2601,7 +2601,7 @@ class JAVA : public Language {
String *jniret_desc = NewString("");
String *classret_desc = NewString("");
String *jniret_type = NULL;
String *jupcall_args = NewString("__get_self()");
String *jupcall_args = NewString("swig_get_self()");
String *imclass_dmethod;
Wrapper *imw = NewWrapper();
String *imcall_args = NewString("");
@ -2772,8 +2772,8 @@ class JAVA : public Language {
/* Preamble code */
Printf(w->code, "jenv = __acquire_jenv();\n");
Printf(w->code, "if (!__override[%d]) {\n", classmeth_off);
Printf(w->code, "jenv = swig_acquire_jenv();\n");
Printf(w->code, "if (!swig_override[%d]) {\n", classmeth_off);
if (!pure_virtual) {
if (is_void) {
@ -2824,9 +2824,9 @@ class JAVA : public Language {
if (!recursive_upcall) {
if (!is_const)
Printf(w->code, "if (!__get_ricochet(%d)) {\n", classmeth_off);
Printf(w->code, "if (!swig_get_ricochet(%d)) {\n", classmeth_off);
else
Printf(w->code, "if (!const_cast<%s *>(this)->__get_ricochet(%d)) {\n",
Printf(w->code, "if (!const_cast<%s *>(this)->swig_get_ricochet(%d)) {\n",
dirclassname, classmeth_off);
}
@ -3007,9 +3007,9 @@ class JAVA : public Language {
if (!recursive_upcall) {
if (!is_const)
Printf(w->code, " __set_ricochet(%d);\n", classmeth_off);
Printf(w->code, " swig_set_ricochet(%d);\n", classmeth_off);
else
Printf(w->code, " const_cast<%s *>(this)->__set_ricochet(%d);\n",
Printf(w->code, " const_cast<%s *>(this)->swig_set_ricochet(%d);\n",
dirclassname, classmeth_off);
}
@ -3023,9 +3023,9 @@ class JAVA : public Language {
if (!recursive_upcall) {
if (!is_const)
Printf(w->code, "__clear_ricochet(%d);\n", classmeth_off);
Printf(w->code, "swig_clear_ricochet(%d);\n", classmeth_off);
else
Printf(w->code, " const_cast<%s *>(this)->__clear_ricochet(%d);\n",
Printf(w->code, " const_cast<%s *>(this)->swig_clear_ricochet(%d);\n",
dirclassname, classmeth_off);
}
@ -3158,7 +3158,6 @@ class JAVA : public Language {
String *call = Swig_csuperclass_call(0, basetype, superparms);
Printf(w->def, "%s::%s: %s, Swig::Director(jenv) {", classname, target, call);
Printf(w->code, "/* NOP */\n");
Printf(w->code, "}\n");
Wrapper_print(w, f_directors);
@ -3191,7 +3190,7 @@ class JAVA : public Language {
classname = Swig_class_name(n);
{
Wrapper *w = NewWrapper();
Printf(w->def, "__DIRECTOR__%s::__DIRECTOR__%s(JNIEnv *jenv): Swig::Director(jenv) {",
Printf(w->def, "__DIRECTOR__%s::__DIRECTOR__%s(JNIEnv *jenv) : Swig::Director(jenv) {",
classname, classname);
Printf(w->code, "}\n");
Wrapper_print(w, f_directors);
@ -3223,28 +3222,30 @@ class JAVA : public Language {
Printf(f_directors_h, "%s\n", declaration);
Printf(f_directors_h, "\npublic:\n");
Printf(f_directors_h, " virtual ~%s();\n", director_classname);
Printf(f_directors_h, " void __connect_director(JNIEnv *, jobject, jclass);\n");
Printf(f_directors_h, " inline bool __get_ricochet(int n)\n");
Printf(f_directors_h, " {\n");
Printf(f_directors_h, " bool __r = __ricochet[n];\n");
Printf(f_directors_h, " __ricochet[n] = false;\n");
Printf(f_directors_h, " return __r;\n");
Printf(f_directors_h, " void swig_connect_director(JNIEnv *jenv, jobject jself, jclass jcls);\n");
Printf(f_directors_h, " bool swig_get_ricochet(int n) {\n");
Printf(f_directors_h, " bool ric = swig_ricochet[n];\n");
Printf(f_directors_h, " swig_ricochet[n] = false;\n");
Printf(f_directors_h, " return ric;\n");
Printf(f_directors_h, " }\n");
Printf(f_directors_h, " void swig_set_ricochet(int n) {\n");
Printf(f_directors_h, " swig_ricochet[n] = true;\n");
Printf(f_directors_h, " }\n");
Printf(f_directors_h, " void swig_clear_ricochet(int n) {\n");
Printf(f_directors_h, " swig_ricochet[n] = false;\n");
Printf(f_directors_h, " }\n");
Printf(f_directors_h, " bool swig_overrides(int n) {\n");
Printf(f_directors_h, " return swig_override[n];\n");
Printf(f_directors_h, " }\n");
Printf(f_directors_h, " inline void __set_ricochet(int n)\n");
Printf(f_directors_h, " { __ricochet[n] = true; }\n");
Printf(f_directors_h, " inline void __clear_ricochet(int n)\n");
Printf(f_directors_h, " { __ricochet[n] = false; }\n");
Printf(f_directors_h, " inline bool __overrides(int n)\n");
Printf(f_directors_h, " { return __override[n]; }\n");
Delete(declaration);
Printf(f_directors, "%s::~%s() {\n", director_classname, director_classname);
Printf(f_directors, " jfieldID swigCPtr, swigCMemOwn;\n");
Printf(f_directors, " JNIEnv *jenv;\n");
Printf(f_directors, " jobject self = __get_self();\n");
Printf(f_directors, " jobject self = swig_get_self();\n");
Printf(f_directors, " jclass jcls;\n");
Printf(f_directors, " jenv = __acquire_jenv();\n");
Printf(f_directors, " jenv = swig_acquire_jenv();\n");
Printf(f_directors, " jcls = jenv->GetObjectClass(self);\n");
Printf(f_directors, " swigCPtr = jenv->GetFieldID(jcls, \"swigCPtr\", \"J\");\n");
Printf(f_directors, " swigCMemOwn = jenv->GetFieldID(jcls, \"swigCMemOwn\", \"Z\");\n");
@ -3277,7 +3278,7 @@ class JAVA : public Language {
internal_classname = NewStringf("%s", classname);
Wrapper_add_localv(w, "baseclass", "static jclass baseclass", " = 0", NIL);
Printf(w->def, "void %s::__connect_director(JNIEnv *jenv, jobject jself, jclass jcls) {", director_classname);
Printf(w->def, "void %s::swig_connect_director(JNIEnv *jenv, jobject jself, jclass jcls) {", director_classname);
if (first_class_dmethod != curr_class_dmethod) {
Printf(w->def, "static struct {\n");
@ -3300,7 +3301,7 @@ class JAVA : public Language {
Wrapper_add_local(w, "derived", "bool derived");
Printf(w->code, "__set_self(jenv, jself);\n");
Printf(w->code, "swig_set_self(jenv, jself);\n");
Printf(w->code, "if (baseclass == NULL) {\n");
Printf(w->code, "baseclass = jenv->FindClass(\"%s\");\n", internal_classname);
Printf(w->code, "if (baseclass == NULL) return;\n");
@ -3313,20 +3314,20 @@ class JAVA : public Language {
/* Emit the code to look up the class's methods, initialize the override and ricochet arrays */
Printf(f_directors_h, "protected:\n");
Printf(f_directors_h, " bool __ricochet[%d];\n", n_methods);
Printf(f_directors_h, " bool __override[%d];\n", n_methods);
Printf(f_directors_h, " bool swig_ricochet[%d];\n", n_methods);
Printf(f_directors_h, " bool swig_override[%d];\n", n_methods);
Printf(w->code, "for (int i = 0; i < %d; ++i) {\n", n_methods);
Printf(w->code, " __ricochet[i] = false;\n");
Printf(w->code, " swig_ricochet[i] = false;\n");
Printf(w->code, " if (methods[i].base_methid == NULL)\n");
Printf(w->code, " methods[i].base_methid = jenv->GetMethodID(baseclass, methods[i].mname, methods[i].mdesc);\n");
Printf(w->code, " if (derived) {\n");
Printf(w->code, " jmethodID methid;\n");
Printf(w->code, " jenv->ExceptionClear();\n");
Printf(w->code, " methid = jenv->GetMethodID(jcls, methods[i].mname, methods[i].mdesc);\n");
Printf(w->code, " __override[i] = (jenv->IsSameObject((jobject) methid, (jobject) methods[i].base_methid) ? false : true);\n");
Printf(w->code, " swig_override[i] = (jenv->IsSameObject((jobject) methid, (jobject) methods[i].base_methid) ? false : true);\n");
Printf(w->code, " } else\n");
Printf(w->code, " __override[i] = false;\n");
Printf(w->code, " swig_override[i] = false;\n");
Printf(w->code, "}\n");
}

2
Source/Modules/lang.cxx
View file

@ -1454,7 +1454,7 @@ int Language::classDirectorDisown(Node *n) {
String *action = NewString("");
Printv(action, "{\n",
"Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);\n",
"if (director) director->__disown();\n",
"if (director) director->swig_disown();\n",
"}\n",
NULL);
Setattr(disown, "wrap:action", action);

22
Source/Modules/ocaml.cxx
View file

@ -337,7 +337,7 @@ public:
/* Swig_director_declaration()
*
* Generate the full director class declaration, complete with base classes.
* e.g. "class __DIRECTOR__myclass: public myclass, public Swig::Director {"
* e.g. "class __DIRECTOR__myclass : public myclass, public Swig::Director {"
*
*/
@ -346,7 +346,7 @@ public:
String *directorname = NewStringf("__DIRECTOR__%s", classname);
String *base = Getattr(n, "classtype");
String *declaration = Swig_class_declaration(n, directorname);
Printf(declaration, ": public %s, public Swig::Director {\n", base);
Printf(declaration, " : public %s, public Swig::Director {\n", base);
Delete(classname);
Delete(directorname);
return declaration;
@ -850,7 +850,7 @@ public:
if (/*directorbase &&*/ hasVirtual && !constructor && isVirtual) {
Wrapper_add_local(f, "director", "Swig::Director *director = 0");
Printf(f->code, "director = dynamic_cast<Swig::Director *>(arg1);\n");
Printf(f->code, "if (director && (director->__get_self()==argv[0])) director->__set_up();\n");
Printf(f->code, "if (director && (director->swig_get_self()==argv[0])) director->swig_set_up();\n");
}
}
}
@ -1633,7 +1633,7 @@ public:
Printf(wrap_args, "if (!%s) {\n", director);
Printf(wrap_args, "%s = SWIG_NewPointerObj(%s, SWIGTYPE%s, 0);\n", source, nonconst, mangle);
Printf(wrap_args, "} else {\n");
Printf(wrap_args, "%s = %s->__get_self();\n", source, director);
Printf(wrap_args, "%s = %s->swig_get_self();\n", source, director);
Printf(wrap_args, "}\n");
Delete(director);
Printv(arglist, source, NIL);
@ -1669,7 +1669,7 @@ public:
Printf(w->code,"args = Val_unit;\n");
/* direct call to superclass if _up is set */
Printf(w->code, "if (__get_up()) {\n");
Printf(w->code, "if (swig_get_up()) {\n");
Printf(w->code, "CAMLreturn(%s);\n", Swig_method_call(super,l));
Printf(w->code, "}\n");
@ -1685,7 +1685,7 @@ public:
Printf(w->code,
"swig_result = "
"callback2(callback(*caml_named_value(\"swig_runmethod\"),"
"__get_self()),copy_string(\"%s\"),args);\n",
"swig_get_self()),copy_string(\"%s\"),args);\n",
Getattr(n,"name"));
/* exception handling */
tm = Swig_typemap_lookup_new("director:except", n, "result", 0);
@ -1802,7 +1802,7 @@ public:
String *classname = NewString("");
Printf(classname, "__DIRECTOR__%s", supername);
/* insert self and __disown parameters */
/* insert self and disown parameters */
Parm *p, *ip;
ParmList *superparms = CopyParmList(Getattr(n, "parms"));
ParmList *parms_in_declaration = CopyParmList(superparms);
@ -1820,7 +1820,7 @@ public:
for (ip = parms_in_declaration; nextSibling(ip); )
ip = nextSibling(ip);
p = NewParm(NewString("int"), NewString("__disown"));
p = NewParm(NewString("bool"), NewString("disown"));
Setattr(p, "CAML_VALUE", "1");
Setattr(n, "director:postfix_args", p);
Setattr(p, "args:byname", "1");
@ -1838,7 +1838,7 @@ public:
0, 0);
call = Swig_csuperclass_call(0, basetype, superparms);
Printf( w->def,
"%s::%s: %s, Swig::Director(self, __disown) { }",
"%s::%s: %s, Swig::Director(self, disown) { }",
classname, target, call );
Delete(target);
Wrapper_print(w, f_directors);
@ -1871,11 +1871,11 @@ public:
classname = Swig_class_name(n);
{
Wrapper *w = NewWrapper();
Printf(w->def, "__DIRECTOR__%s::__DIRECTOR__%s(CAML_VALUE self, int __disown): Swig::Director(self, __disown) { }", classname, classname);
Printf(w->def, "__DIRECTOR__%s::__DIRECTOR__%s(CAML_VALUE self, bool disown) : Swig::Director(self, disown) { }", classname, classname);
Wrapper_print(w, f_directors);
DelWrapper(w);
}
Printf(f_directors_h, " __DIRECTOR__%s(CAML_VALUE self, int __disown = 1);\n", classname);
Printf(f_directors_h, " __DIRECTOR__%s(CAML_VALUE self, bool disown = true);\n", classname);
Delete(classname);
return Language::classDirectorDefaultConstructor(n);
}

34
Source/Modules/python.cxx
View file

@ -78,7 +78,7 @@ String *Swig_class_name(Node *n) {
/* Swig_director_declaration()
*
* Generate the full director class declaration, complete with base classes.
* e.g. "class __DIRECTOR__myclass: public myclass, public Swig::Director {"
* e.g. "class __DIRECTOR__myclass : public myclass, public Swig::Director {"
*
*/
@ -87,7 +87,7 @@ String *Swig_director_declaration(Node *n) {
String *directorname = NewStringf("__DIRECTOR__%s", classname);
String *base = Getattr(n, "classtype");
String *declaration = Swig_class_declaration(n, directorname);
Printf(declaration, ": public %s, public Swig::Director {\n", base);
Printf(declaration, " : public %s, public Swig::Director {\n", base);
Delete(classname);
Delete(directorname);
return declaration;
@ -449,8 +449,8 @@ public:
if (directorsEnabled()) {
Swig_banner(f_directors_h);
Printf(f_directors_h, "#ifndef __%s_WRAP_H__\n", module);
Printf(f_directors_h, "#define __%s_WRAP_H__\n\n", module);
Printf(f_directors_h, "#ifndef SWIG_%s_WRAP_H_\n", module);
Printf(f_directors_h, "#define SWIG_%s_WRAP_H_\n\n", module);
Printf(f_directors_h, "class Swig::Director;\n\n");
Swig_insert_file("director.swg", f_directors);
Printf(f_directors, "\n\n");
@ -578,7 +578,7 @@ public:
Dump(f_directors, f_runtime);
Dump(f_directors_h, f_runtime_h);
Printf(f_runtime_h, "\n");
Printf(f_runtime_h, "#endif /* __%s_WRAP_H__ */\n", module);
Printf(f_runtime_h, "#endif\n");
Close(f_runtime_h);
}
@ -872,7 +872,7 @@ public:
if (/*directorbase &&*/ !constructor && !destructor && isVirtual) {
Wrapper_add_local(f, "director", "Swig::Director *director = 0");
Printf(f->code, "director = dynamic_cast<Swig::Director *>(arg1);\n");
Printf(f->code, "if (director && (director->__get_self()==obj0)) director->__set_up();\n");
Printf(f->code, "if (director && (director->swig_get_self()==obj0)) director->swig_set_up();\n");
}
}
}
@ -926,7 +926,7 @@ public:
Wrapper_add_local(f, "resultdirector", "Swig::Director *resultdirector = 0");
Printf(f->code, "resultdirector = dynamic_cast<Swig::Director *>(result);\n");
Printf(f->code, "if (resultdirector) {\n");
Printf(f->code, " resultobj = resultdirector->__get_self();\n");
Printf(f->code, " resultobj = resultdirector->swig_get_self();\n");
Printf(f->code, " Py_INCREF(resultobj);\n");
Printf(f->code, "} else {\n");
Printf(f->code,"%s\n", tm);
@ -1419,7 +1419,7 @@ public:
Printf(wrap_args, "if (!%s) {\n", director);
Printf(wrap_args, "%s = SWIG_NewPointerObj(%s, SWIGTYPE%s, 0);\n", source, nonconst, mangle);
Printf(wrap_args, "} else {\n");
Printf(wrap_args, "%s = %s->__get_self();\n", source, director);
Printf(wrap_args, "%s = %s->swig_get_self();\n", source, director);
Printf(wrap_args, "Py_INCREF(%s);\n", source);
Printf(wrap_args, "}\n");
Delete(director);
@ -1456,7 +1456,7 @@ public:
Wrapper_add_local(w, "result", "PyObject *result");
/* direct call to superclass if _up is set */
Printf(w->code, "if (__get_up()) {\n");
Printf(w->code, "if (swig_get_up()) {\n");
if (pure_virtual) {
Printf(w->code, "throw Swig::DirectorPureVirtualException();\n");
} else {
@ -1476,9 +1476,9 @@ public:
/* pass the method call on to the Python object */
if (Len(parse_args) > 0) {
Printf(w->code, "result = PyObject_CallMethod(__get_self(), \"%s\", \"%s\" %s);\n", pyname, parse_args, arglist);
Printf(w->code, "result = PyObject_CallMethod(swig_get_self(), \"%s\", \"%s\" %s);\n", pyname, parse_args, arglist);
} else {
Printf(w->code, "result = PyObject_CallMethod(__get_self(), \"%s\", NULL);\n", pyname);
Printf(w->code, "result = PyObject_CallMethod(swig_get_self(), \"%s\", NULL);\n", pyname);
}
/* exception handling */
@ -1613,7 +1613,7 @@ public:
String *classname = NewString("");
Printf(classname, "__DIRECTOR__%s", supername);
/* insert self and __disown parameters */
/* insert self and disown parameters */
Parm *p, *ip;
ParmList *superparms = Getattr(n, "parms");
ParmList *parms = CopyParmList(superparms);
@ -1623,10 +1623,10 @@ public:
set_nextSibling(p, parms);
parms = p;
for (ip = parms; nextSibling(ip); ) ip = nextSibling(ip);
p = NewParm(NewString("int"), NewString("__disown"));
p = NewParm(NewString("bool"), NewString("disown"));
Setattr(p, "arg:byname", "1");
Setattr(n, "director:postfix_args", p);
Setattr(p, "value", "0");
Setattr(p, "value", "false");
set_nextSibling(ip, p);
/* constructor */
@ -1636,7 +1636,7 @@ public:
String *basetype = Getattr(parent, "classtype");
String *target = method_decl(decl, classname, parms, 0, 0);
call = Swig_csuperclass_call(0, basetype, superparms);
Printf(w->def, "%s::%s: %s, Swig::Director(self, __disown) { }", classname, target, call);
Printf(w->def, "%s::%s: %s, Swig::Director(self, disown) { }", classname, target, call);
Delete(target);
Wrapper_print(w, f_directors);
Delete(call);
@ -1666,11 +1666,11 @@ public:
classname = Swig_class_name(n);
{
Wrapper *w = NewWrapper();
Printf(w->def, "__DIRECTOR__%s::__DIRECTOR__%s(PyObject* self, int __disown): Swig::Director(self, __disown) { }", classname, classname);
Printf(w->def, "__DIRECTOR__%s::__DIRECTOR__%s(PyObject* self, bool disown) : Swig::Director(self, disown) { }", classname, classname);
Wrapper_print(w, f_directors);
DelWrapper(w);
}
Printf(f_directors_h, " __DIRECTOR__%s(PyObject* self, int __disown = 0);\n", classname);
Printf(f_directors_h, " __DIRECTOR__%s(PyObject* self, bool disown = false);\n", classname);
Delete(classname);
return Language::classDirectorDefaultConstructor(n);
}

32
Source/Modules/ruby.cxx
View file

@ -81,7 +81,7 @@ static String *Swig_class_name(Node *n) {
/* Swig_director_declaration()
*
* Generate the full director class declaration, complete with base classes.
* e.g. "class __DIRECTOR__myclass: public myclass, public Swig::Director {"
* e.g. "class __DIRECTOR__myclass : public myclass, public Swig::Director {"
*
*/
@ -670,8 +670,8 @@ public:
if (directorsEnabled()) {
Swig_banner(f_directors_h);
Printf(f_directors_h, "#ifndef __%s_WRAP_H__\n", module);
Printf(f_directors_h, "#define __%s_WRAP_H__\n\n", module);
Printf(f_directors_h, "#ifndef SWIG_%s_WRAP_H_\n", module);
Printf(f_directors_h, "#define SWIG_%s_WRAP_H_\n\n", module);
Printf(f_directors_h, "class Swig::Director;\n\n");
Swig_insert_file("director.swg", f_directors);
Printf(f_directors, "\n\n");
@ -723,7 +723,7 @@ public:
Dump(f_directors, f_runtime);
Dump(f_directors_h, f_runtime_h);
Printf(f_runtime_h, "\n");
Printf(f_runtime_h, "#endif /* __%s_WRAP_H__ */\n", module);
Printf(f_runtime_h, "#endif\n");
Close(f_runtime_h);
}
@ -1261,7 +1261,7 @@ public:
if (/*directorbase &&*/ !constructor && !destructor && isVirtual) {
Wrapper_add_local(f, "director", "Swig::Director *director = 0");
Printf(f->code, "director = dynamic_cast<Swig::Director *>(arg1);\n");
Printf(f->code, "if (director && (director->__get_self() == self)) director->__set_up();\n");
Printf(f->code, "if (director && (director->swig_get_self() == self)) director->swig_set_up();\n");
}
}
}
@ -1315,7 +1315,7 @@ public:
Wrapper_add_local(f, "resultdirector", "Swig::Director *resultdirector = 0");
Printf(f->code, "resultdirector = dynamic_cast<Swig::Director *>(result);\n");
Printf(f->code, "if (resultdirector) {\n");
Printf(f->code, " vresult = resultdirector->__get_self();\n");
Printf(f->code, " vresult = resultdirector->swig_get_self();\n");
Printf(f->code, "} else {\n");
Printf(f->code,"%s\n", tm);
Printf(f->code, "}\n");
@ -2078,7 +2078,7 @@ public:
String *classname = NewString("");
Printf(classname, "__DIRECTOR__%s", supername);
/* insert self and __disown parameters */
/* insert self and disown parameters */
Parm *p, *ip;
ParmList *superparms = Getattr(n, "parms");
ParmList *parms = CopyParmList(superparms);
@ -2087,7 +2087,7 @@ public:
set_nextSibling(p, parms);
parms = p;
for (ip = parms; nextSibling(ip); ) ip = nextSibling(ip);
p = NewParm(NewString("int"), NewString("__disown"));
p = NewParm(NewString("bool"), NewString("disown"));
Setattr(p, "arg:byname", "1");
Setattr(n, "director:postfix_args", p);
Setattr(p, "value", "0");
@ -2100,7 +2100,7 @@ public:
String *basetype = Getattr(parent, "classtype");
String *target = method_decl(decl, classname, parms, 0, 0);
call = Swig_csuperclass_call(0, basetype, superparms);
Printf(w->def, "%s::%s: %s, Swig::Director(self, __disown) { }", classname, target, call);
Printf(w->def, "%s::%s: %s, Swig::Director(self, disown) { }", classname, target, call);
Delete(target);
Wrapper_print(w, f_directors);
Delete(call);
@ -2126,10 +2126,10 @@ public:
Wrapper *w;
classname = Swig_class_name(n);
w = NewWrapper();
Printf(w->def, "__DIRECTOR__%s::__DIRECTOR__%s(VALUE self, bool __disown) : Swig::Director(self, __disown) { }", classname, classname);
Printf(w->def, "__DIRECTOR__%s::__DIRECTOR__%s(VALUE self, bool disown) : Swig::Director(self, disown) { }", classname, classname);
Wrapper_print(w, f_directors);
DelWrapper(w);
Printf(f_directors_h, " __DIRECTOR__%s(VALUE self, bool __disown = true);\n", classname);
Printf(f_directors_h, " __DIRECTOR__%s(VALUE self, bool disown = true);\n", classname);
Delete(classname);
return Language::classDirectorDefaultConstructor(n);
}
@ -2184,7 +2184,7 @@ public:
// Main code
Wrapper_add_localv(w, "args", "Swig::body_args", "args", NIL);
Printv(w->code, "args.recv = __get_self();\n", NIL);
Printv(w->code, "args.recv = swig_get_self();\n", NIL);
Printf(w->code, "args.id = rb_intern(\"%s\");\n", methodName);
Printf(w->code, "args.argc = %d;\n", argc);
if (argc > 0) {
@ -2210,9 +2210,9 @@ public:
else
{
if (argc > 0) {
Printf(w->code, "result = rb_funcall(__get_self(), rb_intern(\"%s\"), %d%s);\n", methodName, argc, args);
Printf(w->code, "result = rb_funcall(swig_get_self(), rb_intern(\"%s\"), %d%s);\n", methodName, argc, args);
} else {
Printf(w->code, "result = rb_funcall(__get_self(), rb_intern(\"%s\"), 0, NULL);\n", methodName);
Printf(w->code, "result = rb_funcall(swig_get_self(), rb_intern(\"%s\"), 0, NULL);\n", methodName);
}
}
@ -2380,7 +2380,7 @@ public:
Printf(wrap_args, "if (!%s) {\n", director);
Printf(wrap_args, "%s = SWIG_NewPointerObj(%s, SWIGTYPE%s, 0);\n", source, nonconst, mangle);
Printf(wrap_args, "} else {\n");
Printf(wrap_args, "%s = %s->__get_self();\n", source, director);
Printf(wrap_args, "%s = %s->swig_get_self();\n", source, director);
Printf(wrap_args, "}\n");
Delete(director);
Printv(arglist, source, NIL);
@ -2415,7 +2415,7 @@ public:
Wrapper_add_local(w, "result", "VALUE result");
/* direct call to superclass if _up is set */
Printf(w->code, "if (__get_up()) {\n");
Printf(w->code, "if (swig_get_up()) {\n");
if (pure_virtual) {
Printf(w->code, "throw Swig::DirectorPureVirtualException();\n");
} else {