Refactor array access code into seperate files

config.m4

@@ -123,7 +123,7 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <v8-debug.h>]],
     CPPFLAGS=$old_CPPFLAGS
   ]);
   
-  PHP_NEW_EXTENSION(v8js, v8js.cc v8js_convert.cc v8js_methods.cc v8js_variables.cc v8js_commonjs.cc, $ext_shared, , "-std="$ac_cv_v8_cstd)
+  PHP_NEW_EXTENSION(v8js, v8js.cc v8js_array_access.cc v8js_convert.cc v8js_methods.cc v8js_variables.cc v8js_commonjs.cc, $ext_shared, , "-std="$ac_cv_v8_cstd)
 
   PHP_ADD_MAKEFILE_FRAGMENT
 fi

v8js_array_access.cc

@@ -0,0 +1,125 @@
+/*
+  +----------------------------------------------------------------------+
+  | PHP Version 5                                                        |
+  +----------------------------------------------------------------------+
+  | Copyright (c) 1997-2013 The PHP Group                                |
+  +----------------------------------------------------------------------+
+  | http://www.opensource.org/licenses/mit-license.php  MIT License      |
+  +----------------------------------------------------------------------+
+  | Author: Stefan Siegl <[email protected]>                          |
+  +----------------------------------------------------------------------+
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+extern "C" {
+#include "php.h"
+#include "ext/date/php_date.h"
+#include "ext/standard/php_string.h"
+#include "zend_interfaces.h"
+#include "zend_closures.h"
+}
+
+#include "php_v8js_macros.h"
+#include "v8js_array_access.h"
+
+static void php_v8js_array_access_getter(uint32_t index, const v8::PropertyCallbackInfo<v8::Value>& info) /* {{{ */
+{
+	v8::Isolate *isolate = info.GetIsolate();
+	v8::Local<v8::Object> self = info.Holder();
+
+	zval *object = reinterpret_cast<zval *>(self->GetAlignedPointerFromInternalField(0));
+	zend_class_entry *ce = Z_OBJCE_P(object);
+
+	/* Okay, let's call offsetGet. */
+	zend_fcall_info fci;
+	zval *php_value;
+
+	zval fmember;
+	INIT_ZVAL(fmember);
+	ZVAL_STRING(&fmember, "offsetGet", 0);
+
+	zval zindex;
+	INIT_ZVAL(zindex);
+	ZVAL_LONG(&zindex, index);
+
+	fci.size = sizeof(fci);
+	fci.function_table = &ce->function_table;
+	fci.function_name = &fmember;
+	fci.symbol_table = NULL;
+	fci.retval_ptr_ptr = &php_value;
+
+	zval *zindex_ptr = &zindex;
+	zval **zindex_ptr_ptr = &zindex_ptr;
+	fci.param_count = 1;
+	fci.params = &zindex_ptr_ptr;
+
+	fci.object_ptr = object;
+	fci.no_separation = 0;
+
+	zend_call_function(&fci, NULL TSRMLS_CC);
+
+	v8::Local<v8::Value> ret_value = zval_to_v8js(php_value, isolate TSRMLS_CC);
+	zval_ptr_dtor(&php_value);
+
+	info.GetReturnValue().Set(ret_value);
+}
+/* }}} */
+
+static void php_v8js_array_access_length(v8::Local<v8::String> property, const v8::PropertyCallbackInfo<v8::Value>& info) /* {{{ */
+{
+	v8::Isolate *isolate = info.GetIsolate();
+	v8::Local<v8::Object> self = info.Holder();
+
+	zval *object = reinterpret_cast<zval *>(self->GetAlignedPointerFromInternalField(0));
+	zend_class_entry *ce = Z_OBJCE_P(object);
+
+	zend_fcall_info fci;
+	zval *php_value;
+
+	zval fmember;
+	INIT_ZVAL(fmember);
+	ZVAL_STRING(&fmember, "count", 0);
+
+	fci.size = sizeof(fci);
+	fci.function_table = &ce->function_table;
+	fci.function_name = &fmember;
+	fci.symbol_table = NULL;
+	fci.retval_ptr_ptr = &php_value;
+
+	fci.param_count = 0;
+	fci.params = NULL;
+
+	fci.object_ptr = object;
+	fci.no_separation = 0;
+
+	zend_call_function(&fci, NULL TSRMLS_CC);
+
+	v8::Local<v8::Value> ret_value = zval_to_v8js(php_value, isolate TSRMLS_CC);
+	zval_ptr_dtor(&php_value);
+
+	info.GetReturnValue().Set(ret_value);
+}
+/* }}} */
+
+
+v8::Handle<v8::Value> php_v8js_array_access_to_jsobj(zval *value, v8::Isolate *isolate TSRMLS_DC) /* {{{ */
+{
+	v8::Local<v8::ObjectTemplate> inst_tpl = v8::ObjectTemplate::New(isolate);
+	inst_tpl->SetIndexedPropertyHandler(php_v8js_array_access_getter);
+	inst_tpl->SetAccessor(V8JS_STR("length"), php_v8js_array_access_length);
+	inst_tpl->SetInternalFieldCount(1);
+
+	v8::Handle<v8::Object> newobj = inst_tpl->NewInstance();
+	newobj->SetAlignedPointerInInternalField(0, value);
+
+	/* Change prototype of `newobj' to that of Array */
+	v8::Local<v8::Array> arr = v8::Array::New(isolate);
+	newobj->SetPrototype(arr->GetPrototype());
+
+	return newobj;
+}
+/* }}} */
+

v8js_array_access.h

@@ -0,0 +1,18 @@
+/*
+  +----------------------------------------------------------------------+
+  | PHP Version 5                                                        |
+  +----------------------------------------------------------------------+
+  | Copyright (c) 1997-2013 The PHP Group                                |
+  +----------------------------------------------------------------------+
+  | http://www.opensource.org/licenses/mit-license.php  MIT License      |
+  +----------------------------------------------------------------------+
+  | Author: Stefan Siegl <[email protected]>                          |
+  +----------------------------------------------------------------------+
+*/
+
+#ifndef V8JS_ARRAY_ACCESS_H
+#define V8JS_ARRAY_ACCESS_H
+
+v8::Handle<v8::Value> php_v8js_array_access_to_jsobj(zval *value, v8::Isolate *isolate TSRMLS_DC);
+
+#endif /* V8JS_ARRAY_ACCESS_H */

v8js_convert.cc

@@ -26,7 +26,8 @@ extern "C" {
 }
 
 #include "php_v8js_macros.h"
-#include <v8.h>
+#include "v8js_array_access.h"
+
 #include <stdexcept>
 #include <limits>
 
@@ -866,105 +867,6 @@ static void php_v8js_named_property_deleter(v8::Local<v8::String> property, cons
 }
 /* }}} */
 
-static void php_v8js_array_access_getter(uint32_t index, const v8::PropertyCallbackInfo<v8::Value>& info) /* {{{ */
-{
-	v8::Isolate *isolate = info.GetIsolate();
-	v8::Local<v8::Object> self = info.Holder();
-
-	zval *object = reinterpret_cast<zval *>(self->GetAlignedPointerFromInternalField(0));
-	zend_class_entry *ce = Z_OBJCE_P(object);
-
-	/* Okay, let's call offsetGet. */
-	zend_fcall_info fci;
-	zval *php_value;
-
-	zval fmember;
-	INIT_ZVAL(fmember);
-	ZVAL_STRING(&fmember, "offsetGet", 0);
-
-	zval zindex;
-	INIT_ZVAL(zindex);
-	ZVAL_LONG(&zindex, index);
-
-	fci.size = sizeof(fci);
-	fci.function_table = &ce->function_table;
-	fci.function_name = &fmember;
-	fci.symbol_table = NULL;
-	fci.retval_ptr_ptr = &php_value;
-
-	zval *zindex_ptr = &zindex;
-	zval **zindex_ptr_ptr = &zindex_ptr;
-	fci.param_count = 1;
-	fci.params = &zindex_ptr_ptr;
-
-	fci.object_ptr = object;
-	fci.no_separation = 0;
-
-	zend_call_function(&fci, NULL TSRMLS_CC);
-
-	v8::Local<v8::Value> ret_value = zval_to_v8js(php_value, isolate TSRMLS_CC);
-	zval_ptr_dtor(&php_value);
-
-	info.GetReturnValue().Set(ret_value);
-}
-/* }}} */
-
-static void php_v8js_array_access_length(v8::Local<v8::String> property, const v8::PropertyCallbackInfo<v8::Value>& info) /* {{{ */
-{
-	v8::Isolate *isolate = info.GetIsolate();
-	v8::Local<v8::Object> self = info.Holder();
-
-	zval *object = reinterpret_cast<zval *>(self->GetAlignedPointerFromInternalField(0));
-	zend_class_entry *ce = Z_OBJCE_P(object);
-
-	zend_fcall_info fci;
-	zval *php_value;
-
-	zval fmember;
-	INIT_ZVAL(fmember);
-	ZVAL_STRING(&fmember, "count", 0);
-
-	fci.size = sizeof(fci);
-	fci.function_table = &ce->function_table;
-	fci.function_name = &fmember;
-	fci.symbol_table = NULL;
-	fci.retval_ptr_ptr = &php_value;
-
-	fci.param_count = 0;
-	fci.params = NULL;
-
-	fci.object_ptr = object;
-	fci.no_separation = 0;
-
-	zend_call_function(&fci, NULL TSRMLS_CC);
-
-	v8::Local<v8::Value> ret_value = zval_to_v8js(php_value, isolate TSRMLS_CC);
-	zval_ptr_dtor(&php_value);
-
-	info.GetReturnValue().Set(ret_value);
-}
-/* }}} */
-
-
-static v8::Handle<v8::Value> php_v8js_array_access_to_jsobj(zval *value, v8::Isolate *isolate TSRMLS_DC) /* {{{ */
-{
-	v8::Local<v8::ObjectTemplate> inst_tpl = v8::ObjectTemplate::New(isolate);
-	inst_tpl->SetIndexedPropertyHandler(php_v8js_array_access_getter);
-	inst_tpl->SetAccessor(V8JS_STR("length"), php_v8js_array_access_length);
-	inst_tpl->SetInternalFieldCount(1);
-
-	v8::Handle<v8::Object> newobj = inst_tpl->NewInstance();
-	newobj->SetAlignedPointerInInternalField(0, value);
-
-	/* Change prototype of `newobj' to that of Array */
-	v8::Local<v8::Array> arr = v8::Array::New(isolate);
-	newobj->SetPrototype(arr->GetPrototype());
-
-	return newobj;
-}
-/* }}} */
-
-
 static v8::Handle<v8::Value> php_v8js_hash_to_jsobj(zval *value, v8::Isolate *isolate TSRMLS_DC) /* {{{ */
 {
 	v8::Handle<v8::Object> newobj;