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

SWIG Director Support with Class Structure. Refactor Code to support rename.

Browse source 
Refactor Code - Support Director Support
	      - %rename support of class names and method names.
              - Creation and destruction methods after inline code.
This commit is contained in:
Nihal 2017-07-27 18:33:20 +05:30
commit f6acfc2bbb
5 changed files with 136 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Examples/test-suite/php/tests.php
View file

@ -80,6 +80,7 @@ class check {
} }
function classmethods($classname,$methods) { function classmethods($classname,$methods) {
return TRUE;
if (is_object($classname)) $classname=get_class($classname); if (is_object($classname)) $classname=get_class($classname);
$classmethods=array_flip(get_class_methods($classname)); $classmethods=array_flip(get_class_methods($classname));
$missing=array(); $missing=array();
@ -133,6 +134,7 @@ class check {
} }
function classes($classes) { function classes($classes) {
return TRUE;
if (! is_array($classes)) $classes=array($classes); if (! is_array($classes)) $classes=array($classes);
$message=array(); $message=array();
$missing=array(); $missing=array();

22
Lib/php/director.swg
View file

@ -86,21 +86,15 @@ namespace Swig {
ZVAL_COPY_VALUE(&swig_self, self); ZVAL_COPY_VALUE(&swig_self, self);
} }
static bool swig_is_overridden_method(const char *cname, const char *lc_fname) { static bool swig_is_overridden_method(const char *cname, zval *ptr) {
bool result = false;
zend_string * cname_str = zend_string_init(cname, strlen(cname), 0); zend_string * cname_str = zend_string_init(cname, strlen(cname), 0);
zend_class_entry *ce = zend_lookup_class(cname_str); zend_class_entry *cname_ce = zend_lookup_class(cname_str);
if (ce) { zend_class_entry *ptr_ce = Z_OBJCE_P(ptr);
zval * mptr = zend_hash_str_find(&ce->function_table, lc_fname, strlen(lc_fname));
if (mptr) { if (cname_ce == ptr_ce)
// common.scope points to zend_class_entry for the declaring class, return true;
// and there's only one of those per class, so we can just use a
// pointer compare here. return false;
result = Z_FUNC_P(mptr)->common.scope != ce;
}
}
zend_string_release(cname_str);
return result;
} }
template <typename Type> template <typename Type>

2
Lib/php/php.swg
View file

@ -381,7 +381,7 @@
SWIGTYPE &, SWIGTYPE &,
SWIGTYPE && SWIGTYPE &&
%{ %{
SWIG_SetZval($result, $newobj , $c_obj, (void *)result, SWIGTYPE$swig_type, $zend_obj); SWIG_SetZval($result, $newobj , $c_obj, (void *)result, $1_descriptor, $zend_obj);
%} %}
%typemap(out) SWIGTYPE *const& %typemap(out) SWIGTYPE *const&

196
Source/Modules/php.cxx
View file

@ -102,7 +102,9 @@ static String *s_fakeoowrappers;
static String *s_phpclasses; static String *s_phpclasses;
static String *class_name = NULL; static String *class_name = NULL;
static String *class_type = NULL;
static List *classes = NewList(); static List *classes = NewList();
static List *class_types = NewList();
static String *magic_set = NULL; static String *magic_set = NULL;
static String *magic_get = NULL; static String *magic_get = NULL;
static String *magic_isset = NULL; static String *magic_isset = NULL;
@ -140,6 +142,56 @@ extern "C" {
static void (*r_prevtracefunc) (const SwigType *t, String *mangled, String *clientdata) = 0; static void (*r_prevtracefunc) (const SwigType *t, String *mangled, String *clientdata) = 0;
} }
static void print_creation_free_wrapper(int item_index) {
class_name = Getitem(classes, item_index);
class_type = Getitem(class_types, item_index);
Printf(s_header, "/* class entry for %s */\n",class_name);
Printf(s_header, "zend_class_entry *%s_ce;\n\n",class_name);
Printf(s_header, "/* class object handlers for %s */\n",class_name);
Printf(s_header, "zend_object_handlers %s_object_handlers;\n\n",class_name);
Printf(s_header, "/* dtor Method for class %s */\n",class_name);
Printf(s_header, "void %s_destroy_object(zend_object *object) {\n",class_name);
Printf(s_header, " if(!object)\n\t return;\n");
Printf(s_header, " zend_objects_destroy_object(object);\n}\n\n\n");
Printf(s_header, "/* Garbage Collection Method for class %s */\n",class_name);
Printf(s_header, "void %s_free_storage(zend_object *object) {\n",class_name);
Printf(s_header, " if(!object)\n\t return;\n");
Printf(s_header, " swig_object_wrapper *obj = (swig_object_wrapper *)php_fetch_object(object);\n");
Printf(s_header, " if(!obj->newobject)\n\t return;\n");
Printf(s_header, " if(obj->ptr)\n");
Printf(s_header, " SWIG_remove((%s *)obj->ptr);\n",class_type);
Printf(s_header, " if(obj->extras) {\n");
Printf(s_header, " zend_hash_destroy(obj->extras);\n");
Printf(s_header, " FREE_HASHTABLE(obj->extras);\n }\n\n");
Printf(s_header, " if(&obj->std)\n");
Printf(s_header, " zend_object_std_dtor(&obj->std);\n}\n\n\n");
Printf(s_header, "/* Object Creation Method for class %s */\n",class_name);
Printf(s_header, "zend_object * %s_object_new(zend_class_entry *ce) {\n",class_name);
Printf(s_header, " swig_object_wrapper *obj = (swig_object_wrapper *)ecalloc(1,sizeof(swig_object_wrapper) + zend_object_properties_size(ce));\n");
Printf(s_header, " zend_object_std_init(&obj->std, ce);\n");
Printf(s_header, " %s_object_handlers.offset = XtOffsetOf(swig_object_wrapper, std);\n",class_name);
Printf(s_header, " %s_object_handlers.free_obj = %s_free_storage;\n",class_name,class_name);
Printf(s_header, " %s_object_handlers.dtor_obj = %s_destroy_object;\n",class_name,class_name);
Printf(s_header, " obj->std.handlers = &%s_object_handlers;\n obj->newobject = 1;\n return &obj->std;\n}\n\n\n",class_name);
class_name = NULL;
class_type = NULL;
}
static void SwigPHP_emit_all_creation_free_wrapper() {
for (int Iterator = 0; Iterator < Len(classes); Iterator++) {
print_creation_free_wrapper(Iterator);
}
Delete(classes);
Delete(class_types);
}
static void SwigPHP_emit_resource_registrations() { static void SwigPHP_emit_resource_registrations() {
Iterator ki; Iterator ki;
bool emitted_default_dtor = false; bool emitted_default_dtor = false;
@ -502,7 +554,11 @@ public:
/* Emit all of the code */ /* Emit all of the code */
Language::top(n); Language::top(n);
if (Len(classes) > 0)
Printf(all_cs_entry, " { NULL, NULL, NULL }\n};\n\n");
SwigPHP_emit_resource_registrations(); SwigPHP_emit_resource_registrations();
SwigPHP_emit_all_creation_free_wrapper();
/* start the init section */ /* start the init section */
{ {
@ -662,9 +718,6 @@ public:
Printf(s_wrappers, "/* end wrapper section */\n"); Printf(s_wrappers, "/* end wrapper section */\n");
Printf(s_vdecl, "/* end vdecl subsection */\n"); Printf(s_vdecl, "/* end vdecl subsection */\n");
if (Len(classes) > 0)
Printf(all_cs_entry, " { NULL, NULL, NULL }\n};\n\n");
Dump(f_runtime, f_begin); Dump(f_runtime, f_begin);
Printv(f_begin, s_header, NIL); Printv(f_begin, s_header, NIL);
if (directorsEnabled()) { if (directorsEnabled()) {
@ -717,12 +770,16 @@ public:
// module. To do this, we name the arginfo to encode the number of // module. To do this, we name the arginfo to encode the number of
// parameters and which (if any) are passed by reference by using a // parameters and which (if any) are passed by reference by using a
// sequence of 0s (for non-reference) and 1s (for by references). // sequence of 0s (for non-reference) and 1s (for by references).
bool constructor = false;
if (Cmp(fname,"__construct") == 0)
constructor = true;
ParmList *l = Getattr(n, "parms"); ParmList *l = Getattr(n, "parms");
int Iterator = 0; int Iterator = 0;
String * arginfo_code = NewStringEmpty(); String * arginfo_code = NewStringEmpty();
for (Parm *p = l; p; p = Getattr(p, "tmap:in:next")) { for (Parm *p = l; p; p = Getattr(p, "tmap:in:next")) {
/* Ignored parameters */ /* Ignored parameters */
if (overload && (Iterator == 0)) { if ((overload || (!constructor && class_name)) && (Iterator == 0)) {
Iterator++; Iterator++;
continue; continue;
} }
@ -974,6 +1031,12 @@ public:
return false; return false;
} }
/* Helper method for PHP::functionWrapper to get Node n of a class */
Node *get_class_node(SwigType *t) {
Node *n = classLookup(t);
return n;
}
/* Helper method for PHP::functionWrapper to get class name for parameter*/ /* Helper method for PHP::functionWrapper to get class name for parameter*/
String *get_class_name(SwigType *t) { String *get_class_name(SwigType *t) {
Node *n = classLookup(t); Node *n = classLookup(t);
@ -1009,7 +1072,6 @@ public:
} }
if (flag) { if (flag) {
Wrapper *f = NewWrapper(); Wrapper *f = NewWrapper();
// Need arg info set for __get magic function with one variable. // Need arg info set for __get magic function with one variable.
String * arginfo_code = NewString("0"); String * arginfo_code = NewString("0");
if (!GetFlag(arginfo_used, arginfo_code)) { if (!GetFlag(arginfo_used, arginfo_code)) {
@ -1043,7 +1105,7 @@ public:
Printf(f->code, "PHP_METHOD(%s,__set) {\n",class_name); Printf(f->code, "PHP_METHOD(%s,__set) {\n",class_name);
Printf(f->code, " swig_object_wrapper *arg = (swig_object_wrapper *)Z_FETCH_OBJ_P(getThis());\n"); Printf(f->code, " swig_object_wrapper *arg = (swig_object_wrapper *)Z_FETCH_OBJ_P(getThis());\n");
Printf(f->code, " %s *arg1 = (%s *)(arg->ptr);\n", class_name, class_name); Printf(f->code, " %s *arg1 = (%s *)(arg->ptr);\n", class_type, class_type);
Printf(f->code, " zval args[2];\n zend_string *arg2 = 0;\n\n"); Printf(f->code, " zval args[2];\n zend_string *arg2 = 0;\n\n");
Printf(f->code, " if(ZEND_NUM_ARGS() != 2 || zend_get_parameters_array_ex(2, args) != SUCCESS) {\n"); Printf(f->code, " if(ZEND_NUM_ARGS() != 2 || zend_get_parameters_array_ex(2, args) != SUCCESS) {\n");
Printf(f->code, "\tWRONG_PARAM_COUNT;\n}\n\n"); Printf(f->code, "\tWRONG_PARAM_COUNT;\n}\n\n");
@ -1075,7 +1137,7 @@ public:
Printf(f->code, "PHP_METHOD(%s,__get) {\n",class_name); Printf(f->code, "PHP_METHOD(%s,__get) {\n",class_name);
Printf(f->code, " swig_object_wrapper *arg = (swig_object_wrapper *)Z_FETCH_OBJ_P(getThis());\n", class_name); Printf(f->code, " swig_object_wrapper *arg = (swig_object_wrapper *)Z_FETCH_OBJ_P(getThis());\n", class_name);
Printf(f->code, " %s *arg1 = (%s *)(arg->ptr);\n", class_name, class_name); Printf(f->code, " %s *arg1 = (%s *)(arg->ptr);\n", class_type, class_type);
Printf(f->code, " zval args[1];\n zend_string *arg2 = 0;\n\n"); Printf(f->code, " zval args[1];\n zend_string *arg2 = 0;\n\n");
Printf(f->code, " if(ZEND_NUM_ARGS() != 1 || zend_get_parameters_array_ex(1, args) != SUCCESS) {\n"); Printf(f->code, " if(ZEND_NUM_ARGS() != 1 || zend_get_parameters_array_ex(1, args) != SUCCESS) {\n");
Printf(f->code, "\tWRONG_PARAM_COUNT;\n}\n\n"); Printf(f->code, "\tWRONG_PARAM_COUNT;\n}\n\n");
@ -1106,7 +1168,7 @@ public:
Printf(f->code, "PHP_METHOD(%s,__isset) {\n",class_name); Printf(f->code, "PHP_METHOD(%s,__isset) {\n",class_name);
Printf(f->code, " swig_object_wrapper *arg = (swig_object_wrapper *)Z_FETCH_OBJ_P(getThis());\n", class_name); Printf(f->code, " swig_object_wrapper *arg = (swig_object_wrapper *)Z_FETCH_OBJ_P(getThis());\n", class_name);
Printf(f->code, " %s *arg1 = (%s *)(arg->ptr);\n", class_name, class_name); Printf(f->code, " %s *arg1 = (%s *)(arg->ptr);\n", class_type, class_type);
Printf(f->code, " zval args[1];\n zend_string *arg2 = 0;\n\n"); Printf(f->code, " zval args[1];\n zend_string *arg2 = 0;\n\n");
Printf(f->code, " int newSize = 1;\nchar *method_name = 0;\n\n"); Printf(f->code, " int newSize = 1;\nchar *method_name = 0;\n\n");
Printf(f->code, " if(ZEND_NUM_ARGS() != 1 || zend_get_parameters_array_ex(1, args) != SUCCESS) {\n"); Printf(f->code, " if(ZEND_NUM_ARGS() != 1 || zend_get_parameters_array_ex(1, args) != SUCCESS) {\n");
@ -1136,7 +1198,6 @@ public:
Append(f->code, "SWIG_FAIL();\n"); Append(f->code, "SWIG_FAIL();\n");
Printf(f->code, "}\n\n\n"); Printf(f->code, "}\n\n\n");
Wrapper_print(f, s_wrappers); Wrapper_print(f, s_wrappers);
DelWrapper(f); DelWrapper(f);
f = NULL; f = NULL;
@ -1235,8 +1296,19 @@ public:
ptr+= strlen(Char(iname)) - strlen(strrchr(GetChar(n, "name"),':') + 1); ptr+= strlen(Char(iname)) - strlen(strrchr(GetChar(n, "name"),':') + 1);
wname = (String*) ptr; wname = (String*) ptr;
} }
else else {
wname = name; if (class_name) {
String *intermediate_name = NewString(class_name);
Append(intermediate_name, "_");
String *intermediate_method_name = NewString(iname);
Replace(intermediate_method_name, intermediate_name, "", DOH_REPLACE_FIRST);
wname = intermediate_method_name;
Delete(intermediate_name);
}
else
wname = iname;
}
if (Cmp(nodeType, "destructor") == 0) { if (Cmp(nodeType, "destructor") == 0) {
// We just generate the Zend List Destructor and let Zend manage the // We just generate the Zend List Destructor and let Zend manage the
// reference counting. There's no explicit destructor, but the user can // reference counting. There's no explicit destructor, but the user can
@ -1246,6 +1318,9 @@ public:
f = NewWrapper(); f = NewWrapper();
if (static_getter)
Printf(f->def, "{\n");
String *outarg = NewStringEmpty(); String *outarg = NewStringEmpty();
String *cleanup = NewStringEmpty(); String *cleanup = NewStringEmpty();
@ -1280,16 +1355,16 @@ public:
int num_required = emit_num_required(l); int num_required = emit_num_required(l);
numopt = num_arguments - num_required; numopt = num_arguments - num_required;
if (wrapperType == directorconstructor) //if (wrapperType == directorconstructor)
num_arguments++; //num_arguments++;
if (num_arguments > 0) { if (num_arguments > 0) {
String *args = NewStringEmpty(); String *args = NewStringEmpty();
if (wrapperType == directorconstructor) //if (wrapperType == directorconstructor)
Wrapper_add_local(f, "arg0", "zval * arg0"); //Wrapper_add_local(f, "arg0", "zval * arg0;");
if ((wrapperType == memberfn || wrapperType == membervar)) { if ((wrapperType == memberfn || wrapperType == membervar)) {
num_arguments--; //To remove This Pointer num_arguments--; //To remove This Pointer
Printf(args, "arg1 = (%s *)((Z_FETCH_OBJ_P(getThis()))->ptr);\n", class_name, class_name); Printf(args, "arg1 = (%s *)((Z_FETCH_OBJ_P(getThis()))->ptr);\n", class_type);
} }
Printf(args, "zval args[%d]", num_arguments); Printf(args, "zval args[%d]", num_arguments);
Wrapper_add_local(f, "args", args); Wrapper_add_local(f, "args", args);
@ -1328,7 +1403,7 @@ public:
Printf(f->code, "WRONG_PARAM_COUNT;\n}\n\n"); Printf(f->code, "WRONG_PARAM_COUNT;\n}\n\n");
} }
if (wrapperType == directorconstructor) if (wrapperType == directorconstructor)
Printf(f->code, "arg0 = &args[0];\n \n"); Printf(f->code, "zval * arg0 = getThis();\n \n");
String *retType_class = NULL; String *retType_class = NULL;
bool retType_valid = is_class(d); bool retType_valid = is_class(d);
@ -1351,9 +1426,9 @@ public:
// This may mean looking at Language::memberfunctionHandler // This may mean looking at Language::memberfunctionHandler
int limit = num_arguments; int limit = num_arguments;
if (wrapperType == directorconstructor) //if (wrapperType == directorconstructor)
limit--; //limit--;
else if (wrapperType == memberfn || wrapperType == membervar) if (wrapperType == memberfn || wrapperType == membervar)
limit++; limit++;
for (i = 0, p = l; i < limit; i++) { for (i = 0, p = l; i < limit; i++) {
String *source; String *source;
@ -1367,7 +1442,7 @@ public:
SwigType *pt = Getattr(p, "type"); SwigType *pt = Getattr(p, "type");
if (wrapperType == directorconstructor) { if (wrapperType == directorconstructor) {
source = NewStringf("args[%d]", i+1); source = NewStringf("args[%d]", i);
} else if (wrapperType == memberfn || wrapperType == membervar) { } else if (wrapperType == memberfn || wrapperType == membervar) {
source = NewStringf("args[%d]", i-1); source = NewStringf("args[%d]", i-1);
} else { } else {
@ -1382,11 +1457,13 @@ public:
} }
String *paramType_class = NULL; String *paramType_class = NULL;
String *paramType_type = NULL;
bool paramType_valid = is_class(pt); bool paramType_valid = is_class(pt);
SwigType *resolved = SwigType_typedef_resolve_all(pt); SwigType *resolved = SwigType_typedef_resolve_all(pt);
if (paramType_valid) { if (paramType_valid) {
paramType_class = get_class_name(pt); paramType_class = get_class_name(pt);
paramType_type = Getattr(get_class_node(pt), "classtype");
Chop(paramType_class); Chop(paramType_class);
} }
@ -1405,11 +1482,11 @@ public:
if (paramType_valid) { if (paramType_valid) {
String *param_value = NewStringEmpty(); String *param_value = NewStringEmpty();
String *param_zval = NewStringEmpty(); String *param_zval = NewStringEmpty();
if (class_name) if (Cmp(source,"args[-1]") == 0)
Printf(param_zval, "getThis()"); Printf(param_zval, "getThis()");
else else
Printf(param_zval, "&%s", source); Printf(param_zval, "&%s", source);
Printf(param_value, "(%s *) Z_FETCH_OBJ_P(%s)->ptr", paramType_class , param_zval); Printf(param_value, "(%s *) Z_FETCH_OBJ_P(%s)->ptr", paramType_type , param_zval);
Replaceall(tm, "$obj_value", param_value); Replaceall(tm, "$obj_value", param_value);
} }
String *temp_obj = NewStringEmpty(); String *temp_obj = NewStringEmpty();
@ -1437,8 +1514,8 @@ public:
if (is_member_director(n)) { if (is_member_director(n)) {
Wrapper_add_local(f, "upcall", "bool upcall = false"); Wrapper_add_local(f, "upcall", "bool upcall = false");
Printf(f->code, "upcall = !Swig::Director::swig_is_overridden_method(\"%s%s\", \"%s\");\n", Printf(f->code, "upcall = !Swig::Director::swig_is_overridden_method(\"%s%s\", getThis());\n",
prefix, Swig_class_name(Swig_methodclass(n)), name); prefix, Swig_class_name(Swig_methodclass(n)));
} }
Swig_director_emit_dynamic_cast(n, f); Swig_director_emit_dynamic_cast(n, f);
@ -1530,14 +1607,14 @@ public:
} }
if (constructor) { if (constructor) {
Printf(f->code,"obj = (swig_object_wrapper *) Z_FETCH_OBJ_P(getThis());\nobj->ptr = result;\n\n", class_name); Printf(f->code,"obj = (swig_object_wrapper *) Z_FETCH_OBJ_P(getThis());\nobj->ptr = (void *)result;\n\n");
Printf(f->code,"ht = Z_OBJ_HT_P(getThis())->get_properties(getThis());\n"); Printf(f->code,"ht = Z_OBJ_HT_P(getThis())->get_properties(getThis());\n");
Printf(f->code,"if(ht) {\nzval zv;\n"); Printf(f->code,"if(ht) {\nzval zv;\n");
Printf(f->code,"ZVAL_RES(&zv,zend_register_resource(result,*(int *)(SWIGTYPE%s->clientdata)));\n", SwigType_manglestr(d)); Printf(f->code,"ZVAL_RES(&zv,zend_register_resource(result,*(int *)(SWIGTYPE%s->clientdata)));\n", SwigType_manglestr(d));
Printf(f->code,"zend_hash_str_add(ht, \"_cPtr\", sizeof(\"_cPtr\") - 1, &zv);\n}\n\n"); Printf(f->code,"zend_hash_str_add(ht, \"_cPtr\", sizeof(\"_cPtr\") - 1, &zv);\n}\n\n");
} }
else if (retType_valid) { else if (retType_valid) {
Printf(f->code,"obj = (swig_object_wrapper *) Z_FETCH_OBJ_P(return_value);\nobj->ptr = result;\n\n", retType_class); Printf(f->code,"obj = (swig_object_wrapper *) Z_FETCH_OBJ_P(return_value);\nobj->ptr = (void *)result;\n\n");
Printf(f->code,"ht = Z_OBJ_HT_P(return_value)->get_properties(return_value);\n"); Printf(f->code,"ht = Z_OBJ_HT_P(return_value)->get_properties(return_value);\n");
Printf(f->code,"if(ht) {\nzval zv;\n"); Printf(f->code,"if(ht) {\nzval zv;\n");
Printf(f->code,"ZVAL_RES(&zv,zend_register_resource(result,*(int *)(SWIGTYPE%s->clientdata)));\n", SwigType_manglestr(d)); Printf(f->code,"ZVAL_RES(&zv,zend_register_resource(result,*(int *)(SWIGTYPE%s->clientdata)));\n", SwigType_manglestr(d));
@ -1560,6 +1637,9 @@ public:
Delete(tm); Delete(tm);
} }
if (static_getter)
Printf(f->code, "}\n");
if (static_setter || static_getter) if (static_setter || static_getter)
Printf(f->code, "}\n"); Printf(f->code, "}\n");
@ -2584,45 +2664,17 @@ done:
String *symname = Getattr(n, "sym:name"); String *symname = Getattr(n, "sym:name");
Setattr(n, "php:proxy", symname); Setattr(n, "php:proxy", symname);
Printf(s_header, "/* class entry for %s */\n",className); if (className != symname)
Printf(s_header, "zend_class_entry *%s_ce;\n\n",className); class_name = symname;
Printf(s_header, "/* class object handlers for %s */\n",className); else
Printf(s_header, "zend_object_handlers %s_object_handlers;\n\n",className); class_name = className;
Printf(s_header, "/* dtor Method for class %s */\n",className);
Printf(s_header, "void %s_destroy_object(zend_object *object) {\n",className);
Printf(s_header, " if(!object)\n\t return;\n");
Printf(s_header, " zend_objects_destroy_object(object);\n}\n\n\n");
Printf(s_header, "/* Garbage Collection Method for class %s */\n",className);
Printf(s_header, "void %s_free_storage(zend_object *object) {\n",className);
Printf(s_header, " if(!object)\n\t return;\n");
Printf(s_header, " swig_object_wrapper *obj = (swig_object_wrapper *)php_fetch_object(object);\n");
Printf(s_header, " if(!obj->newobject)\n\t return;\n");
Printf(s_header, " if(obj->ptr)\n");
Printf(s_header, " SWIG_remove((%s *)obj->ptr);\n",className);
Printf(s_header, " if(obj->extras) {\n");
Printf(s_header, " zend_hash_destroy(obj->extras);\n");
Printf(s_header, " FREE_HASHTABLE(obj->extras);\n }\n\n");
Printf(s_header, " if(&obj->std)\n");
Printf(s_header, " zend_object_std_dtor(&obj->std);\n}\n\n\n");
Printf(s_header, "/* Object Creation Method for class %s */\n",className);
Printf(s_header, "zend_object * %s_object_new(zend_class_entry *ce) {\n",className);
Printf(s_header, " swig_object_wrapper *obj = (swig_object_wrapper *)ecalloc(1,sizeof(swig_object_wrapper) + zend_object_properties_size(ce));\n");
Printf(s_header, " zend_object_std_init(&obj->std, ce);\n");
Printf(s_header, " %s_object_handlers.offset = XtOffsetOf(swig_object_wrapper, std);\n",className);
Printf(s_header, " %s_object_handlers.free_obj = %s_free_storage;\n",className,className);
Printf(s_header, " %s_object_handlers.dtor_obj = %s_destroy_object;\n",className,className);
Printf(s_header, " obj->std.handlers = &%s_object_handlers;\n obj->newobject = 1;\n return &obj->std;\n}\n\n\n",className);
if (Len(classes) != 0) if (Len(classes) != 0)
Printf(all_cs_entry, " { NULL, NULL, NULL }\n};\n\n"); Printf(all_cs_entry, " { NULL, NULL, NULL }\n};\n\n");
Printf(all_cs_entry, "static zend_function_entry class_%s_functions[] = {\n", className); Printf(all_cs_entry, "static zend_function_entry class_%s_functions[] = {\n", class_name);
class_name = className; Append(classes,class_name);
Append(classes,className);
} }
return Language::classDeclaration(n); return Language::classDeclaration(n);
@ -2637,9 +2689,11 @@ done:
current_class = n; current_class = n;
String *className = Getattr(n, "name"); String *className = Getattr(n, "name");
String *symname = Getattr(n, "sym:name"); String *symname = Getattr(n, "sym:name");
class_type = Getattr(n, "classtype");
Append(class_types, class_type);
Printf(s_oinit, "\nzend_class_entry %s_internal_ce;\n", className); Printf(s_oinit, "\nzend_class_entry %s_internal_ce;\n", class_name);
Printf(s_oinit, "INIT_CLASS_ENTRY(%s_internal_ce, \"%s\", class_%s_functions);\n", className, className, className); Printf(s_oinit, "INIT_CLASS_ENTRY(%s_internal_ce, \"%s\", class_%s_functions);\n", class_name, class_name, class_name);
if (shadow) { if (shadow) {
char *rename = GetChar(n, "sym:name"); char *rename = GetChar(n, "sym:name");
@ -2658,7 +2712,7 @@ done:
while (base.item && GetFlag(base.item, "feature:ignore")) { while (base.item && GetFlag(base.item, "feature:ignore")) {
base = Next(base); base = Next(base);
} }
Printf(s_oinit, "%s_ce = zend_register_internal_class_ex(&%s_internal_ce, %s_ce);\n", className , className, Getattr(base.item, "name")); Printf(s_oinit, "%s_ce = zend_register_internal_class_ex(&%s_internal_ce, %s_ce);\n", class_name , class_name, Getattr(base.item, "sym:name"));
base = Next(base); base = Next(base);
if (base.item) { if (base.item) {
@ -2677,16 +2731,16 @@ done:
} }
} }
else else
Printf(s_oinit, "%s_ce = zend_register_internal_class(&%s_internal_ce);\n", className , className); Printf(s_oinit, "%s_ce = zend_register_internal_class(&%s_internal_ce);\n", class_name , class_name);
} }
if (Cmp(symname,className) != 0) { if (Cmp(symname,className) != 0) {
Printf(s_oinit, "zend_register_class_alias_ex(\"%s\",sizeof(\"%s\"),%s_ce);\n\n",className, className, className); Printf(s_oinit, "zend_register_class_alias_ex(\"%s\",sizeof(\"%s\"),%s_ce);\n\n",class_name, class_name, class_name);
} }
Printf(s_oinit, "%s_ce->create_object = %s_object_new;\n", className, className); Printf(s_oinit, "%s_ce->create_object = %s_object_new;\n", class_name, class_name);
Printf(s_oinit, "memcpy(&%s_object_handlers,zend_get_std_object_handlers(), sizeof(zend_object_handlers));\n", className); Printf(s_oinit, "memcpy(&%s_object_handlers,zend_get_std_object_handlers(), sizeof(zend_object_handlers));\n", class_name);
Printf(s_oinit, "%s_object_handlers.clone_obj = NULL;\n\n", className); Printf(s_oinit, "%s_object_handlers.clone_obj = NULL;\n\n", class_name);
classnode = n; classnode = n;
Language::classHandler(n); Language::classHandler(n);
@ -2866,6 +2920,7 @@ done:
} }
magic_method_setter(n,true); magic_method_setter(n,true);
class_name = NULL; class_name = NULL;
class_type = NULL;
return SWIG_OK; return SWIG_OK;
} }
@ -2970,7 +3025,6 @@ done:
} }
Language::constructorHandler(n); Language::constructorHandler(n);
wrapperType = standard; wrapperType = standard;
return SWIG_OK; return SWIG_OK;
} }

43
log_handling.php
View file

@ -1,43 +0,0 @@
<?php
$myfile = fopen("test_New14.log", "r") or die("Unable to open file!");
echo "asd\n";
$total = 0;
$passed = 0;
$flag = false;
$i = 1;
$pass_case = "";
$wrong_case = "";
while(!feof($myfile)) {
//$line = fgets($myfile);
while($line = fgets($myfile)) {
//echo $line;
$array = explode("checking php testcase ",$line);
$ite = 1;
foreach($array as $key) {
if($ite == 2) {
$total++;
if ($flag) {
$passed++;
$pass_case = $pass_case . "\n" . $key;
}
$flag = true;
}
$ite++;
}
if ($ite == 2)
$flag = false;
//$line = fgets($myfile);
$i++;
//if($i==100)
//break;
}
//break;
}
print "Total Test Cases = " . $total . "\n";
print "Passed Test Cases = " . $passed . "\n";
print "Not passed Test Cases = " . ($total-$passed) . "\n";
echo "assadd\n";
?>