Skip to content

Commit 6ef079c

Browse files
sergeyklaysergeyklay
committed
Used latest Zephir
1 parent c1625c2 commit 6ef079c

File tree

229 files changed

+2643
-3311
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

229 files changed

+2643
-3311
lines changed

‎ext/config.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ if test "$PHP_PHALCON" = "yes"; then
99
fi
1010

1111
AC_DEFINE(HAVE_PHALCON, 1, [Whether you have Phalcon])
12-
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
12+
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
1313
phalcon/exception.zep.c
1414
phalcon/events/eventsawareinterface.zep.c
1515
phalcon/validation/validatorinterface.zep.c

‎ext/config.w32

+89-88
Large diffs are not rendered by default.

‎ext/kernel/array.c

+36-18
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
+------------------------------------------------------------------------+
44
| Zephir Language |
55
+------------------------------------------------------------------------+
6-
| Copyright (c) 2011-2016 Zephir Team (http://www.zephir-lang.com) |
6+
| Copyright (c) 2011-2017 Zephir Team (http://www.zephir-lang.com) |
77
+------------------------------------------------------------------------+
88
| This source file is subject to the New BSD License that is bundled |
99
| with this package in the file docs/LICENSE.txt. |
@@ -32,9 +32,27 @@
3232
#include "kernel/debug.h"
3333
#include "kernel/array.h"
3434
#include "kernel/operators.h"
35-
#include "kernel/hash.h"
3635
#include "kernel/backtrace.h"
3736

37+
static zval zephir_get_current_key_w(const HashTable *hash_table, HashPosition *hash_position)
38+
{
39+
Bucket *p;
40+
zval result;
41+
42+
INIT_ZVAL(result);
43+
p = hash_position ? (*hash_position) : hash_table->pInternalPointer;
44+
45+
if (p) {
46+
if (p->nKeyLength) {
47+
ZVAL_STRINGL(&result, (char *) p->arKey, p->nKeyLength - 1, 0);
48+
} else {
49+
ZVAL_LONG(&result, p->h);
50+
}
51+
}
52+
53+
return result;
54+
}
55+
3856
/**
3957
* @brief Fetches @a index if it exists from the array @a arr
4058
* @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
6482
h = Z_ARRVAL_P(arr);
6583
switch (Z_TYPE_P(index)) {
6684
case IS_NULL:
67-
result = zephir_hash_find(h, SS(""), (void**)&val);
85+
result = zend_hash_find(h, SS(""), (void**)&val);
6886
break;
6987

7088
case IS_DOUBLE:
@@ -109,8 +127,8 @@ int zephir_array_isset_quick_string_fetch(zval **fetched, zval *arr, char *index
109127

110128
zval **zv;
111129

112-
if (likely(Z_TYPE_P(arr) == IS_ARRAY)) {
113-
if (zephir_hash_quick_find(Z_ARRVAL_P(arr), index, index_length, key, (void**) &zv) == SUCCESS) {
130+
if (EXPECTED(Z_TYPE_P(arr) == IS_ARRAY)) {
131+
if (zend_hash_quick_find(Z_ARRVAL_P(arr), index, index_length, key, (void**) &zv) == SUCCESS) {
114132
*fetched = *zv;
115133
if (!readonly) {
116134
Z_ADDREF_P(*fetched);
@@ -135,7 +153,7 @@ int zephir_array_isset_long_fetch(zval **fetched, zval *arr, unsigned long index
135153

136154
zval **zv;
137155

138-
if (likely(Z_TYPE_P(arr) == IS_ARRAY)) {
156+
if (EXPECTED(Z_TYPE_P(arr) == IS_ARRAY)) {
139157
if (zend_hash_index_find(Z_ARRVAL_P(arr), index, (void**)&zv) == SUCCESS) {
140158
*fetched = *zv;
141159
if (!readonly) {
@@ -173,7 +191,7 @@ int ZEPHIR_FASTCALL zephir_array_isset(const zval *arr, zval *index) {
173191
h = Z_ARRVAL_P(arr);
174192
switch (Z_TYPE_P(index)) {
175193
case IS_NULL:
176-
return zephir_hash_exists(h, SS(""));
194+
return zend_hash_exists(h, SS(""));
177195

178196
case IS_DOUBLE:
179197
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
220238
*/
221239
int ZEPHIR_FASTCALL zephir_array_isset_quick_string(const zval *arr, const char *index, uint index_length, unsigned long key) {
222240

223-
if (likely(Z_TYPE_P(arr) == IS_ARRAY)) {
241+
if (EXPECTED(Z_TYPE_P(arr) == IS_ARRAY)) {
224242
return zend_hash_quick_exists(Z_ARRVAL_P(arr), index, index_length, key);
225243
}
226244

@@ -237,7 +255,7 @@ int ZEPHIR_FASTCALL zephir_array_isset_quick_string(const zval *arr, const char
237255
*/
238256
int ZEPHIR_FASTCALL zephir_array_isset_long(const zval *arr, unsigned long index) {
239257

240-
if (likely(Z_TYPE_P(arr) == IS_ARRAY)) {
258+
if (EXPECTED(Z_TYPE_P(arr) == IS_ARRAY)) {
241259
return zend_hash_index_exists(Z_ARRVAL_P(arr), index);
242260
}
243261

@@ -807,7 +825,7 @@ int zephir_array_fetch(zval **return_value, zval *arr, zval *index, int flags ZE
807825
ht = Z_ARRVAL_P(arr);
808826
switch (Z_TYPE_P(index)) {
809827
case IS_NULL:
810-
result = zephir_hash_find(ht, SS(""), (void**) &zv);
828+
result = zend_hash_find(ht, SS(""), (void**) &zv);
811829
sidx = "";
812830
break;
813831

@@ -879,8 +897,8 @@ int zephir_array_fetch_quick_string(zval **return_value, zval *arr, const char *
879897

880898
zval **zv;
881899

882-
if (likely(Z_TYPE_P(arr) == IS_ARRAY)) {
883-
if (zephir_hash_quick_find(Z_ARRVAL_P(arr), index, index_length, key, (void**) &zv) == SUCCESS) {
900+
if (EXPECTED(Z_TYPE_P(arr) == IS_ARRAY)) {
901+
if (zend_hash_quick_find(Z_ARRVAL_P(arr), index, index_length, key, (void**) &zv) == SUCCESS) {
884902
*return_value = *zv;
885903
if ((flags & PH_READONLY) != PH_READONLY) {
886904
Z_ADDREF_PP(return_value);
@@ -942,7 +960,7 @@ int zephir_array_fetch_long(zval **return_value, zval *arr, unsigned long index,
942960

943961
zval **zv;
944962

945-
if (likely(Z_TYPE_P(arr) == IS_ARRAY)) {
963+
if (EXPECTED(Z_TYPE_P(arr) == IS_ARRAY)) {
946964
if (zend_hash_index_find(Z_ARRVAL_P(arr), index, (void**)&zv) == SUCCESS) {
947965
*return_value = *zv;
948966
if ((flags & PH_READONLY) != PH_READONLY) {
@@ -1135,7 +1153,7 @@ void zephir_array_merge_recursive_n(zval **a1, zval *a2 TSRMLS_DC)
11351153
*/
11361154
void zephir_array_unshift(zval *arr, zval *arg TSRMLS_DC)
11371155
{
1138-
if (likely(Z_TYPE_P(arr) == IS_ARRAY)) {
1156+
if (EXPECTED(Z_TYPE_P(arr) == IS_ARRAY)) {
11391157

11401158
zval** args[1] = { &arg };
11411159

@@ -1167,7 +1185,7 @@ void zephir_array_keys(zval *return_value, zval *input TSRMLS_DC)
11671185
ulong num_key;
11681186
HashPosition pos;
11691187

1170-
if (likely(Z_TYPE_P(input) == IS_ARRAY)) {
1188+
if (EXPECTED(Z_TYPE_P(input) == IS_ARRAY)) {
11711189

11721190
array_init_size(return_value, zend_hash_num_elements(Z_ARRVAL_P(input)));
11731191

@@ -1197,7 +1215,7 @@ void zephir_array_keys(zval *return_value, zval *input TSRMLS_DC)
11971215

11981216
void zephir_array_values(zval *return_value, zval *arr)
11991217
{
1200-
if (likely(Z_TYPE_P(arr) == IS_ARRAY)) {
1218+
if (EXPECTED(Z_TYPE_P(arr) == IS_ARRAY)) {
12011219
zval **entry;
12021220
HashPosition pos;
12031221

@@ -1238,7 +1256,7 @@ int zephir_array_key_exists(zval *arr, zval *key TSRMLS_DC)
12381256

12391257
int zephir_array_is_associative(zval *arr) {
12401258

1241-
if (likely(Z_TYPE_P(arr) == IS_ARRAY)) {
1259+
if (EXPECTED(Z_TYPE_P(arr) == IS_ARRAY)) {
12421260
HashPosition pos;
12431261
zval **entry;
12441262
char *skey;
@@ -1481,7 +1499,7 @@ void ZEPHIR_FASTCALL zephir_create_array(zval *return_value, uint size, int init
14811499
if (size > 0) {
14821500

14831501
hashTable = (HashTable *) emalloc(sizeof(HashTable));
1484-
zephir_hash_init(hashTable, size, NULL, ZVAL_PTR_DTOR, 0);
1502+
zend_hash_init(hashTable, size, NULL, ZVAL_PTR_DTOR, 0);
14851503

14861504
if (initialize) {
14871505

‎ext/kernel/array.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
+------------------------------------------------------------------------+
44
| Zephir Language |
55
+------------------------------------------------------------------------+
6-
| Copyright (c) 2011-2016 Zephir Team (http://www.zephir-lang.com) |
6+
| Copyright (c) 2011-2017 Zephir Team (http://www.zephir-lang.com) |
77
+------------------------------------------------------------------------+
88
| This source file is subject to the New BSD License that is bundled |
99
| with this package in the file docs/LICENSE.txt. |

‎ext/kernel/assert.c

-47
This file was deleted.

‎ext/kernel/assert.h

-31
This file was deleted.

‎ext/kernel/backtrace.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
+------------------------------------------------------------------------+
44
| Zephir Language |
55
+------------------------------------------------------------------------+
6-
| Copyright (c) 2011-2016 Zephir Team (http://www.zephir-lang.com) |
6+
| Copyright (c) 2011-2017 Zephir Team (http://www.zephir-lang.com) |
77
+------------------------------------------------------------------------+
88
| This source file is subject to the New BSD License that is bundled |
99
| with this package in the file docs/LICENSE.txt. |

‎ext/kernel/backtrace.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
+------------------------------------------------------------------------+
44
| Zephir Language |
55
+------------------------------------------------------------------------+
6-
| Copyright (c) 2011-2016 Zephir Team (http://www.zephir-lang.com) |
6+
| Copyright (c) 2011-2017 Zephir Team (http://www.zephir-lang.com) |
77
+------------------------------------------------------------------------+
88
| This source file is subject to the New BSD License that is bundled |
99
| with this package in the file docs/LICENSE.txt. |
@@ -23,7 +23,7 @@
2323

2424
#ifndef ZEPHIR_RELEASE
2525

26-
extern void zephir_print_backtrace(void);
26+
void zephir_print_backtrace(void);
2727

2828
#else
2929

‎ext/kernel/debug.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
+------------------------------------------------------------------------+
44
| Zephir Language |
55
+------------------------------------------------------------------------+
6-
| Copyright (c) 2011-2016 Zephir Team (http://www.zephir-lang.com) |
6+
| Copyright (c) 2011-2017 Zephir Team (http://www.zephir-lang.com) |
77
+------------------------------------------------------------------------+
88
| This source file is subject to the New BSD License that is bundled |
99
| with this package in the file docs/LICENSE.txt. |

‎ext/kernel/debug.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
+------------------------------------------------------------------------+
44
| Zephir Language |
55
+------------------------------------------------------------------------+
6-
| Copyright (c) 2011-2016 Zephir Team (http://www.zephir-lang.com) |
6+
| Copyright (c) 2011-2017 Zephir Team (http://www.zephir-lang.com) |
77
+------------------------------------------------------------------------+
88
| This source file is subject to the New BSD License that is bundled |
99
| with this package in the file docs/LICENSE.txt. |
@@ -65,4 +65,4 @@ int zephir_error_space();
6565
int zephir_debug_space();
6666

6767
#endif
68-
#endif
68+
#endif

‎ext/kernel/exception.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
+------------------------------------------------------------------------+
44
| Zephir Language |
55
+------------------------------------------------------------------------+
6-
| Copyright (c) 2011-2016 Zephir Team (http://www.zephir-lang.com) |
6+
| Copyright (c) 2011-2017 Zephir Team (http://www.zephir-lang.com) |
77
+------------------------------------------------------------------------+
88
| This source file is subject to the New BSD License that is bundled |
99
| with this package in the file docs/LICENSE.txt. |

‎ext/kernel/exception.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
+------------------------------------------------------------------------+
44
| Zephir Language |
55
+------------------------------------------------------------------------+
6-
| Copyright (c) 2011-2016 Zephir Team (http://www.zephir-lang.com) |
6+
| Copyright (c) 2011-2017 Zephir Team (http://www.zephir-lang.com) |
77
+------------------------------------------------------------------------+
88
| This source file is subject to the New BSD License that is bundled |
99
| with this package in the file docs/LICENSE.txt. |

‎ext/kernel/exit.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
+------------------------------------------------------------------------+
33
| Zephir Language |
44
+------------------------------------------------------------------------+
5-
| Copyright (c) 2011-2016 Zephir Team (http://www.zephir-lang.com) |
5+
| Copyright (c) 2011-2017 Zephir Team (http://www.zephir-lang.com) |
66
+------------------------------------------------------------------------+
77
| This source file is subject to the New BSD License that is bundled |
88
| with this package in the file docs/LICENSE.txt. |
@@ -26,8 +26,8 @@
2626
#include "kernel/main.h"
2727
#include "kernel/exit.h"
2828

29-
void zephir_exit_empty() {
30-
TSRMLS_FETCH();
29+
void zephir_exit_empty()
30+
{
3131
zend_bailout();
3232
}
3333

‎ext/kernel/exit.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
+------------------------------------------------------------------------+
44
| Zephir Language |
55
+------------------------------------------------------------------------+
6-
| Copyright (c) 2011-2016 Zephir Team (http://www.zephir-lang.com) |
6+
| Copyright (c) 2011-2017 Zephir Team (http://www.zephir-lang.com) |
77
+------------------------------------------------------------------------+
88
| This source file is subject to the New BSD License that is bundled |
99
| with this package in the file docs/LICENSE.txt. |

‎ext/kernel/extended/array.c

-18
This file was deleted.

0 commit comments

Comments
 (0)