diff options
| author | Andi Gutmans <andi@php.net> | 2000-06-09 13:36:36 +0000 |
|---|---|---|
| committer | Andi Gutmans <andi@php.net> | 2000-06-09 13:36:36 +0000 |
| commit | 99b4051eca3d6b3f737769120d8e9da815621097 (patch) | |
| tree | 2bc275e4e691eea31818e3b533b35275a85db2de /Zend | |
| parent | cbd3f41ba8667fbd3e0dcaa82f4d16d1b592f039 (diff) | |
| download | php-git-99b4051eca3d6b3f737769120d8e9da815621097.tar.gz | |
- Typo
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/zend-parser.y | 4 | ||||
| -rw-r--r-- | Zend/zend-scanner.l | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend-parser.y b/Zend/zend-parser.y index 22234ba875..ba65b01bad 100644 --- a/Zend/zend-parser.y +++ b/Zend/zend-parser.y @@ -53,7 +53,7 @@ %left T_LOGICAL_XOR %left T_LOGICAL_AND %right T_PRINT -%left '=' T_PLUS_EQUAL T_MINUS_EQUAL T_MUL_EQUAL T_DIV_EQUAL T_CONCAT_EQUAL T_MOD_EQUAL T_AND_EQUAL T_OR_EQUAL XT_OR_EQUAL T_SL_EQUAL T_SR_EQUAL +%left '=' T_PLUS_EQUAL T_MINUS_EQUAL T_MUL_EQUAL T_DIV_EQUAL T_CONCAT_EQUAL T_MOD_EQUAL T_AND_EQUAL T_OR_EQUAL T_XOR_EQUAL T_SL_EQUAL T_SR_EQUAL %left '?' ':' %left T_BOOLEAN_OR %left T_BOOLEAN_AND @@ -426,7 +426,7 @@ expr_without_variable: | cvar T_MOD_EQUAL expr { do_end_variable_parse(BP_VAR_RW, 0 CLS_CC); do_binary_assign_op(ZEND_ASSIGN_MOD, &$$, &$1, &$3 CLS_CC); } | cvar T_AND_EQUAL expr { do_end_variable_parse(BP_VAR_RW, 0 CLS_CC); do_binary_assign_op(ZEND_ASSIGN_BW_AND, &$$, &$1, &$3 CLS_CC); } | cvar T_OR_EQUAL expr { do_end_variable_parse(BP_VAR_RW, 0 CLS_CC); do_binary_assign_op(ZEND_ASSIGN_BW_OR, &$$, &$1, &$3 CLS_CC); } - | cvar XT_OR_EQUAL expr { do_end_variable_parse(BP_VAR_RW, 0 CLS_CC); do_binary_assign_op(ZEND_ASSIGN_BW_XOR, &$$, &$1, &$3 CLS_CC); } + | cvar T_XOR_EQUAL expr { do_end_variable_parse(BP_VAR_RW, 0 CLS_CC); do_binary_assign_op(ZEND_ASSIGN_BW_XOR, &$$, &$1, &$3 CLS_CC); } | cvar T_SL_EQUAL expr { do_end_variable_parse(BP_VAR_RW, 0 CLS_CC); do_binary_assign_op(ZEND_ASSIGN_SL, &$$, &$1, &$3 CLS_CC); } | cvar T_SR_EQUAL expr { do_end_variable_parse(BP_VAR_RW, 0 CLS_CC); do_binary_assign_op(ZEND_ASSIGN_SR, &$$, &$1, &$3 CLS_CC); } | rw_cvar T_INC { do_post_incdec(&$$, &$1, ZEND_POST_INC CLS_CC); } diff --git a/Zend/zend-scanner.l b/Zend/zend-scanner.l index 481bfe859f..18711267e0 100644 --- a/Zend/zend-scanner.l +++ b/Zend/zend-scanner.l @@ -1053,7 +1053,7 @@ ESCAPED_AND_WHITESPACE [\n\t\r #'.:;,()|^&+-/*=%!~<>?@]+ } <ST_IN_SCRIPTING>"^=" { - return XT_OR_EQUAL; + return T_XOR_EQUAL; } <ST_IN_SCRIPTING>"||" { |