소스 검색

php_v8js_create_v8 -> v8js_v8object_create

Stefan Siegl 10 년 전
부모
커밋
294a5c8d1f
4개의 변경된 파일6개의 추가작업 그리고 5개의 파일을 삭제
  1. 0 3
      php_v8js_macros.h
  2. 2 1
      v8js_convert.cc
  3. 1 1
      v8js_v8object_class.cc
  4. 3 0
      v8js_v8object_class.h

+ 0 - 3
php_v8js_macros.h

@@ -92,9 +92,6 @@ extern "C" {
 #define V8JS_DEBUG_AUTO_BREAK_ONCE		1
 #define V8JS_DEBUG_AUTO_BREAK_ONCE		1
 #define V8JS_DEBUG_AUTO_BREAK_ALWAYS	2
 #define V8JS_DEBUG_AUTO_BREAK_ALWAYS	2
 
 
-/* Create PHP V8 object */
-void php_v8js_create_v8(zval *, v8::Handle<v8::Value>, int, v8::Isolate * TSRMLS_DC);
-
 /* Convert zval into V8 value */
 /* Convert zval into V8 value */
 v8::Handle<v8::Value> zval_to_v8js(zval *, v8::Isolate * TSRMLS_DC);
 v8::Handle<v8::Value> zval_to_v8js(zval *, v8::Isolate * TSRMLS_DC);
 
 

+ 2 - 1
v8js_convert.cc

@@ -25,6 +25,7 @@ extern "C" {
 
 
 #include "php_v8js_macros.h"
 #include "php_v8js_macros.h"
 #include "v8js_object_export.h"
 #include "v8js_object_export.h"
+#include "v8js_v8object_class.h"
 #include "v8js_v8.h"
 #include "v8js_v8.h"
 
 
 #include <stdexcept>
 #include <stdexcept>
@@ -247,7 +248,7 @@ int v8js_to_zval(v8::Handle<v8::Value> jsValue, zval *return_value, int flags, v
 			array_init(return_value);
 			array_init(return_value);
 			return v8js_get_properties_hash(jsValue, Z_ARRVAL_P(return_value), flags, isolate TSRMLS_CC);
 			return v8js_get_properties_hash(jsValue, Z_ARRVAL_P(return_value), flags, isolate TSRMLS_CC);
 		} else {
 		} else {
-			php_v8js_create_v8(return_value, jsValue, flags, isolate TSRMLS_CC);
+			v8js_v8object_create(return_value, jsValue, flags, isolate TSRMLS_CC);
 			return SUCCESS;
 			return SUCCESS;
 		}
 		}
 	}
 	}

+ 1 - 1
v8js_v8object_class.cc

@@ -509,7 +509,7 @@ PHP_METHOD(V8Function, __wakeup)
 }
 }
 /* }}} */
 /* }}} */
 
 
-void php_v8js_create_v8(zval *res, v8::Handle<v8::Value> value, int flags, v8::Isolate *isolate TSRMLS_DC) /* {{{ */
+void v8js_v8object_create(zval *res, v8::Handle<v8::Value> value, int flags, v8::Isolate *isolate TSRMLS_DC) /* {{{ */
 {
 {
 	v8js_ctx *ctx = (v8js_ctx *) isolate->GetData(0);
 	v8js_ctx *ctx = (v8js_ctx *) isolate->GetData(0);
 	v8js_v8object *c;
 	v8js_v8object *c;

+ 3 - 0
v8js_v8object_class.h

@@ -27,6 +27,9 @@ struct v8js_v8object {
 extern zend_class_entry *php_ce_v8object;
 extern zend_class_entry *php_ce_v8object;
 extern zend_class_entry *php_ce_v8function;
 extern zend_class_entry *php_ce_v8function;
 
 
+/* Create PHP V8 object */
+void v8js_v8object_create(zval *, v8::Handle<v8::Value>, int, v8::Isolate * TSRMLS_DC);
+
 PHP_MINIT_FUNCTION(v8js_v8object_class);
 PHP_MINIT_FUNCTION(v8js_v8object_class);
 
 
 #endif /* V8JS_V8OBJECT_CLASS_H */
 #endif /* V8JS_V8OBJECT_CLASS_H */