php_vm 1.2.3 → 1.2.4

data/ext/php_vm/php_vm.c

@@ -314,14 +314,13 @@ int call_php_method(zend_class_entry *ce, zval *obj, zend_function *mptr, int ar
 
 // Ruby
 
-VALUE backtrace_re;
-
 VALUE get_callee_name()
 {
 	VALUE backtrace_arr = rb_funcall(rb_mKernel, rb_intern("caller"), 1, INT2NUM(0));
 	if (backtrace_arr!=Qnil) {
 		VALUE backtrace = rb_funcall(backtrace_arr, rb_intern("first"), 0);
 		if (backtrace!=Qnil) {
+			VALUE backtrace_re = rb_funcall(rb_cRegexp, rb_intern("new"), 1, rb_str_new2("^(.+?):(\\d+)(?::in `(.*)')?"));
 			VALUE m = rb_funcall(backtrace, rb_intern("match"), 1, backtrace_re);
 			if (m!=Qnil) {
 				return rb_funcall(m, rb_intern("[]"), 1, INT2NUM(3));
@@ -690,6 +689,19 @@ VALUE rb_php_global_echo(int argc, VALUE *argv, VALUE self)
 	return Qnil;
 }
 
+VALUE rb_php_global_array(int argc, VALUE *argv, VALUE self)
+{
+	VALUE result;
+	if (argc==1 && TYPE(argv[0])==T_HASH) {
+		// hash
+		result = argv[0];
+	} else {
+		// argv
+		rb_scan_args(argc, argv, "*", &result);
+	}
+	return result;
+}
+
 
 // class PHPVM::PHPClass
 
@@ -875,8 +887,6 @@ void Init_php_vm()
 	php_vm_module_init();
 	atexit(php_vm_module_exit);
 
-	backtrace_re = rb_funcall(rb_cRegexp, rb_intern("new"), 1, rb_str_new2("^(.+?):(\\d+)(?::in `(.*)')?"));
-
 	// module PHPVM
 	rb_mPHPVM = rb_define_module("PHPVM");
 
@@ -886,11 +896,12 @@ 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.2.3"));
+	rb_define_const(rb_mPHPVM, "VERSION", rb_str_new2("1.2.4"));
 
 	// module PHPVM::PHPGlobal
 	rb_mPHPGlobal = rb_define_module_under(rb_mPHPVM, "PHPGlobal");
 	rb_define_module_function(rb_mPHPGlobal, "echo", rb_php_global_echo, -1);
+	rb_define_module_function(rb_mPHPGlobal, "array", rb_php_global_array, -1);
 	rb_php_vm_define_global(rb_mPHPVM);
 
 	// class PHPVM::PHPClass

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: php_vm
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-26 00:00:00.000000000 Z
+date: 2012-12-27 00:00:00.000000000 Z
 dependencies: []
 description: php_vm is a native bridge between Ruby and PHP.
 email: