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

Fix class-constant bug.

Browse source 
- zend_declare_class_constant ends up having "" values.
This commit is contained in:
Nihal 2017-09-02 10:32:30 +05:30
commit 38f282d847
1 changed files with 3 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Source/Modules/php.cxx
View file

@ -2638,27 +2638,19 @@ done:
String *value = rawval ? rawval : Getattr(n, "value"); String *value = rawval ? rawval : Getattr(n, "value");
String *tm; String *tm;
bool isMemberConstant = false;
String *constant_name = NULL;
if (class_name) {
isMemberConstant = true;
constant_name = Getattr(n ,"memberconstantHandler:sym:name");
}
if (!addSymbol(iname, n)) if (!addSymbol(iname, n))
return SWIG_ERROR; return SWIG_ERROR;
SwigType_remember(type); SwigType_remember(type);
if (!isMemberConstant && (tm = Swig_typemap_lookup("consttab", n, name, 0))) { if (!wrapping_member_constant && (tm = Swig_typemap_lookup("consttab", n, name, 0))) {
Replaceall(tm, "$source", value); Replaceall(tm, "$source", value);
Replaceall(tm, "$target", name); Replaceall(tm, "$target", name);
Replaceall(tm, "$value", value); Replaceall(tm, "$value", value);
Printf(s_cinit, "%s\n", tm); Printf(s_cinit, "%s\n", tm);
} else if (isMemberConstant && (tm = Swig_typemap_lookup("classconsttab", n, name, 0))) { } else if (wrapping_member_constant && (tm = Swig_typemap_lookup("classconsttab", n, name, 0))) {
Replaceall(tm, "$class", class_name); Replaceall(tm, "$class", class_name);
Replaceall(tm, "$const_name", constant_name); Replaceall(tm, "$const_name", wrapping_member_constant);
Replaceall(tm, "$value", value); Replaceall(tm, "$value", value);
Printf(s_cinit, "%s\n", tm); Printf(s_cinit, "%s\n", tm);
} }