php_vm 1.3.5 → 1.3.6

data/ext/php_vm/php_vm.c

@@ -245,9 +245,6 @@ void define_php_properties(VALUE v_obj, zend_class_entry *ce, int is_static)
 void define_php_methods(VALUE v_obj, zend_class_entry *ce, int is_static)
 {
 	// TODO: access scope
-	// TODO: __toString
-	// TODO: __clone
-	// TODO: __isset
 
 	HashPosition pos;
 	zend_function *mptr;
@@ -282,18 +279,6 @@ void define_php_methods(VALUE v_obj, zend_class_entry *ce, int is_static)
 				if (strcmp("__construct", fname)==0 || strcmp(ce->name, fname)==0) {
 					// __construct => no define
 					is_pass_define = 1;
-
-				} else if (strcmp("__call", fname)==0) {
-					// __call => method_missing
-					rb_define_singleton_method(v_obj, "method_missing", rb_php_object_call_method_missing, -1);
-
-				} else if (strcmp("__get", fname)==0) {
-					// __get => method_missing
-					rb_define_singleton_method(v_obj, "method_missing", rb_php_object_call_method_missing, -1);
-
-				} else if (strcmp("__set", fname)==0) {
-					// __set => method_missing
-					rb_define_singleton_method(v_obj, "method_missing", rb_php_object_call_method_missing, -1);
 				}
 
 				// other method
@@ -307,6 +292,45 @@ void define_php_methods(VALUE v_obj, zend_class_entry *ce, int is_static)
 	}
 }
 
+void define_php_magic_method(VALUE v_obj, zend_class_entry *ce, int is_static)
+{
+	if (is_static) {
+		// static method
+		if (ce->__callstatic) {
+			rb_define_singleton_method(v_obj, "__callStatic", rb_php_class_call_magic___callstatic, 2);
+			rb_define_singleton_method(v_obj, "method_missing", rb_php_class_call_method_missing, -1);
+		}
+	} else {
+		// instance method
+		if (ce->clone) {
+			rb_define_singleton_method(v_obj, "__clone", rb_php_object_call_magic_clone, 0);
+			rb_define_singleton_method(v_obj, "dup", rb_php_object_call_magic_clone, 0);
+			rb_define_singleton_method(v_obj, "clone", rb_php_object_call_magic_clone, 0);
+		}
+		if (ce->__get) {
+			rb_define_singleton_method(v_obj, "__get", rb_php_object_call_magic___get, 1);
+		}
+		if (ce->__set) {
+			rb_define_singleton_method(v_obj, "__set", rb_php_object_call_magic___set, 2);
+		}
+		if (ce->__unset) {
+			rb_define_singleton_method(v_obj, "__unset", rb_php_object_call_magic___unset, 1);
+		}
+		if (ce->__isset) {
+			rb_define_singleton_method(v_obj, "__isset", rb_php_object_call_magic___isset, 1);
+		}
+		if (ce->__call) {
+			rb_define_singleton_method(v_obj, "__call", rb_php_object_call_magic___call, 2);
+		}
+		if (ce->__tostring) {
+			rb_define_singleton_method(v_obj, "__toString", rb_php_object_call_magic___tostring, 0);
+		}
+		if (ce->__call || ce->__get || ce->__set) {
+			rb_define_singleton_method(v_obj, "method_missing", rb_php_object_call_method_missing, -1);
+		}
+	}
+}
+
 int call_php_method(zend_class_entry *ce, zval *obj, zend_function *mptr, int argc, VALUE *v_argv, zval **retval_ptr TSRMLS_DC)
 {
 	int result = FAILURE;
@@ -339,8 +363,7 @@ int call_php_method(zend_class_entry *ce, zval *obj, zend_function *mptr, int ar
 	long i;
 	for (i=0; i<argc; i++) {
 		zval *new_var;
-		MAKE_STD_ZVAL(new_var);
-		value_to_zval(v_argv[i], new_var);
+		value_to_zval(v_argv[i], &new_var);
 
 		zend_hash_next_index_insert(Z_ARRVAL_P(z_args), &new_var, sizeof(zval *), NULL);
 	}
@@ -351,8 +374,6 @@ int call_php_method(zend_class_entry *ce, zval *obj, zend_function *mptr, int ar
 	zend_try {
 		result = zend_call_function(&fci, &fcc TSRMLS_CC);
 	} zend_catch {
-		// EG(exception) is NULL... Why??
-		//printf("call_php_method exception: %p\n", EG(exception));
 	} zend_end_try();
 
 	// reference variable
@@ -396,7 +417,26 @@ VALUE get_callee_name()
 	return Qnil;
 }
 
-VALUE call_php_method_bridge(zend_class_entry *ce, zval *obj, VALUE callee, int argc, VALUE *argv)
+VALUE call_php_method_bridge(zend_class_entry *ce, zval *obj, zend_function *mptr, int argc, VALUE *argv)
+{
+	// call
+	zval *z_val;
+	int result = call_php_method(ce, obj, mptr, argc, argv, &z_val TSRMLS_CC);
+
+	// exception
+	if (result==FAILURE) {
+		const char *mname = mptr->common.function_name;
+		char *message = malloc(32+strlen(mname));
+		sprintf(message, "raise exception: %s", mname);
+		VALUE exception = rb_exc_new2(rb_ePHPError, message);
+		free(message);
+		rb_exc_raise(exception);
+	}
+
+	return zval_to_value(z_val);
+}
+
+VALUE call_php_method_name_bridge(zend_class_entry *ce, zval *obj, VALUE callee, int argc, VALUE *argv)
 {
 	TSRMLS_FETCH();
 
@@ -431,8 +471,7 @@ VALUE call_php_method_bridge(zend_class_entry *ce, zval *obj, VALUE callee, int
 		if (is_setter) {
 			// setter
 			rb_funcall(callee, rb_intern("gsub!"), 2, rb_str_new2("="), rb_str_new2(""));
-			MAKE_STD_ZVAL(z_val);
-			value_to_zval(argv[0], z_val);
+			value_to_zval(argv[0], &z_val);
 
 			if (obj) {
 				// instance
@@ -545,7 +584,7 @@ VALUE rb_php_vm_get_output_handler(VALUE cls)
 
 VALUE rb_php_vm_set_output_handler(VALUE cls, VALUE proc)
 {
-	if (proc!=Qnil && !rb_obj_is_proc(proc)) {
+	if (proc!=Qnil && !rb_obj_is_kind_of(proc, rb_cProc)) {
 		rb_raise(rb_eArgError, "proc is not proc object");
 	}
 	rb_cv_set(rb_mPHPVM, "@@output_handler", proc);
@@ -559,7 +598,7 @@ VALUE rb_php_vm_get_error_handler(VALUE cls)
 
 VALUE rb_php_vm_set_error_handler(VALUE cls, VALUE proc)
 {
-	if (proc!=Qnil && !rb_obj_is_proc(proc)) {
+	if (proc!=Qnil && !rb_obj_is_kind_of(proc, rb_cProc)) {
 		rb_raise(rb_eArgError, "proc is not proc object");
 	}
 	rb_cv_set(rb_mPHPVM, "@@error_handler", proc);
@@ -763,7 +802,7 @@ VALUE rb_php_vm_define_global(VALUE cls)
 VALUE rb_php_global_function_call(int argc, VALUE *argv, VALUE self)
 {
 	VALUE callee = get_callee_name();
-	return call_php_method_bridge(NULL, NULL, callee, argc, argv);
+	return call_php_method_name_bridge(NULL, NULL, callee, argc, argv);
 }
 
 VALUE rb_php_global_class_call(VALUE self)
@@ -828,7 +867,7 @@ VALUE rb_php_global_echo(int argc, VALUE *argv, VALUE cls)
 	for (i=0; i<argc; i++) {
 		argv2[i+1] = argv[i];
 	}
-	call_php_method_bridge(NULL, NULL, rb_str_new2("printf"), argc+1, argv2);
+	call_php_method_name_bridge(NULL, NULL, rb_str_new2("printf"), argc+1, argv2);
 
 	// release
 	free(format);
@@ -902,6 +941,7 @@ VALUE rb_php_class_initialize(VALUE self, VALUE v_name)
 	// define php static properties and methods
 	define_php_properties(self, *ce, 1);
 	define_php_methods(self, *ce, 1);
+	define_php_magic_method(self, *ce, 1);
 
 	return self;
 }
@@ -929,6 +969,7 @@ VALUE rb_php_class_new(int argc, VALUE *argv, VALUE self)
 	// define php instance properties and methods
 	define_php_properties(obj, ce, 0);
 	define_php_methods(obj, ce, 0);
+	define_php_magic_method(obj, ce, 0);
 
 	return obj;
 }
@@ -937,21 +978,30 @@ VALUE rb_php_class_getter(VALUE self)
 {
 	zend_class_entry *ce = get_zend_class_entry(self);
 	VALUE callee = get_callee_name();
-	return call_php_method_bridge(ce, NULL, callee, 0, NULL);
+	return call_php_method_name_bridge(ce, NULL, callee, 0, NULL);
 }
 
 VALUE rb_php_class_setter(VALUE self, VALUE value)
 {
 	zend_class_entry *ce = get_zend_class_entry(self);
 	VALUE callee = get_callee_name();
-	return call_php_method_bridge(ce, NULL, callee, 1, &value);
+	return call_php_method_name_bridge(ce, NULL, callee, 1, &value);
 }
 
 VALUE rb_php_class_call(int argc, VALUE *argv, VALUE self)
 {
 	zend_class_entry *ce = get_zend_class_entry(self);
 	VALUE callee = get_callee_name();
-	return call_php_method_bridge(ce, NULL, callee, argc, argv);
+	return call_php_method_name_bridge(ce, NULL, callee, argc, argv);
+}
+
+VALUE rb_php_class_call_magic___callstatic(VALUE self, VALUE name, VALUE args)
+{
+	zend_class_entry *ce = get_zend_class_entry(self);
+	zval *zobj = get_zval(self);
+	VALUE argv[2] = {name, args};
+
+	return call_php_method_bridge(ce, zobj, ce->__callstatic, 2, argv);
 }
 
 VALUE rb_php_class_call_method_missing(int argc, VALUE *argv, VALUE self)
@@ -962,7 +1012,7 @@ VALUE rb_php_class_call_method_missing(int argc, VALUE *argv, VALUE self)
 	rb_scan_args(argc, argv, "1*", &name, &args);
 	VALUE argv2[2] = {name, args};
 
-	return call_php_method_bridge(ce, NULL, rb_str_new2("__callStatic"), 2, argv2);
+	return call_php_method_bridge(ce, NULL, ce->__callstatic, 2, argv2);
 }
 
 
@@ -999,7 +1049,7 @@ VALUE rb_php_object_getter(VALUE self)
 	zend_class_entry *ce = get_zend_class_entry(self);
 	zval *zobj = get_zval(self);
 	VALUE callee = get_callee_name();
-	return call_php_method_bridge(ce, zobj, callee, 0, NULL);
+	return call_php_method_name_bridge(ce, zobj, callee, 0, NULL);
 }
 
 VALUE rb_php_object_setter(VALUE self, VALUE value)
@@ -1007,7 +1057,7 @@ VALUE rb_php_object_setter(VALUE self, VALUE value)
 	zend_class_entry *ce = get_zend_class_entry(self);
 	zval *zobj = get_zval(self);
 	VALUE callee = get_callee_name();
-	return call_php_method_bridge(ce, zobj, callee, 1, &value);
+	return call_php_method_name_bridge(ce, zobj, callee, 1, &value);
 }
 
 VALUE rb_php_object_call(int argc, VALUE *argv, VALUE self)
@@ -1015,7 +1065,73 @@ VALUE rb_php_object_call(int argc, VALUE *argv, VALUE self)
 	zend_class_entry *ce = get_zend_class_entry(self);
 	zval *zobj = get_zval(self);
 	VALUE callee = get_callee_name();
-	return call_php_method_bridge(ce, zobj, callee, argc, argv);
+	return call_php_method_name_bridge(ce, zobj, callee, argc, argv);
+}
+
+VALUE rb_php_object_call_magic_clone(VALUE self)
+{
+	zval *zobj = get_zval(self);
+
+	zend_object_clone_obj_t clone_call =  Z_OBJ_HT_P(zobj)->clone_obj;
+	zval *retval;
+
+	ALLOC_ZVAL(retval);
+	Z_OBJVAL_P(retval) = clone_call(zobj TSRMLS_CC);
+	Z_TYPE_P(retval) = IS_OBJECT;
+	Z_SET_REFCOUNT_P(retval, 1);
+	Z_SET_ISREF_P(retval);
+
+	return zval_to_value(retval);
+}
+
+VALUE rb_php_object_call_magic___get(VALUE self, VALUE name)
+{
+	zend_class_entry *ce = get_zend_class_entry(self);
+	zval *zobj = get_zval(self);
+
+	return call_php_method_bridge(ce, zobj, ce->__get, 1, &name);
+}
+
+VALUE rb_php_object_call_magic___set(VALUE self, VALUE name, VALUE arg)
+{
+	zend_class_entry *ce = get_zend_class_entry(self);
+	zval *zobj = get_zval(self);
+	VALUE args[2] = {name, arg};
+
+	return call_php_method_bridge(ce, zobj, ce->__set, 2, args);
+}
+
+VALUE rb_php_object_call_magic___unset(VALUE self, VALUE name)
+{
+	zend_class_entry *ce = get_zend_class_entry(self);
+	zval *zobj = get_zval(self);
+
+	return call_php_method_bridge(ce, zobj, ce->__unset, 1, &name);
+}
+
+VALUE rb_php_object_call_magic___isset(VALUE self, VALUE name)
+{
+	zend_class_entry *ce = get_zend_class_entry(self);
+	zval *zobj = get_zval(self);
+
+	return call_php_method_bridge(ce, zobj, ce->__isset, 1, &name);
+}
+
+VALUE rb_php_object_call_magic___call(VALUE self, VALUE name, VALUE args)
+{
+	zend_class_entry *ce = get_zend_class_entry(self);
+	zval *zobj = get_zval(self);
+	VALUE argv[2] = {name, args};
+
+	return call_php_method_bridge(ce, zobj, ce->__call, 2, argv);
+}
+
+VALUE rb_php_object_call_magic___tostring(VALUE self)
+{
+	zend_class_entry *ce = get_zend_class_entry(self);
+	zval *zobj = get_zval(self);
+
+	return call_php_method_bridge(ce, zobj, ce->__tostring, 0, NULL);
 }
 
 VALUE rb_php_object_call_method_missing(int argc, VALUE *argv, VALUE self)
@@ -1023,15 +1139,14 @@ VALUE rb_php_object_call_method_missing(int argc, VALUE *argv, VALUE self)
 	zend_class_entry *ce = get_zend_class_entry(self);
 	zval *zobj = get_zval(self);
 
-	VALUE call_method = rb_str_new2("__call");
-	if (has_zend_function(ce, call_method)) {
+	if (ce->__call) {
 		// __call
 		VALUE name, args;
 		rb_scan_args(argc, argv, "1*", &name, &args);
 		name = rb_str_new2(rb_id2name(SYM2ID(name)));
 		VALUE argv2[2] = {name, args};
 
-		return call_php_method_bridge(ce, zobj, call_method, 2, argv2);
+		return call_php_method_bridge(ce, zobj, ce->__call, 2, argv2);
 	} else {
 		// accessor
 		VALUE name, val;
@@ -1042,11 +1157,15 @@ VALUE rb_php_object_call_method_missing(int argc, VALUE *argv, VALUE self)
 		VALUE is_setter = rb_funcall(name, rb_intern("end_with?"), 1, rb_str_new2("="));
 		if (is_setter) {
 			// __set
-			rb_funcall(name, rb_intern("gsub!"), 2, rb_str_new2("="), rb_str_new2(""));
-			return call_php_method_bridge(ce, zobj, rb_str_new2("__set"), 2, argv2);
+			if (ce->__set) {
+				rb_funcall(name, rb_intern("gsub!"), 2, rb_str_new2("="), rb_str_new2(""));
+				return call_php_method_bridge(ce, zobj, ce->__set, 2, argv2);
+			}
 		} else {
 			// __get
-			return call_php_method_bridge(ce, zobj, rb_str_new2("__get"), 1, argv2);
+			if (ce->__get) {
+				return call_php_method_bridge(ce, zobj, ce->__get, 1, argv2);
+			}
 		}
 	}
 	return Qnil;
@@ -1072,7 +1191,7 @@ VALUE rb_php_error_reporting_initialize(int argc, VALUE *argv, VALUE self)
 	VALUE file = Qnil;
 	VALUE line = Qnil;
 
-	if (argc==1 &&TYPE( argv[0])==T_STRING) {
+	if (argc==1 && TYPE(argv[0])==T_STRING) {
 		log_message = argv[0];
 		VALUE re_str = rb_str_new2("^PHP ([^:]+?)(?: error)?: {0,2}(.+) in (.+) on line (\\d+)$");
 		VALUE re_option = rb_const_get(rb_cRegexp, rb_intern("MULTILINE"));
@@ -1171,7 +1290,7 @@ void Init_php_vm()
 	rb_define_singleton_method(rb_mPHPVM, "get_class", rb_php_vm_get_class, 1);
 	rb_define_singleton_method(rb_mPHPVM, "define_global", rb_php_vm_define_global, 0);
 
-	rb_define_const(rb_mPHPVM, "VERSION", rb_str_new2("1.3.5"));
+	rb_define_const(rb_mPHPVM, "VERSION", rb_str_new2("1.3.6"));
 
 	rb_cv_set(rb_mPHPVM, "@@output_handler", Qnil);
 	rb_cv_set(rb_mPHPVM, "@@error_handler", Qnil);

data/ext/php_vm/php_vm.h

@@ -38,7 +38,8 @@ extern int call_php_method(zend_class_entry *ce, zval *obj, zend_function *mptr,
 
 // Ruby
 extern VALUE get_callee_name();
-extern VALUE call_php_method_bridge(zend_class_entry *ce, zval *obj, VALUE callee, int argc, VALUE *argv);
+extern VALUE call_php_method_bridge(zend_class_entry *ce, zval *obj, zend_function *mptr, int argc, VALUE *argv);
+extern VALUE call_php_method_name_bridge(zend_class_entry *ce, zval *obj, VALUE callee, int argc, VALUE *argv);
 extern void value_copy(VALUE dst, VALUE src);
 
 // PHP Native resource
@@ -77,6 +78,7 @@ extern VALUE rb_php_class_new(int argc, VALUE *argv, VALUE self);
 extern VALUE rb_php_class_getter(VALUE self);
 extern VALUE rb_php_class_setter(VALUE self, VALUE value);
 extern VALUE rb_php_class_call(int argc, VALUE *argv, VALUE self);
+extern VALUE rb_php_class_call_magic___callstatic(VALUE self, VALUE name, VALUE args);
 extern VALUE rb_php_class_call_method_missing(int argc, VALUE *argv, VALUE self);
 
 // class PHPVM::PHPObject
@@ -85,6 +87,13 @@ extern VALUE rb_php_object_php_class(VALUE self);
 extern VALUE rb_php_object_getter(VALUE self);
 extern VALUE rb_php_object_setter(VALUE self, VALUE value);
 extern VALUE rb_php_object_call(int argc, VALUE *argv, VALUE self);
+extern VALUE rb_php_object_call_magic_clone(VALUE self);
+extern VALUE rb_php_object_call_magic___get(VALUE self, VALUE name);
+extern VALUE rb_php_object_call_magic___set(VALUE self, VALUE name, VALUE arg);
+extern VALUE rb_php_object_call_magic___unset(VALUE self, VALUE name);
+extern VALUE rb_php_object_call_magic___isset(VALUE self, VALUE name);
+extern VALUE rb_php_object_call_magic___call(VALUE self, VALUE name, VALUE args);
+extern VALUE rb_php_object_call_magic___tostring(VALUE self);
 extern VALUE rb_php_object_call_method_missing(int argc, VALUE *argv, VALUE self);
 
 // module

data/ext/php_vm/php_vm_v2z.c

@@ -10,8 +10,7 @@ static void value_to_zval_array(VALUE v, zval *z)
 	long i;
 	for (i=0; i<RARRAY_LEN(v); i++) {
 		zval *new_var;
-		MAKE_STD_ZVAL(new_var);
-		value_to_zval(RARRAY_PTR(v)[i], new_var);
+		value_to_zval(RARRAY_PTR(v)[i], &new_var);
 
 		zend_hash_next_index_insert(Z_ARRVAL_P(z), &new_var, sizeof(zval *), NULL);
 	}
@@ -37,55 +36,61 @@ static void value_to_zval_hash(VALUE v, zval *z)
 		v_key = rb_obj_as_string(v_key);
 
 		zval *z_value;
-		MAKE_STD_ZVAL(z_value);
-		value_to_zval(RARRAY_PTR(v_arr)[i+1], z_value);
+		value_to_zval(RARRAY_PTR(v_arr)[i+1], &z_value);
 
 		add_assoc_zval_ex(z, RSTRING_PTR(v_key), RSTRING_LEN(v_key)+1, z_value);
 	}
 }
 
 
-void value_to_zval(VALUE v, zval *z)
+void value_to_zval(VALUE v, zval **z)
 {
 	switch (TYPE(v)) {
 		// nil
 		case T_NIL:
-			ZVAL_NULL(z);
+			MAKE_STD_ZVAL(*z);
+			ZVAL_NULL(*z);
 			break;
 		// bool
 		case T_TRUE:
-			ZVAL_TRUE(z);
+			MAKE_STD_ZVAL(*z);
+			ZVAL_TRUE(*z);
 			break;
 		case T_FALSE:
-			ZVAL_FALSE(z);
+			MAKE_STD_ZVAL(*z);
+			ZVAL_FALSE(*z);
 			break;
 		// number
 		case T_FIXNUM:
-			ZVAL_LONG(z, NUM2LONG(v));
+			MAKE_STD_ZVAL(*z);
+			ZVAL_LONG(*z, NUM2LONG(v));
 			break;
 		case T_FLOAT:
-			ZVAL_DOUBLE(z, RFLOAT_VALUE(v));
+			MAKE_STD_ZVAL(*z);
+			ZVAL_DOUBLE(*z, RFLOAT_VALUE(v));
 			break;
 		// array
 		case T_ARRAY:
-			value_to_zval_array(v, z);
+			MAKE_STD_ZVAL(*z);
+			value_to_zval_array(v, *z);
 			break;
 		// hash
 		case T_HASH:
-			value_to_zval_hash(v, z);
+			MAKE_STD_ZVAL(*z);
+			value_to_zval_hash(v, *z);
 			break;
 		// object string
 		default:{
 			zval *resource_zobj = get_zval(v);
 			if (resource_zobj) {
 				// php native resource
-				//zval_ptr_dtor(&z);
-				zval_dtor(z);
-				*z = *resource_zobj;
+				*z = resource_zobj;
+				Z_ADDREF_PP(z);
 			} else {
 				// other to_s
 				v = rb_obj_as_string(v);
-				ZVAL_STRING(z, RSTRING_PTR(v), 1);
+				MAKE_STD_ZVAL(*z);
+				ZVAL_STRING(*z, RSTRING_PTR(v), 1);
 			}
 		}
 	}

data/ext/php_vm/php_vm_v2z.h

@@ -4,6 +4,6 @@
 #include <ruby.h>
 #include <sapi/embed/php_embed.h>
 
-extern void value_to_zval(VALUE v, zval *z);
+extern void value_to_zval(VALUE v, zval **z);
 
 #endif

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: php_vm
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.3.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-01 00:00:00.000000000 Z
+date: 2013-01-02 00:00:00.000000000 Z
 dependencies: []
 description: php_vm is a native bridge between Ruby and PHP.
 email: