mirrors/phpv8
mirrors/phpv8
0
0
Fork 0
mirror of https://github.com/phpv8/v8js.git synced 2024-11-08 13:48:40 +00:00
Code Releases Activity

Rename php_v8js_objects -> v8js_v8objects

Browse Source 
* drop php_ prefix, currently used inconsistently anyways
* change "object" to "v8object" to clarify it's a JS object wrapped
  to a V8Object instance
This commit is contained in:
Stefan Siegl 2014-12-13 00:13:03 +01:00
parent 5ea36016fe
commit f987cc7b4c
4 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
php_v8js_macros.h
View File

@ -142,7 +142,7 @@ void php_v8js_accessor_ctx_dtor(php_v8js_accessor_ctx * TSRMLS_DC);
/* Register accessors into passed object */
void php_v8js_register_accessors(std::vector<php_v8js_accessor_ctx*> *accessor_list, v8::Local<v8::FunctionTemplate>, zval *, v8::Isolate * TSRMLS_DC);
struct php_v8js_object;
struct v8js_v8object;
/* {{{ Context container */
struct php_v8js_ctx {
@ -170,7 +170,7 @@ struct php_v8js_ctx {
std::map<zval *, v8js_persistent_obj_t> weak_objects;
std::map<v8js_tmpl_t *, v8js_persistent_obj_t> weak_closures;
std::list<php_v8js_object *> php_v8js_objects;
std::list<v8js_v8object *> v8js_v8objects;
std::vector<php_v8js_accessor_ctx *> accessor_list;
char *tz;
@ -197,7 +197,7 @@ struct php_v8js_timer_ctx
};
/* {{{ Object container */
struct php_v8js_object {
struct v8js_v8object {
zend_object std;
v8::Persistent<v8::Value> v8obj;
int flags;

8
v8js_class.cc
View File

@ -129,12 +129,12 @@ static void php_v8js_free_storage(void *object TSRMLS_DC) /* {{{ */
}
c->weak_closures.~map();
for (std::list<php_v8js_object *>::iterator it = c->php_v8js_objects.begin();
it != c->php_v8js_objects.end(); it ++) {
for (std::list<v8js_v8object *>::iterator it = c->v8js_v8objects.begin();
it != c->v8js_v8objects.end(); it ++) {
(*it)->v8obj.Reset();
(*it)->ctx = NULL;
}
c->php_v8js_objects.~list();
c->v8js_v8objects.~list();
/* Clear persistent handles in module cache */
for (std::map<char *, v8js_persistent_obj_t>::iterator it = c->modules_loaded.begin();
@ -191,7 +191,7 @@ static zend_object_value php_v8js_new(zend_class_entry *ce TSRMLS_DC) /* {{{ */
new(&c->weak_closures) std::map<v8js_tmpl_t *, v8js_persistent_obj_t>();
new(&c->weak_objects) std::map<zval *, v8js_persistent_obj_t>();
new(&c->php_v8js_objects) std::list<php_v8js_object *>();
new(&c->v8js_v8objects) std::list<v8js_v8object *>();
retval.handle = zend_objects_store_put(c, NULL, (zend_objects_free_object_storage_t) php_v8js_free_storage, NULL TSRMLS_CC);
retval.handlers = &v8js_object_handlers;

2
v8js_object_export.cc
View File

@ -955,7 +955,7 @@ v8::Handle<v8::Value> php_v8js_hash_to_jsobj(zval *value, v8::Isolate *isolate T
/* Special case, passing back object originating from JS to JS */
if (ce == php_ce_v8_function) {
php_v8js_object *c = (php_v8js_object *) zend_object_store_get_object(value TSRMLS_CC);
v8js_v8object *c = (v8js_v8object *) zend_object_store_get_object(value TSRMLS_CC);
if(isolate != c->ctx->isolate) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "V8Function object passed to wrong V8Js instance");

32
v8js_v8object_class.cc
View File

@ -51,7 +51,7 @@ static int php_v8js_v8_has_property(zval *object, zval *member, int has_set_exis
* 2 (exists) whether property exists - property_exists()
*/
int retval = false;
php_v8js_object *obj = (php_v8js_object *) zend_object_store_get_object(object TSRMLS_CC);
v8js_v8object *obj = (v8js_v8object *) zend_object_store_get_object(object TSRMLS_CC);
if (!obj->ctx) {
zend_throw_exception(php_ce_v8js_exception,
@ -116,7 +116,7 @@ static int php_v8js_v8_has_property(zval *object, zval *member, int has_set_exis
static zval *php_v8js_v8_read_property(zval *object, zval *member, int type ZEND_HASH_KEY_DC TSRMLS_DC) /* {{{ */
{
zval *retval = NULL;
php_v8js_object *obj = (php_v8js_object *) zend_object_store_get_object(object TSRMLS_CC);
v8js_v8object *obj = (v8js_v8object *) zend_object_store_get_object(object TSRMLS_CC);
if (!obj->ctx) {
zend_throw_exception(php_ce_v8js_exception,
@ -166,7 +166,7 @@ static zval *php_v8js_v8_read_property(zval *object, zval *member, int type ZEND
static void php_v8js_v8_write_property(zval *object, zval *member, zval *value ZEND_HASH_KEY_DC TSRMLS_DC) /* {{{ */
{
php_v8js_object *obj = (php_v8js_object *) zend_object_store_get_object(object TSRMLS_CC);
v8js_v8object *obj = (v8js_v8object *) zend_object_store_get_object(object TSRMLS_CC);
if (!obj->ctx) {
zend_throw_exception(php_ce_v8js_exception,
@ -191,7 +191,7 @@ static void php_v8js_v8_write_property(zval *object, zval *member, zval *value Z
static void php_v8js_v8_unset_property(zval *object, zval *member ZEND_HASH_KEY_DC TSRMLS_DC) /* {{{ */
{
php_v8js_object *obj = (php_v8js_object *) zend_object_store_get_object(object TSRMLS_CC);
v8js_v8object *obj = (v8js_v8object *) zend_object_store_get_object(object TSRMLS_CC);
if (!obj->ctx) {
zend_throw_exception(php_ce_v8js_exception,
@ -267,7 +267,7 @@ int php_v8js_v8_get_properties_hash(v8::Handle<v8::Value> jsValue, HashTable *re
static HashTable *php_v8js_v8_get_properties(zval *object TSRMLS_DC) /* {{{ */
{
php_v8js_object *obj = (php_v8js_object *) zend_object_store_get_object(object TSRMLS_CC);
v8js_v8object *obj = (v8js_v8object *) zend_object_store_get_object(object TSRMLS_CC);
HashTable *retval;
if (obj->properties == NULL) {
@ -320,7 +320,7 @@ static HashTable *php_v8js_v8_get_debug_info(zval *object, int *is_temp TSRMLS_D
static zend_function *php_v8js_v8_get_method(zval **object_ptr, char *method, int method_len ZEND_HASH_KEY_DC TSRMLS_DC) /* {{{ */
{
php_v8js_object *obj = (php_v8js_object *) zend_object_store_get_object(*object_ptr TSRMLS_CC);
v8js_v8object *obj = (v8js_v8object *) zend_object_store_get_object(*object_ptr TSRMLS_CC);
zend_function *f;
if (!obj->ctx) {
@ -361,9 +361,9 @@ static int php_v8js_v8_call_method(char *method, INTERNAL_FUNCTION_PARAMETERS) /
{
zval *object = this_ptr, ***argv = NULL;
int argc = ZEND_NUM_ARGS();
php_v8js_object *obj;
v8js_v8object *obj;
obj = (php_v8js_object *) zend_object_store_get_object(object TSRMLS_CC);
obj = (v8js_v8object *) zend_object_store_get_object(object TSRMLS_CC);
if (!obj->ctx) {
zend_throw_exception(php_ce_v8js_exception,
@ -420,7 +420,7 @@ static int php_v8js_v8_get_closure(zval *object, zend_class_entry **ce_ptr, zend
{
zend_function *invoke;
php_v8js_object *obj = (php_v8js_object *) zend_object_store_get_object(object TSRMLS_CC);
v8js_v8object *obj = (v8js_v8object *) zend_object_store_get_object(object TSRMLS_CC);
if (!obj->ctx) {
zend_throw_exception(php_ce_v8js_exception,
@ -458,7 +458,7 @@ static int php_v8js_v8_get_closure(zval *object, zend_class_entry **ce_ptr, zend
static void php_v8js_v8_free_storage(void *object, zend_object_handle handle TSRMLS_DC) /* {{{ */
{
php_v8js_object *c = (php_v8js_object *) object;
v8js_v8object *c = (v8js_v8object *) object;
if (c->properties) {
zend_hash_destroy(c->properties);
@ -470,7 +470,7 @@ static void php_v8js_v8_free_storage(void *object, zend_object_handle handle TSR
if(c->ctx) {
c->v8obj.Reset();
c->ctx->php_v8js_objects.remove(c);
c->ctx->v8js_v8objects.remove(c);
}
efree(object);
@ -480,9 +480,9 @@ static void php_v8js_v8_free_storage(void *object, zend_object_handle handle TSR
static zend_object_value php_v8js_v8_new(zend_class_entry *ce TSRMLS_DC) /* {{{ */
{
zend_object_value retval;
php_v8js_object *c;
v8js_v8object *c;
c = (php_v8js_object *) ecalloc(1, sizeof(*c));
c = (v8js_v8object *) ecalloc(1, sizeof(*c));
zend_object_std_init(&c->std, ce TSRMLS_CC);
new(&c->v8obj) v8::Persistent<v8::Value>();
@ -562,18 +562,18 @@ PHP_METHOD(V8Function, __wakeup)
void php_v8js_create_v8(zval *res, v8::Handle<v8::Value> value, int flags, v8::Isolate *isolate TSRMLS_DC) /* {{{ */
{
php_v8js_ctx *ctx = (php_v8js_ctx *) isolate->GetData(0);
php_v8js_object *c;
v8js_v8object *c;
object_init_ex(res, value->IsFunction() ? php_ce_v8_function : php_ce_v8_object);
c = (php_v8js_object *) zend_object_store_get_object(res TSRMLS_CC);
c = (v8js_v8object *) zend_object_store_get_object(res TSRMLS_CC);
c->v8obj.Reset(isolate, value);
c->flags = flags;
c->ctx = ctx;
c->properties = NULL;
ctx->php_v8js_objects.push_front(c);
ctx->v8js_v8objects.push_front(c);
}
/* }}} */