mirror of
https://github.com/phpv8/v8js.git
synced 2024-12-22 18:41:52 +00:00
export public methods of classes derived from \V8Js, closes #183
This commit is contained in:
parent
0945749e7c
commit
3508f0c8e7
@ -85,6 +85,13 @@ extern "C" {
|
|||||||
#define V8JS_FLAG_FORCE_ARRAY (1<<1)
|
#define V8JS_FLAG_FORCE_ARRAY (1<<1)
|
||||||
#define V8JS_FLAG_PROPAGATE_PHP_EXCEPTIONS (1<<2)
|
#define V8JS_FLAG_PROPAGATE_PHP_EXCEPTIONS (1<<2)
|
||||||
|
|
||||||
|
|
||||||
|
/* These are not defined by Zend */
|
||||||
|
#define ZEND_WAKEUP_FUNC_NAME "__wakeup"
|
||||||
|
#define ZEND_SLEEP_FUNC_NAME "__sleep"
|
||||||
|
#define ZEND_SET_STATE_FUNC_NAME "__set_state"
|
||||||
|
|
||||||
|
|
||||||
/* 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);
|
||||||
|
|
||||||
|
@ -30,6 +30,7 @@ extern "C" {
|
|||||||
#include "v8js_v8.h"
|
#include "v8js_v8.h"
|
||||||
#include "v8js_exceptions.h"
|
#include "v8js_exceptions.h"
|
||||||
#include "v8js_v8object_class.h"
|
#include "v8js_v8object_class.h"
|
||||||
|
#include "v8js_object_export.h"
|
||||||
#include "v8js_timer.h"
|
#include "v8js_timer.h"
|
||||||
|
|
||||||
#include <functional>
|
#include <functional>
|
||||||
@ -319,6 +320,10 @@ static void v8js_fatal_error_handler(const char *location, const char *message)
|
|||||||
}
|
}
|
||||||
/* }}} */
|
/* }}} */
|
||||||
|
|
||||||
|
#define IS_MAGIC_FUNC(mname) \
|
||||||
|
((key_len == sizeof(mname)) && \
|
||||||
|
!strncasecmp(key, mname, key_len - 1))
|
||||||
|
|
||||||
/* {{{ proto void V8Js::__construct([string object_name [, array variables [, array extensions [, bool report_uncaught_exceptions]]])
|
/* {{{ proto void V8Js::__construct([string object_name [, array variables [, array extensions [, bool report_uncaught_exceptions]]])
|
||||||
__construct for V8Js */
|
__construct for V8Js */
|
||||||
static PHP_METHOD(V8Js, __construct)
|
static PHP_METHOD(V8Js, __construct)
|
||||||
@ -480,7 +485,65 @@ static PHP_METHOD(V8Js, __construct)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Add pointer to zend object */
|
||||||
|
php_obj->SetHiddenValue(V8JS_SYM(PHPJS_OBJECT_KEY), v8::External::New(isolate, getThis()));
|
||||||
|
|
||||||
|
/* Export public methods */
|
||||||
|
zend_function *method_ptr;
|
||||||
|
char *key = NULL;
|
||||||
|
uint key_len;
|
||||||
|
|
||||||
|
zend_hash_internal_pointer_reset_ex(&c->std.ce->function_table, &pos);
|
||||||
|
for (;; zend_hash_move_forward_ex(&c->std.ce->function_table, &pos)) {
|
||||||
|
if (zend_hash_get_current_key_ex(&c->std.ce->function_table, &key, &key_len, &index, 0, &pos) != HASH_KEY_IS_STRING ||
|
||||||
|
zend_hash_get_current_data_ex(&c->std.ce->function_table, (void **) &method_ptr, &pos) == FAILURE
|
||||||
|
) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ((method_ptr->common.fn_flags & ZEND_ACC_PUBLIC) == 0) {
|
||||||
|
/* Allow only public methods */
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ((method_ptr->common.fn_flags & (ZEND_ACC_CTOR|ZEND_ACC_DTOR|ZEND_ACC_CLONE)) != 0) {
|
||||||
|
/* no __construct, __destruct(), or __clone() functions */
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* hide (do not export) other PHP magic functions */
|
||||||
|
if (IS_MAGIC_FUNC(ZEND_CALLSTATIC_FUNC_NAME) ||
|
||||||
|
IS_MAGIC_FUNC(ZEND_SLEEP_FUNC_NAME) ||
|
||||||
|
IS_MAGIC_FUNC(ZEND_WAKEUP_FUNC_NAME) ||
|
||||||
|
IS_MAGIC_FUNC(ZEND_SET_STATE_FUNC_NAME) ||
|
||||||
|
IS_MAGIC_FUNC(ZEND_GET_FUNC_NAME) ||
|
||||||
|
IS_MAGIC_FUNC(ZEND_SET_FUNC_NAME) ||
|
||||||
|
IS_MAGIC_FUNC(ZEND_UNSET_FUNC_NAME) ||
|
||||||
|
IS_MAGIC_FUNC(ZEND_CALL_FUNC_NAME) ||
|
||||||
|
IS_MAGIC_FUNC(ZEND_INVOKE_FUNC_NAME) ||
|
||||||
|
IS_MAGIC_FUNC(ZEND_TOSTRING_FUNC_NAME) ||
|
||||||
|
IS_MAGIC_FUNC(ZEND_ISSET_FUNC_NAME)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
v8::Local<v8::String> method_name = V8JS_STR(method_ptr->common.function_name);
|
||||||
|
v8::Local<v8::FunctionTemplate> ft;
|
||||||
|
|
||||||
|
try {
|
||||||
|
ft = v8::Local<v8::FunctionTemplate>::New
|
||||||
|
(isolate, c->method_tmpls.at(method_ptr));
|
||||||
|
}
|
||||||
|
catch (const std::out_of_range &) {
|
||||||
|
ft = v8::FunctionTemplate::New(isolate, v8js_php_callback,
|
||||||
|
v8::External::New((isolate), method_ptr));
|
||||||
|
// @fixme add/check Signature v8::Signature::New((isolate), tmpl));
|
||||||
|
v8js_tmpl_t *persistent_ft = &c->method_tmpls[method_ptr];
|
||||||
|
persistent_ft->Reset(isolate, ft);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
php_obj->ForceSet(method_name, ft->GetFunction());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
/* }}} */
|
/* }}} */
|
||||||
|
|
||||||
|
@ -169,7 +169,7 @@ failure:
|
|||||||
/* }}} */
|
/* }}} */
|
||||||
|
|
||||||
/* Callback for PHP methods and functions */
|
/* Callback for PHP methods and functions */
|
||||||
static void v8js_php_callback(const v8::FunctionCallbackInfo<v8::Value>& info) /* {{{ */
|
void v8js_php_callback(const v8::FunctionCallbackInfo<v8::Value>& info) /* {{{ */
|
||||||
{
|
{
|
||||||
v8::Isolate *isolate = info.GetIsolate();
|
v8::Isolate *isolate = info.GetIsolate();
|
||||||
v8::Local<v8::Object> self = info.Holder();
|
v8::Local<v8::Object> self = info.Holder();
|
||||||
@ -291,11 +291,6 @@ static void v8js_weak_closure_callback(const v8::WeakCallbackData<v8::Object, v8
|
|||||||
ctx->weak_closures.erase(persist_tpl_);
|
ctx->weak_closures.erase(persist_tpl_);
|
||||||
};
|
};
|
||||||
|
|
||||||
/* These are not defined by Zend */
|
|
||||||
#define ZEND_WAKEUP_FUNC_NAME "__wakeup"
|
|
||||||
#define ZEND_SLEEP_FUNC_NAME "__sleep"
|
|
||||||
#define ZEND_SET_STATE_FUNC_NAME "__set_state"
|
|
||||||
|
|
||||||
#define IS_MAGIC_FUNC(mname) \
|
#define IS_MAGIC_FUNC(mname) \
|
||||||
((key_len == sizeof(mname)) && \
|
((key_len == sizeof(mname)) && \
|
||||||
!strncasecmp(key, mname, key_len - 1))
|
!strncasecmp(key, mname, key_len - 1))
|
||||||
|
@ -30,4 +30,6 @@ v8::Local<v8::Value> v8js_named_property_callback(v8::Local<v8::String> property
|
|||||||
property_op_t callback_type,
|
property_op_t callback_type,
|
||||||
v8::Local<v8::Value> set_value = v8::Local<v8::Value>());
|
v8::Local<v8::Value> set_value = v8::Local<v8::Value>());
|
||||||
|
|
||||||
|
void v8js_php_callback(const v8::FunctionCallbackInfo<v8::Value>& info);
|
||||||
|
|
||||||
#endif /* V8JS_OBJECT_EXPORT_H */
|
#endif /* V8JS_OBJECT_EXPORT_H */
|
||||||
|
Loading…
Reference in New Issue
Block a user