com php-src: Fixed typo: Zend/zend_vm_def.h Zend/zend _vm_execute.h
| From: | Dmitry Stogov | Date: | Thu, 20 Nov 2014 07:13:08 +0000 |
| Subject: | com php-src: Fixed typo: Zend/zend_vm_def.h Zend/zend _vm_execute.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83157@lists.php.net to get a copy of this message | ||
Commit: 03815693ec22644c18e10d47d3c6ba1133be0ead
Author: Dmitry Stogov <dmitry@zend.com> Thu, 20 Nov 2014 10:13:08 +0300
Parents: edb05ae37e806b5b3a880a7c92e8c1d4b91c18e5
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=03815693ec22644c18e10d47d3c6ba1133be0ead
Log:
Fixed typo
Changed paths:
M Zend/zend_vm_def.h
M Zend/zend_vm_execute.h
Diff:
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index f0ebac4..eb181d9 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -5020,7 +5020,7 @@ ZEND_VM_C_LABEL(num_index_prop):
result = 0;
if (UNEXPECTED(Z_TYPE_P(offset) != IS_LONG)) {
- if (OP1_TYPE == IS_CV || OP1_TYPE == IS_VAR) {
+ if (OP2_TYPE == IS_CV || OP2_TYPE == IS_VAR) {
ZVAL_DEREF(offset);
}
if (Z_TYPE_P(offset) < IS_STRING /* simple scalar types */
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index fc563b4..2a8e901 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -5892,7 +5892,7 @@ num_index_prop:
result = 0;
if (UNEXPECTED(Z_TYPE_P(offset) != IS_LONG)) {
- if (IS_CONST == IS_CV || IS_CONST == IS_VAR) {
+ if (IS_TMP_VAR == IS_CV || IS_TMP_VAR == IS_VAR) {
ZVAL_DEREF(offset);
}
if (Z_TYPE_P(offset) < IS_STRING /* simple scalar types */
@@ -7274,7 +7274,7 @@ num_index_prop:
result = 0;
if (UNEXPECTED(Z_TYPE_P(offset) != IS_LONG)) {
- if (IS_CONST == IS_CV || IS_CONST == IS_VAR) {
+ if (IS_VAR == IS_CV || IS_VAR == IS_VAR) {
ZVAL_DEREF(offset);
}
if (Z_TYPE_P(offset) < IS_STRING /* simple scalar types */
@@ -9140,7 +9140,7 @@ num_index_prop:
result = 0;
if (UNEXPECTED(Z_TYPE_P(offset) != IS_LONG)) {
- if (IS_CONST == IS_CV || IS_CONST == IS_VAR) {
+ if (IS_CV == IS_CV || IS_CV == IS_VAR) {
ZVAL_DEREF(offset);
}
if (Z_TYPE_P(offset) < IS_STRING /* simple scalar types */
@@ -11604,7 +11604,7 @@ num_index_prop:
result = 0;
if (UNEXPECTED(Z_TYPE_P(offset) != IS_LONG)) {
- if (IS_TMP_VAR == IS_CV || IS_TMP_VAR == IS_VAR) {
+ if (IS_CONST == IS_CV || IS_CONST == IS_VAR) {
ZVAL_DEREF(offset);
}
if (Z_TYPE_P(offset) < IS_STRING /* simple scalar types */
@@ -14059,7 +14059,7 @@ num_index_prop:
result = 0;
if (UNEXPECTED(Z_TYPE_P(offset) != IS_LONG)) {
- if (IS_TMP_VAR == IS_CV || IS_TMP_VAR == IS_VAR) {
+ if (IS_VAR == IS_CV || IS_VAR == IS_VAR) {
ZVAL_DEREF(offset);
}
if (Z_TYPE_P(offset) < IS_STRING /* simple scalar types */
@@ -15735,7 +15735,7 @@ num_index_prop:
result = 0;
if (UNEXPECTED(Z_TYPE_P(offset) != IS_LONG)) {
- if (IS_TMP_VAR == IS_CV || IS_TMP_VAR == IS_VAR) {
+ if (IS_CV == IS_CV || IS_CV == IS_VAR) {
ZVAL_DEREF(offset);
}
if (Z_TYPE_P(offset) < IS_STRING /* simple scalar types */
@@ -19884,7 +19884,7 @@ num_index_prop:
result = 0;
if (UNEXPECTED(Z_TYPE_P(offset) != IS_LONG)) {
- if (IS_VAR == IS_CV || IS_VAR == IS_VAR) {
+ if (IS_CONST == IS_CV || IS_CONST == IS_VAR) {
ZVAL_DEREF(offset);
}
if (Z_TYPE_P(offset) < IS_STRING /* simple scalar types */
@@ -21947,7 +21947,7 @@ num_index_prop:
result = 0;
if (UNEXPECTED(Z_TYPE_P(offset) != IS_LONG)) {
- if (IS_VAR == IS_CV || IS_VAR == IS_VAR) {
+ if (IS_TMP_VAR == IS_CV || IS_TMP_VAR == IS_VAR) {
ZVAL_DEREF(offset);
}
if (Z_TYPE_P(offset) < IS_STRING /* simple scalar types */
@@ -27615,7 +27615,7 @@ num_index_prop:
result = 0;
if (UNEXPECTED(Z_TYPE_P(offset) != IS_LONG)) {
- if (IS_VAR == IS_CV || IS_VAR == IS_VAR) {
+ if (IS_CV == IS_CV || IS_CV == IS_VAR) {
ZVAL_DEREF(offset);
}
if (Z_TYPE_P(offset) < IS_STRING /* simple scalar types */
@@ -29112,7 +29112,7 @@ num_index_prop:
result = 0;
if (UNEXPECTED(Z_TYPE_P(offset) != IS_LONG)) {
- if (IS_UNUSED == IS_CV || IS_UNUSED == IS_VAR) {
+ if (IS_CONST == IS_CV || IS_CONST == IS_VAR) {
ZVAL_DEREF(offset);
}
if (Z_TYPE_P(offset) < IS_STRING /* simple scalar types */
@@ -30429,7 +30429,7 @@ num_index_prop:
result = 0;
if (UNEXPECTED(Z_TYPE_P(offset) != IS_LONG)) {
- if (IS_UNUSED == IS_CV || IS_UNUSED == IS_VAR) {
+ if (IS_TMP_VAR == IS_CV || IS_TMP_VAR == IS_VAR) {
ZVAL_DEREF(offset);
}
if (Z_TYPE_P(offset) < IS_STRING /* simple scalar types */
@@ -31748,7 +31748,7 @@ num_index_prop:
result = 0;
if (UNEXPECTED(Z_TYPE_P(offset) != IS_LONG)) {
- if (IS_UNUSED == IS_CV || IS_UNUSED == IS_VAR) {
+ if (IS_VAR == IS_CV || IS_VAR == IS_VAR) {
ZVAL_DEREF(offset);
}
if (Z_TYPE_P(offset) < IS_STRING /* simple scalar types */
@@ -33550,7 +33550,7 @@ num_index_prop:
result = 0;
if (UNEXPECTED(Z_TYPE_P(offset) != IS_LONG)) {
- if (IS_UNUSED == IS_CV || IS_UNUSED == IS_VAR) {
+ if (IS_CV == IS_CV || IS_CV == IS_VAR) {
ZVAL_DEREF(offset);
}
if (Z_TYPE_P(offset) < IS_STRING /* simple scalar types */
@@ -37123,7 +37123,7 @@ num_index_prop:
result = 0;
if (UNEXPECTED(Z_TYPE_P(offset) != IS_LONG)) {
- if (IS_CV == IS_CV || IS_CV == IS_VAR) {
+ if (IS_CONST == IS_CV || IS_CONST == IS_VAR) {
ZVAL_DEREF(offset);
}
if (Z_TYPE_P(offset) < IS_STRING /* simple scalar types */
@@ -39115,7 +39115,7 @@ num_index_prop:
result = 0;
if (UNEXPECTED(Z_TYPE_P(offset) != IS_LONG)) {
- if (IS_CV == IS_CV || IS_CV == IS_VAR) {
+ if (IS_TMP_VAR == IS_CV || IS_TMP_VAR == IS_VAR) {
ZVAL_DEREF(offset);
}
if (Z_TYPE_P(offset) < IS_STRING /* simple scalar types */
@@ -41371,7 +41371,7 @@ num_index_prop:
result = 0;
if (UNEXPECTED(Z_TYPE_P(offset) != IS_LONG)) {
- if (IS_CV == IS_CV || IS_CV == IS_VAR) {
+ if (IS_VAR == IS_CV || IS_VAR == IS_VAR) {
ZVAL_DEREF(offset);
}
if (Z_TYPE_P(offset) < IS_STRING /* simple scalar types */