Used latest Zephir

ext/config.m4

@@ -9,7 +9,7 @@ if test "$PHP_PHALCON" = "yes"; then
 	fi
 
 	AC_DEFINE(HAVE_PHALCON, 1, [Whether you have Phalcon])
-	phalcon_sources="phalcon.c kernel/main.c kernel/memory.c kernel/exception.c kernel/hash.c kernel/debug.c kernel/backtrace.c kernel/object.c kernel/array.c kernel/extended/array.c kernel/string.c kernel/fcall.c kernel/extended/fcall.c kernel/require.c kernel/file.c kernel/operators.c kernel/math.c kernel/concat.c kernel/variables.c kernel/filter.c kernel/iterator.c kernel/time.c kernel/exit.c phalcon/di/injectionawareinterface.zep.c
+	phalcon_sources="phalcon.c kernel/main.c kernel/memory.c kernel/exception.c kernel/debug.c kernel/backtrace.c kernel/object.c kernel/array.c kernel/string.c kernel/fcall.c kernel/extended/fcall.c kernel/require.c kernel/file.c kernel/operators.c kernel/math.c kernel/concat.c kernel/variables.c kernel/filter.c kernel/iterator.c kernel/time.c kernel/exit.c phalcon/di/injectionawareinterface.zep.c
 	phalcon/exception.zep.c
 	phalcon/events/eventsawareinterface.zep.c
 	phalcon/validation/validatorinterface.zep.c

ext/config.w32

@@ -1,8 +1,8 @@
 ARG_ENABLE("phalcon", "enable phalcon", "no");
 if (PHP_PHALCON != "no") {
   EXTENSION("phalcon", "phalcon.c", null, "-I"+configure_module_dirname);
-  ADD_SOURCES(configure_module_dirname + "/kernel", "main.c memory.c exception.c hash.c debug.c backtrace.c object.c array.c string.c fcall.c require.c file.c operators.c math.c concat.c variables.c filter.c iterator.c exit.c time.c", "phalcon");
-  ADD_SOURCES(configure_module_dirname + "/kernel/extended", "array.c fcall.c", "phalcon");
+  ADD_SOURCES(configure_module_dirname + "/kernel", "main.c memory.c exception.c debug.c backtrace.c object.c array.c string.c fcall.c require.c file.c operators.c math.c concat.c variables.c filter.c iterator.c exit.c time.c", "phalcon");
+  ADD_SOURCES(configure_module_dirname + "/kernel/extended", "fcall.c", "phalcon");
   /* PCRE is always included on WIN32 */
   AC_DEFINE("ZEPHIR_USE_PHP_PCRE", 1, "Whether PHP pcre extension is present at compile time");
   if (PHP_JSON != "no") {

ext/kernel/array.c

@@ -3,7 +3,7 @@
   +------------------------------------------------------------------------+
   | Zephir Language                                                        |
   +------------------------------------------------------------------------+
-  | Copyright (c) 2011-2016 Zephir Team (http://www.zephir-lang.com)       |
+  | Copyright (c) 2011-2017 Zephir Team (http://www.zephir-lang.com)       |
   +------------------------------------------------------------------------+
   | This source file is subject to the New BSD License that is bundled     |
   | with this package in the file docs/LICENSE.txt.                        |
@@ -32,9 +32,27 @@
 #include "kernel/debug.h"
 #include "kernel/array.h"
 #include "kernel/operators.h"
-#include "kernel/hash.h"
 #include "kernel/backtrace.h"
 
+static zval zephir_get_current_key_w(const HashTable *hash_table, HashPosition *hash_position)
+{
+	Bucket *p;
+	zval result;
+
+	INIT_ZVAL(result);
+	p = hash_position ? (*hash_position) : hash_table->pInternalPointer;
+
+	if (p) {
+		if (p->nKeyLength) {
+			ZVAL_STRINGL(&result, (char *) p->arKey, p->nKeyLength - 1, 0);
+		} else {
+			ZVAL_LONG(&result, p->h);
+		}
+	}
+
+	return result;
+}
+
 /**
  * @brief Fetches @a index if it exists from the array @a arr
  * @param[out] fetched <code>&$arr[$index]</code>; @a fetched is modified only when the function returns 1
@@ -64,7 +82,7 @@ int zephir_array_isset_fetch(zval **fetched, const zval *arr, zval *index, int r
 	h = Z_ARRVAL_P(arr);
 	switch (Z_TYPE_P(index)) {
 		case IS_NULL:
-			result = zephir_hash_find(h, SS(""), (void**)&val);
+			result = zend_hash_find(h, SS(""), (void**)&val);
 			break;
 
 		case IS_DOUBLE:
@@ -109,8 +127,8 @@ int zephir_array_isset_quick_string_fetch(zval **fetched, zval *arr, char *index
 
 	zval **zv;
 
-	if (likely(Z_TYPE_P(arr) == IS_ARRAY)) {
-		if (zephir_hash_quick_find(Z_ARRVAL_P(arr), index, index_length, key, (void**) &zv) == SUCCESS) {
+	if (EXPECTED(Z_TYPE_P(arr) == IS_ARRAY)) {
+		if (zend_hash_quick_find(Z_ARRVAL_P(arr), index, index_length, key, (void**) &zv) == SUCCESS) {
 			*fetched = *zv;
 			if (!readonly) {
 				Z_ADDREF_P(*fetched);
@@ -135,7 +153,7 @@ int zephir_array_isset_long_fetch(zval **fetched, zval *arr, unsigned long index
 
 	zval **zv;
 
-	if (likely(Z_TYPE_P(arr) == IS_ARRAY)) {
+	if (EXPECTED(Z_TYPE_P(arr) == IS_ARRAY)) {
 		if (zend_hash_index_find(Z_ARRVAL_P(arr), index, (void**)&zv) == SUCCESS) {
 			*fetched = *zv;
 			if (!readonly) {
@@ -173,7 +191,7 @@ int ZEPHIR_FASTCALL zephir_array_isset(const zval *arr, zval *index) {
 	h = Z_ARRVAL_P(arr);
 	switch (Z_TYPE_P(index)) {
 		case IS_NULL:
-			return zephir_hash_exists(h, SS(""));
+			return zend_hash_exists(h, SS(""));
 
 		case IS_DOUBLE:
 			return zend_hash_index_exists(h, (ulong)Z_DVAL_P(index));
@@ -220,7 +238,7 @@ int ZEPHIR_FASTCALL zephir_array_isset_string(const zval *arr, const char *index
  */
 int ZEPHIR_FASTCALL zephir_array_isset_quick_string(const zval *arr, const char *index, uint index_length, unsigned long key) {
 
-	if (likely(Z_TYPE_P(arr) == IS_ARRAY)) {
+	if (EXPECTED(Z_TYPE_P(arr) == IS_ARRAY)) {
 		return zend_hash_quick_exists(Z_ARRVAL_P(arr), index, index_length, key);
 	}
 
@@ -237,7 +255,7 @@ int ZEPHIR_FASTCALL zephir_array_isset_quick_string(const zval *arr, const char
  */
 int ZEPHIR_FASTCALL zephir_array_isset_long(const zval *arr, unsigned long index) {
 
-	if (likely(Z_TYPE_P(arr) == IS_ARRAY)) {
+	if (EXPECTED(Z_TYPE_P(arr) == IS_ARRAY)) {
 		return zend_hash_index_exists(Z_ARRVAL_P(arr), index);
 	}
 
@@ -807,7 +825,7 @@ int zephir_array_fetch(zval **return_value, zval *arr, zval *index, int flags ZE
 		ht = Z_ARRVAL_P(arr);
 		switch (Z_TYPE_P(index)) {
 			case IS_NULL:
-				result = zephir_hash_find(ht, SS(""), (void**) &zv);
+				result = zend_hash_find(ht, SS(""), (void**) &zv);
 				sidx   = "";
 				break;
 
@@ -879,8 +897,8 @@ int zephir_array_fetch_quick_string(zval **return_value, zval *arr, const char *
 
 	zval **zv;
 
-	if (likely(Z_TYPE_P(arr) == IS_ARRAY)) {
-		if (zephir_hash_quick_find(Z_ARRVAL_P(arr), index, index_length, key, (void**) &zv) == SUCCESS) {
+	if (EXPECTED(Z_TYPE_P(arr) == IS_ARRAY)) {
+		if (zend_hash_quick_find(Z_ARRVAL_P(arr), index, index_length, key, (void**) &zv) == SUCCESS) {
 			*return_value = *zv;
 			if ((flags & PH_READONLY) != PH_READONLY) {
 				Z_ADDREF_PP(return_value);
@@ -942,7 +960,7 @@ int zephir_array_fetch_long(zval **return_value, zval *arr, unsigned long index,
 
 	zval **zv;
 
-	if (likely(Z_TYPE_P(arr) == IS_ARRAY)) {
+	if (EXPECTED(Z_TYPE_P(arr) == IS_ARRAY)) {
 		if (zend_hash_index_find(Z_ARRVAL_P(arr), index, (void**)&zv) == SUCCESS) {
 			*return_value = *zv;
 			if ((flags & PH_READONLY) != PH_READONLY) {
@@ -1135,7 +1153,7 @@ void zephir_array_merge_recursive_n(zval **a1, zval *a2 TSRMLS_DC)
  */
 void zephir_array_unshift(zval *arr, zval *arg TSRMLS_DC)
 {
-	if (likely(Z_TYPE_P(arr) == IS_ARRAY)) {
+	if (EXPECTED(Z_TYPE_P(arr) == IS_ARRAY)) {
 
 		zval** args[1]      = { &arg };
 
@@ -1167,7 +1185,7 @@ void zephir_array_keys(zval *return_value, zval *input TSRMLS_DC)
 	ulong  num_key;
 	HashPosition pos;
 
-	if (likely(Z_TYPE_P(input) == IS_ARRAY)) {
+	if (EXPECTED(Z_TYPE_P(input) == IS_ARRAY)) {
 
 		array_init_size(return_value, zend_hash_num_elements(Z_ARRVAL_P(input)));
 
@@ -1197,7 +1215,7 @@ void zephir_array_keys(zval *return_value, zval *input TSRMLS_DC)
 
 void zephir_array_values(zval *return_value, zval *arr)
 {
-	if (likely(Z_TYPE_P(arr) == IS_ARRAY)) {
+	if (EXPECTED(Z_TYPE_P(arr) == IS_ARRAY)) {
 		zval **entry;
 		HashPosition pos;
 
@@ -1238,7 +1256,7 @@ int zephir_array_key_exists(zval *arr, zval *key TSRMLS_DC)
 
 int zephir_array_is_associative(zval *arr) {
 
-	if (likely(Z_TYPE_P(arr) == IS_ARRAY)) {
+	if (EXPECTED(Z_TYPE_P(arr) == IS_ARRAY)) {
 		HashPosition pos;
 		zval **entry;
 		char *skey;
@@ -1481,7 +1499,7 @@ void ZEPHIR_FASTCALL zephir_create_array(zval *return_value, uint size, int init
 	if (size > 0) {
 
 		hashTable = (HashTable *) emalloc(sizeof(HashTable));
-		zephir_hash_init(hashTable, size, NULL, ZVAL_PTR_DTOR, 0);
+		zend_hash_init(hashTable, size, NULL, ZVAL_PTR_DTOR, 0);
 
 		if (initialize) {
 

ext/kernel/array.h

@@ -3,7 +3,7 @@
   +------------------------------------------------------------------------+
   | Zephir Language                                                        |
   +------------------------------------------------------------------------+
-  | Copyright (c) 2011-2016 Zephir Team (http://www.zephir-lang.com)       |
+  | Copyright (c) 2011-2017 Zephir Team (http://www.zephir-lang.com)       |
   +------------------------------------------------------------------------+
   | This source file is subject to the New BSD License that is bundled     |
   | with this package in the file docs/LICENSE.txt.                        |

ext/kernel/backtrace.c

@@ -3,7 +3,7 @@
   +------------------------------------------------------------------------+
   | Zephir Language                                                        |
   +------------------------------------------------------------------------+
-  | Copyright (c) 2011-2016 Zephir Team (http://www.zephir-lang.com)       |
+  | Copyright (c) 2011-2017 Zephir Team (http://www.zephir-lang.com)       |
   +------------------------------------------------------------------------+
   | This source file is subject to the New BSD License that is bundled     |
   | with this package in the file docs/LICENSE.txt.                        |

ext/kernel/backtrace.h

@@ -3,7 +3,7 @@
   +------------------------------------------------------------------------+
   | Zephir Language                                                        |
   +------------------------------------------------------------------------+
-  | Copyright (c) 2011-2016 Zephir Team (http://www.zephir-lang.com)       |
+  | Copyright (c) 2011-2017 Zephir Team (http://www.zephir-lang.com)       |
   +------------------------------------------------------------------------+
   | This source file is subject to the New BSD License that is bundled     |
   | with this package in the file docs/LICENSE.txt.                        |
@@ -23,7 +23,7 @@
 
 #ifndef ZEPHIR_RELEASE
 
-extern void zephir_print_backtrace(void);
+void zephir_print_backtrace(void);
 
 #else
 

ext/kernel/debug.c

@@ -3,7 +3,7 @@
   +------------------------------------------------------------------------+
   | Zephir Language                                                        |
   +------------------------------------------------------------------------+
-  | Copyright (c) 2011-2016 Zephir Team (http://www.zephir-lang.com)       |
+  | Copyright (c) 2011-2017 Zephir Team (http://www.zephir-lang.com)       |
   +------------------------------------------------------------------------+
   | This source file is subject to the New BSD License that is bundled     |
   | with this package in the file docs/LICENSE.txt.                        |

ext/kernel/debug.h

@@ -3,7 +3,7 @@
   +------------------------------------------------------------------------+
   | Zephir Language                                                        |
   +------------------------------------------------------------------------+
-  | Copyright (c) 2011-2016 Zephir Team (http://www.zephir-lang.com)       |
+  | Copyright (c) 2011-2017 Zephir Team (http://www.zephir-lang.com)       |
   +------------------------------------------------------------------------+
   | This source file is subject to the New BSD License that is bundled     |
   | with this package in the file docs/LICENSE.txt.                        |
@@ -65,4 +65,4 @@ int zephir_error_space();
 int zephir_debug_space();
 
 #endif
-#endif
+#endif

ext/kernel/exception.c

@@ -3,7 +3,7 @@
   +------------------------------------------------------------------------+
   | Zephir Language                                                        |
   +------------------------------------------------------------------------+
-  | Copyright (c) 2011-2016 Zephir Team (http://www.zephir-lang.com)       |
+  | Copyright (c) 2011-2017 Zephir Team (http://www.zephir-lang.com)       |
   +------------------------------------------------------------------------+
   | This source file is subject to the New BSD License that is bundled     |
   | with this package in the file docs/LICENSE.txt.                        |

ext/kernel/exception.h

@@ -3,7 +3,7 @@
   +------------------------------------------------------------------------+
   | Zephir Language                                                        |
   +------------------------------------------------------------------------+
-  | Copyright (c) 2011-2016 Zephir Team (http://www.zephir-lang.com)       |
+  | Copyright (c) 2011-2017 Zephir Team (http://www.zephir-lang.com)       |
   +------------------------------------------------------------------------+
   | This source file is subject to the New BSD License that is bundled     |
   | with this package in the file docs/LICENSE.txt.                        |

ext/kernel/exit.c

@@ -2,7 +2,7 @@
   +------------------------------------------------------------------------+
   | Zephir Language                                                        |
   +------------------------------------------------------------------------+
-  | Copyright (c) 2011-2016 Zephir Team (http://www.zephir-lang.com)       |
+  | Copyright (c) 2011-2017 Zephir Team (http://www.zephir-lang.com)       |
   +------------------------------------------------------------------------+
   | This source file is subject to the New BSD License that is bundled     |
   | with this package in the file docs/LICENSE.txt.                        |
@@ -26,8 +26,8 @@
 #include "kernel/main.h"
 #include "kernel/exit.h"
 
-void zephir_exit_empty() {
-	TSRMLS_FETCH();
+void zephir_exit_empty()
+{
 	zend_bailout();
 }
 

ext/kernel/exit.h

@@ -3,7 +3,7 @@
   +------------------------------------------------------------------------+
   | Zephir Language                                                        |
   +------------------------------------------------------------------------+
-  | Copyright (c) 2011-2016 Zephir Team (http://www.zephir-lang.com)       |
+  | Copyright (c) 2011-2017 Zephir Team (http://www.zephir-lang.com)       |
   +------------------------------------------------------------------------+
   | This source file is subject to the New BSD License that is bundled     |
   | with this package in the file docs/LICENSE.txt.                        |