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

Lateral change to add runtime "reprotection" at the python

Browse source 
side for protected director members.

Lib/python/director.swg: added needed code for runtime checking
Source/Modules/python.cxx: added needed code for runtime checking
director_protected_runme.py: checks now that the runtime protection is working


The extra runtime checking is only done for protected members,
so, the old public directors members don't feel any overhead.

This finished the director protected support for the python language.
Java and Ocalm will need to add the "reprotection" mechanism latter.
But as in the python case, the changes will be localized in the
languages files, and there will be no need to touch the core
files anymore.


git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@5532 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Marcelo Matus 2003-12-11 01:59:12 +00:00
commit 72984676ca
4 changed files with 148 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

40
Source/Modules/python.cxx
View file

@ -728,6 +728,13 @@ 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");
if (dirprot_mode() && is_protected(n)) {
Printf(f->code, "if (director && !(director->swig_get_inner(\"%s\"))) ", name);
Printf(f->code,
"SWIG_exception(SWIG_RuntimeError,\"accessing protected member %s\");\n",
name);
}
Printf(f->code, "if (director && (director->swig_get_self()==obj0)) director->swig_set_up();\n");
}
}
@ -1327,11 +1334,16 @@ public:
String *pyname = Getattr(n,"sym:name");
/* pass the method call on to the Python object */
if (dirprot_mode() && is_protected(n))
Printf(w->code, "swig_set_inner(\"%s\", true);\n", name);
if (Len(parse_args) > 0) {
Printf(w->code, "result = PyObject_CallMethod(swig_get_self(), \"%s\", \"%s\" %s);\n", pyname, parse_args, arglist);
} else {
Printf(w->code, "result = PyObject_CallMethod(swig_get_self(), \"%s\", NULL);\n", pyname);
}
if (dirprot_mode() && is_protected(n))
Printf(w->code, "swig_set_inner(\"%s\", false);\n", name);
/* exception handling */
tm = Swig_typemap_lookup_new("director:except", n, "result", 0);
@ -1533,6 +1545,11 @@ public:
* ------------------------------------------------------------ */
int classDirectorInit(Node *n) {
if (dirprot_mode()) {
Printf(f_directors_h, "#include <map>\n");
Printf(f_directors_h, "#include <string>\n\n");
}
String *declaration = Swig_director_declaration(n);
Printf(f_directors_h, "\n");
Printf(f_directors_h, "%s\n", declaration);
@ -1546,6 +1563,29 @@ public:
* ------------------------------------------------------------ */
int classDirectorEnd(Node *n) {
if (dirprot_mode()) {
/*
This implementation uses a std::map<std::string,int>.
It should be possible to rewrite it using a more elegant way,
like copying the Java approach for the 'override' array.
But for know, this seems to be the least intrusive way.
*/
Printf(f_directors_h,"\n\n");
Printf(f_directors_h,"/* Internal Director utilities */\n");
Printf(f_directors_h,"public:\n");
Printf(f_directors_h," bool swig_get_inner(const char* name) const {\n");
Printf(f_directors_h," std::map<std::string, bool>::const_iterator iv = inner.find(name);\n");
Printf(f_directors_h," return (iv != inner.end() ? iv->second : false);\n");
Printf(f_directors_h," }\n\n");
Printf(f_directors_h," void swig_set_inner(const char* name, bool val) const\n");
Printf(f_directors_h," { inner[name] = val;}\n\n");
Printf(f_directors_h,"private:\n");
Printf(f_directors_h," mutable std::map<std::string, bool> inner;\n");
}
Printf(f_directors_h, "};\n\n");
return Language::classDirectorEnd(n);
}