php_vm 1.3.7 → 1.3.8

data/ext/php_vm/php_vm.c

@@ -49,13 +49,11 @@ static void php_embed_error_handler(char *message)
 	}
 }
 
-static zval *global_exception = NULL;
+static zval *g_exception = NULL;
 static void php_vm_exception_hook(zval *ex TSRMLS_DC)
 {
 	// TODO: no use global variable
-	//VALUE exception = zval_to_value(ex);
-	//rb_exc_raise(exception);
-	global_exception = ex;
+	g_exception = ex;
 	EG(exception) = NULL;
 }
 
@@ -181,9 +179,15 @@ int new_php_object(zend_class_entry *ce, VALUE v_args, zval *retval)
 		// call constructor
 		int result = call_php_method(ce, retval, ce->constructor, RARRAY_LEN(v_args), RARRAY_PTR(v_args), &retval TSRMLS_CC);
 
-		// error
+		// exception
 		if (result==FAILURE) {
-			rb_raise(rb_ePHPError, "Invocation of %s's constructor failed", ce->name);
+			if (g_exception) {
+				VALUE exception = zval_to_value(g_exception);
+				g_exception = NULL;
+				rb_exc_raise(exception);
+			} else {
+				rb_raise(rb_ePHPError, "Invocation of %s's constructor failed", ce->name);
+			}
 		}
 
 	} else if (!RARRAY_LEN(v_args)) {
@@ -366,31 +370,36 @@ int call_php_method(zend_class_entry *ce, zval *obj, zend_function *mptr, int ar
 
 	zend_fcall_info_args(&fci, z_args);
 
-	// call method
 	zend_try {
+		// call method
 		result = zend_call_function(&fci, &fcc TSRMLS_CC);
-	} zend_catch {
-	} zend_end_try();
 
-	// reference variable
-	HashPosition pos;
-	zval **arg;
-	zend_arg_info *arg_info = mptr->common.arg_info;
-	zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(z_args), &pos);
-	for (i=0; i<argc && i<mptr->common.num_args; i++) {
-		if (arg_info->pass_by_reference) {
-			zend_hash_get_current_data_ex(Z_ARRVAL_P(z_args), (void *)&arg, &pos);
-			value_copy(v_argv[i], zval_to_value(*arg));
+		// reference variable
+		HashPosition pos;
+		zval **arg;
+		zend_arg_info *arg_info = mptr->common.arg_info;
+		zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(z_args), &pos);
+		for (i=0; i<argc && i<mptr->common.num_args; i++) {
+			if (arg_info->pass_by_reference) {
+				zend_hash_get_current_data_ex(Z_ARRVAL_P(z_args), (void *)&arg, &pos);
+				value_copy(v_argv[i], zval_to_value(*arg));
+			}
+			zend_hash_move_forward_ex(Z_ARRVAL_P(z_args), &pos);
+			arg_info++;
 		}
-		zend_hash_move_forward_ex(Z_ARRVAL_P(z_args), &pos);
-		arg_info++;
-	}
+	} zend_catch {
+	} zend_end_try();
 
 	// release
 	for (i=0; i<fci.param_count; i++) {
 		zval_ptr_dtor(fci.params[i]);
 	}
 	zend_fcall_info_args_clear(&fci, 1);
+
+	// result
+	if (g_exception) {
+		result = FAILURE;
+	}
 	return result;
 }
 
@@ -420,12 +429,14 @@ VALUE call_php_method_bridge(zend_class_entry *ce, zval *obj, zend_function *mpt
 	int result = call_php_method(ce, obj, mptr, argc, argv, &z_val TSRMLS_CC);
 
 	// exception
-	if (global_exception) {
-		VALUE exception = zval_to_value(global_exception);
-		global_exception = NULL;
-		rb_exc_raise(exception);
-	} else if (result==FAILURE) {
-		rb_raise(rb_ePHPError, "raise exception: %s", mptr->common.function_name);
+	if (result==FAILURE) {
+		if (g_exception) {
+			VALUE exception = zval_to_value(g_exception);
+			g_exception = NULL;
+			rb_exc_raise(exception);
+		} else {
+			rb_raise(rb_ePHPError, "raise exception: %s", mptr->common.function_name);
+		}
 	}
 
 	return zval_to_value(z_val);
@@ -445,22 +456,13 @@ VALUE call_php_method_name_bridge(zend_class_entry *ce, zval *obj, VALUE callee,
 	find_zend_function(ce, RSTRING_PTR(callee), RSTRING_LEN(callee), &mptr);
 
 	// call
-	zval *z_val;
 	if (mptr) {
 		// call method
-		int result = call_php_method(ce, obj, mptr, argc, argv, &z_val TSRMLS_CC);
-
-		// exception
-		if (global_exception) {
-			VALUE exception = zval_to_value(global_exception);
-			global_exception = NULL;
-			rb_exc_raise(exception);
-		} else if (result==FAILURE) {
-			rb_raise(rb_ePHPError, "raise exception: %s", RSTRING_PTR(callee));
-		}
+		return call_php_method_bridge(ce, obj, mptr, argc, argv);
 	} else {
 		// accessor
 		VALUE is_setter = rb_funcall(callee, rb_intern("end_with?"), 1, rb_str_new2("="));
+		zval *z_val;
 
 		if (is_setter) {
 			// setter
@@ -488,10 +490,11 @@ VALUE call_php_method_name_bridge(zend_class_entry *ce, zval *obj, VALUE callee,
 				// static
 				z_val = zend_read_static_property(ce, RSTRING_PTR(callee), RSTRING_LEN(callee), 0 TSRMLS_CC);
 			}
+			return zval_to_value(z_val);
 		}
 	}
 
-	return zval_to_value(z_val);
+	return Qnil;
 }
 
 void value_copy(VALUE dst, VALUE src)
@@ -664,6 +667,7 @@ VALUE define_global_constants()
 	zval *z_val;
 	int result = call_php_method(NULL, NULL, mptr, 0, NULL, &z_val TSRMLS_CC);
 	if (result==FAILURE) {
+		g_exception = NULL;
 		return Qfalse;
 	}
 
@@ -717,6 +721,7 @@ VALUE define_global_functions()
 	zval *z_val;
 	int result = call_php_method(NULL, NULL, mptr, 0, NULL, &z_val TSRMLS_CC);
 	if (result==FAILURE) {
+		g_exception = NULL;
 		return Qfalse;
 	}
 
@@ -756,6 +761,7 @@ VALUE define_global_classes()
 	zval *z_val;
 	int result = call_php_method(NULL, NULL, mptr, 0, NULL, &z_val TSRMLS_CC);
 	if (result==FAILURE) {
+		g_exception = NULL;
 		return Qfalse;
 	}
 
@@ -1335,7 +1341,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.7"));
+	rb_define_const(rb_mPHPVM, "VERSION", rb_str_new2("1.3.8"));
 
 	rb_cv_set(rb_mPHPVM, "@@output_handler", Qnil);
 	rb_cv_set(rb_mPHPVM, "@@error_handler", Qnil);

data/ext/php_vm/php_vm_z2v.c

@@ -160,5 +160,3 @@ VALUE zval_to_value(zval *z)
 	}
 	return Qnil;
 }
-
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: php_vm
 version: !ruby/object:Gem::Version
-  version: 1.3.7
+  version: 1.3.8
   prerelease: 
 platform: ruby
 authors: