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

Simplify globalvariableHandler() further

Browse source
This commit is contained in:
Olly Betts 2021-04-17 07:39:41 +12:00
commit e76308be92
1 changed files with 7 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Source/Modules/php.cxx
View file

@ -108,7 +108,6 @@ static enum {
memberfn, memberfn,
staticmemberfn, staticmemberfn,
membervar, membervar,
globalvar,
staticmembervar, staticmembervar,
constructor, constructor,
directorconstructor directorconstructor
@ -1140,18 +1139,6 @@ public:
} }
} else if (wrapperType == memberfn) { } else if (wrapperType == memberfn) {
wname = Getattr(n, "memberfunctionHandler:sym:name"); wname = Getattr(n, "memberfunctionHandler:sym:name");
} else if (wrapperType == globalvar) {
//check for namespaces (global class vars)
if (class_name) {
wname = Copy(Getattr(n, "variableWrapper:sym:name"));
if (is_setter_method(n)) {
Append(wname, "_set");
} else if (is_getter_method(n)) {
Append(wname, "_get");
}
} else {
wname = iname;
}
} else if (wrapperType == staticmembervar) { } else if (wrapperType == staticmembervar) {
// Shape::nshapes -> nshapes // Shape::nshapes -> nshapes
wname = Getattr(n, "staticmembervariableHandler:sym:name"); wname = Getattr(n, "staticmembervariableHandler:sym:name");
@ -1501,19 +1488,13 @@ public:
* globalvariableHandler() * globalvariableHandler()
* ------------------------------------------------------------ */ * ------------------------------------------------------------ */
virtual int globalvariableHandler(Node *n) {
wrapperType = globalvar;
/* PHP doesn't support intercepting reads and writes to global variables /* PHP doesn't support intercepting reads and writes to global variables
* (nor static property reads and writes so we can't wrap them as static * (nor static property reads and writes so we can't wrap them as static
* properties on a dummy class) so just let SWIG do its default thing and * properties on a dummy class) so just let SWIG do its default thing and
* wrap them as name_get() and name_set(). * wrap them as name_get() and name_set().
*/ */
int result = Language::globalvariableHandler(n); //virtual int globalvariableHandler(Node *n) {
//}
wrapperType = standard;
return result;
}
/* ------------------------------------------------------------ /* ------------------------------------------------------------
* constantWrapper() * constantWrapper()