clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 09:57:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up last/size definitions

Browse Source
This commit is contained in:
Zeev Suraski 2000-04-10 18:02:40 +00:00
parent 897b413c2d
commit 232b90454f
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Zend/zend-parser.y
View File

@ -268,9 +268,9 @@ switch_case_list:
case_list:
/* empty */ { $$.u.opline_num = -1; }
| case_list T_CASE expr case_separator { do_case_before_statement(&$1, &$2, &$3 CLS_CC); } inner_statement_list { do_case_after_statement(&$$, &$2 CLS_CC); }
| case_list T_DEFAULT case_separator { do_default_before_statement(&$1, &$2 CLS_CC); } inner_statement_list { do_case_after_statement(&$$, &$2 CLS_CC); }
/* empty */ { $$.op_type = IS_UNUSED; }
| case_list T_CASE expr case_separator { do_case_before_statement(&$1, &$2, &$3 CLS_CC); } inner_statement_list { do_case_after_statement(&$$, &$2 CLS_CC); $$.op_type = IS_CONST }
| case_list T_DEFAULT case_separator { do_default_before_statement(&$1, &$2 CLS_CC); } inner_statement_list { do_case_after_statement(&$$, &$2 CLS_CC); $$.op_type = IS_CONST; }
;

2
Zend/zend_compile.c
View File

@ -1385,7 +1385,7 @@ void do_case_before_statement(znode *case_list, znode *case_token, znode *case_e
SET_UNUSED(opline->op2);
case_token->u.opline_num = next_op_number;
if (case_list->u.opline_num==-1) {
if (case_list->op_type==IS_UNUSED) {
return;
}
next_op_number = get_next_op_number(CG(active_op_array));

4
Zend/zend_compile.h
View File

@ -59,7 +59,7 @@ typedef struct _znode {
zval constant;
zend_uint var;
int opline_num; /* Needs to be signed */
zend_uint opline_num; /* Needs to be signed */
zend_uchar fetch_type;
zend_op_array *op_array;
struct {
@ -97,7 +97,7 @@ struct _zend_op_array {
zend_uint *refcount;
zend_op *opcodes;
int last, size;
zend_uint last, size;
zend_uint T;

2
Zend/zend_execute.h
View File

@ -38,6 +38,8 @@ typedef union _temp_variable {
zval *str;
int offset;
} str_offset;
// struct {
// } overloaded_object;
} data;
unsigned char type;