cvs: ZendEngine2 / zend.c zend_API.c zend_builtin_functions.c zend_compile.c zend_execute.c zend_execute_API.c zend_indent.c zend_object_handlers.c
zend_opcode.c zend_operators.c zend_operators.h zend_variables.c
| From: | Andi Gutmans | Date: | Sat, 30 Nov 2002 11:20:25 +0000 |
| Subject: | cvs: ZendEngine2 / zend.c zend_API.c zend_builtin_functions.c zend_compile.c zend_execute.c zend_execute_API.c zend_indent.c zend_object_handlers.c zend_opcode.c zend_operators.c zend_operators.h zend_variables.c |
||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-676@lists.php.net to get a copy of this message | ||
andi Sat Nov 30 06:20:25 2002 EDT
Modified files:
/ZendEngine2 zend.c zend_API.c zend_builtin_functions.c
zend_compile.c zend_execute.c zend_execute_API.c
zend_indent.c zend_object_handlers.c zend_opcode.c
zend_operators.c zend_operators.h zend_variables.c
Log:
h WHitespace
Index: ZendEngine2/zend.c diff -u ZendEngine2/zend.c:1.192 ZendEngine2/zend.c:1.193 --- ZendEngine2/zend.c:1.192 Fri Nov 29 11:35:46 2002 +++ ZendEngine2/zend.c Sat Nov 30 06:20:25 2002 @@ -225,7 +225,7 @@ ZEND_API void zend_print_zval_r_ex(zend_write_func_t write_func, zval *expr, int indent) { - switch(expr->type) { + switch (expr->type) { case IS_ARRAY: ZEND_PUTS("Array\n"); if (++expr->value.ht->nApplyCount>1) { Index: ZendEngine2/zend_API.c diff -u ZendEngine2/zend_API.c:1.136 ZendEngine2/zend_API.c:1.137 --- ZendEngine2/zend_API.c:1.136 Sat Nov 23 15:44:12 2002 +++ ZendEngine2/zend_API.c Sat Nov 30 06:20:25 2002 @@ -1174,7 +1174,7 @@ */ int module_registry_cleanup(zend_module_entry *module TSRMLS_DC) { - switch(module->type) { + switch (module->type) { case MODULE_PERSISTENT: if (module->request_shutdown_func) { #if 0 Index: ZendEngine2/zend_builtin_functions.c diff -u ZendEngine2/zend_builtin_functions.c:1.158 ZendEngine2/zend_builtin_functions.c:1.159 --- ZendEngine2/zend_builtin_functions.c:1.158 Wed Nov 27 15:09:36 2002 +++ ZendEngine2/zend_builtin_functions.c Sat Nov 30 06:20:25 2002 @@ -433,7 +433,7 @@ int case_sensitive; zend_constant c; - switch(ZEND_NUM_ARGS()) { + switch (ZEND_NUM_ARGS()) { case 2: if (zend_get_parameters_ex(2, &var, &val)==FAILURE) { RETURN_FALSE; @@ -456,7 +456,7 @@ break; } - switch((*val)->type) { + switch ((*val)->type) { case IS_LONG: case IS_DOUBLE: case IS_STRING: @@ -897,7 +897,7 @@ int error_type = E_USER_NOTICE; zval **z_error_type, **z_error_message; - switch(ZEND_NUM_ARGS()) { + switch (ZEND_NUM_ARGS()) { case 1: if (zend_get_parameters_ex(1, &z_error_message)==FAILURE) { ZEND_WRONG_PARAM_COUNT(); Index: ZendEngine2/zend_compile.c diff -u ZendEngine2/zend_compile.c:1.327 ZendEngine2/zend_compile.c:1.328 --- ZendEngine2/zend_compile.c:1.327 Sun Nov 24 15:32:49 2002 +++ ZendEngine2/zend_compile.c Sat Nov 30 06:20:25 2002 @@ -208,7 +208,7 @@ if (last_op->opcode == ZEND_FETCH_OBJ_RW) { - switch(op) { + switch (op) { case ZEND_ASSIGN_ADD: opline->opcode = ZEND_ASSIGN_ADD_OBJ; break; @@ -287,10 +287,10 @@ opline_ptr->op2.u.EA.type = ZEND_FETCH_LOCAL; if (varname->op_type == IS_CONST && varname->u.constant.type == IS_STRING) { - if(zend_hash_exists(CG(auto_globals), varname->u.constant.value.str.val, varname->u.constant.value.str.len+1)) { + if (zend_hash_exists(CG(auto_globals), varname->u.constant.value.str.val, varname->u.constant.value.str.len+1)) { opline_ptr->op2.u.EA.type = ZEND_FETCH_GLOBAL; } else { - if(CG(active_op_array)->static_variables && zend_hash_exists(CG(active_op_array)->static_variables, varname->u.constant.value.str.val, varname->u.constant.value.str.len+1)) { + if (CG(active_op_array)->static_variables && zend_hash_exists(CG(active_op_array)->static_variables, varname->u.constant.value.str.val, varname->u.constant.value.str.len+1)) { opline_ptr->op2.u.EA.type = ZEND_FETCH_STATIC; } } @@ -1304,7 +1304,7 @@ } if (original_op == ZEND_SEND_VAR) { - switch(op) { + switch (op) { case ZEND_SEND_VAR_NO_REF: zend_do_end_variable_parse(BP_VAR_R, 0 TSRMLS_CC); break; @@ -2222,7 +2222,7 @@ SET_UNUSED(opline_ptr->op1); /* this means $this for objects */ opline_ptr->op2 = *property; /* if it was usual fetch, we change it to object fetch */ - switch(opline_ptr->opcode) { + switch (opline_ptr->opcode) { case ZEND_FETCH_W: opline_ptr->opcode = ZEND_FETCH_OBJ_W; break; @@ -2550,7 +2550,7 @@ opline = get_next_op(CG(active_op_array) TSRMLS_CC); if (dimension == tmp_dimension_llist->head) { /* first */ last_container = *expr; - switch(expr->op_type) { + switch (expr->op_type) { case IS_VAR: opline->opcode = ZEND_FETCH_DIM_R; break; @@ -2606,7 +2606,7 @@ ALLOC_ZVAL(tmp); convert_to_string(&varname->u.constant); - if(static_assignment) { + if (static_assignment) { *tmp = static_assignment->u.constant; } else { INIT_ZVAL(*tmp); @@ -3090,7 +3090,7 @@ zendlval->u.constant.type = IS_LONG; retval = lex_scan(&zendlval->u.constant TSRMLS_CC); - switch(retval) { + switch (retval) { case T_COMMENT: case T_OPEN_TAG: case T_WHITESPACE: Index: ZendEngine2/zend_execute.c diff -u ZendEngine2/zend_execute.c:1.399 ZendEngine2/zend_execute.c:1.400 --- ZendEngine2/zend_execute.c:1.399 Sun Nov 24 15:32:49 2002 +++ ZendEngine2/zend_execute.c Sat Nov 30 06:20:25 2002 @@ -52,7 +52,7 @@ static inline zval *_get_zval_ptr(znode *node, temp_variable *Ts, zval **should_free TSRMLS_DC) { - switch(node->op_type) { + switch (node->op_type) { case IS_CONST: *should_free = 0; return &node->u.constant; @@ -243,8 +243,8 @@ static inline zval **get_obj_zval_ptr_ptr(znode *op, temp_variable *Ts, int type TSRMLS_DC) { - if(op->op_type == IS_UNUSED) { - if(EG(This)) { + if (op->op_type == IS_UNUSED) { + if (EG(This)) { /* this should actually never be modified, _ptr_ptr is modified only when the object is empty */ return &EG(This); @@ -257,8 +257,8 @@ static inline zval *get_obj_zval_ptr(znode *op, temp_variable *Ts, zval **freeop, int type TSRMLS_DC) { - if(op->op_type == IS_UNUSED) { - if(EG(This)) { + if (op->op_type == IS_UNUSED) { + if (EG(This)) { return EG(This); } else { zend_error(E_ERROR, "Using $this when not in object context"); @@ -624,7 +624,7 @@ return EG(active_op_array)->static_variables; break; case ZEND_FETCH_STATIC_MEMBER: - if(T(opline->op2.u.var).EA.class_entry->parent) { + if (T(opline->op2.u.var).EA.class_entry->parent) { /* if inherited, try to look up */ return zend_find_inherited_static(T(opline->op2.u.var).EA.class_entry, variable); } else { @@ -784,7 +784,7 @@ zval ***retval = &T(result->u.var).var.ptr_ptr; if (!container_ptr) { - if(T(op1->u.var).EA.type == IS_STRING_OFFSET) { + if (T(op1->u.var).EA.type == IS_STRING_OFFSET) { zval *offset; zend_error(E_WARNING, "Cannot use string offset as an array"); @@ -1828,7 +1828,7 @@ zval *value, *value2; value = get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R); - switch(EX(opline)->op1.op_type) { + switch (EX(opline)->op1.op_type) { case IS_TMP_VAR: value2 = value; ALLOC_ZVAL(value); @@ -3030,7 +3030,7 @@ } } if (offset) { - switch(offset->type) { + switch (offset->type) { case IS_DOUBLE: zend_hash_index_update(array_ptr->value.ht, (long) offset->value.dval, &expr_ptr, sizeof(zval *), NULL); break; Index: ZendEngine2/zend_execute_API.c diff -u ZendEngine2/zend_execute_API.c:1.183 ZendEngine2/zend_execute_API.c:1.184 --- ZendEngine2/zend_execute_API.c:1.183 Tue Nov 19 12:51:30 2002 +++ ZendEngine2/zend_execute_API.c Sat Nov 30 06:20:25 2002 @@ -260,7 +260,7 @@ if (!zend_is_executing(TSRMLS_C)) { return NULL; } - switch(EG(function_state_ptr)->function->type) { + switch (EG(function_state_ptr)->function->type) { case ZEND_USER_FUNCTION: { char *function_name = ((zend_op_array *) EG(function_state_ptr)->function)->function_name; Index: ZendEngine2/zend_indent.c diff -u ZendEngine2/zend_indent.c:1.17 ZendEngine2/zend_indent.c:1.18 --- ZendEngine2/zend_indent.c:1.17 Sun Jan 6 10:21:35 2002 +++ ZendEngine2/zend_indent.c Sat Nov 30 06:20:25 2002 @@ -80,7 +80,7 @@ default: if (token.type==0) { /* keyword */ - switch(token_type) { + switch (token_type) { case ',': ZEND_PUTS(", "); goto dflt_printout; Index: ZendEngine2/zend_object_handlers.c diff -u ZendEngine2/zend_object_handlers.c:1.22 ZendEngine2/zend_object_handlers.c:1.23 --- ZendEngine2/zend_object_handlers.c:1.22 Sat Nov 23 15:44:12 2002 +++ ZendEngine2/zend_object_handlers.c Sat Nov 30 06:20:25 2002 @@ -207,7 +207,7 @@ } if (zend_hash_find(zobj->properties, Z_STRVAL_P(member), Z_STRLEN_P(member)+1, (void **) &variable_ptr) == SUCCESS) { - if(*variable_ptr == value) { + if (*variable_ptr == value) { /* if we already have this value there, we don't actually need to do anything */ setter_done = 1; } else { Index: ZendEngine2/zend_opcode.c diff -u ZendEngine2/zend_opcode.c:1.75 ZendEngine2/zend_opcode.c:1.76 --- ZendEngine2/zend_opcode.c:1.75 Thu Oct 24 14:24:55 2002 +++ ZendEngine2/zend_opcode.c Sat Nov 30 06:20:25 2002 @@ -339,7 +339,7 @@ ZEND_API unary_op_type get_unary_op(int opcode) { - switch(opcode) { + switch (opcode) { case ZEND_BW_NOT: return (unary_op_type) bitwise_not_function; break; Index: ZendEngine2/zend_operators.c diff -u ZendEngine2/zend_operators.c:1.138 ZendEngine2/zend_operators.c:1.139 --- ZendEngine2/zend_operators.c:1.138 Mon Nov 4 12:05:11 2002 +++ ZendEngine2/zend_operators.c Sat Nov 30 06:20:25 2002 @@ -504,7 +504,7 @@ { TSRMLS_FETCH(); - switch(op->type) { + switch (op->type) { case IS_ARRAY: return; break; @@ -538,7 +538,7 @@ ZEND_API void convert_to_object(zval *op) { - switch(op->type) { + switch (op->type) { case IS_ARRAY: { /* OBJECTS_OPTIMIZE */ @@ -1540,7 +1540,7 @@ op1->type = IS_LONG; break; } - switch(is_numeric_string(op1->value.str.val, op1->value.str.len, &lval, &dval, 0)) { + switch (is_numeric_string(op1->value.str.val, op1->value.str.len, &lval, &dval, 0)) { case IS_LONG: STR_FREE(op1->value.str.val); if (lval == LONG_MIN) { Index: ZendEngine2/zend_operators.h diff -u ZendEngine2/zend_operators.h:1.61 ZendEngine2/zend_operators.h:1.62 --- ZendEngine2/zend_operators.h:1.61 Sat Oct 12 17:15:35 2002 +++ ZendEngine2/zend_operators.h Sat Nov 30 06:20:25 2002 @@ -109,7 +109,7 @@ register char *ptr=str, *end=str+length; while (ptr<end) { - switch(*ptr++) { + switch (*ptr++) { case 'e': case 'E': /* scientific notation, not handled by the BC library */ Index: ZendEngine2/zend_variables.c diff -u ZendEngine2/zend_variables.c:1.47 ZendEngine2/zend_variables.c:1.48 --- ZendEngine2/zend_variables.c:1.47 Tue Sep 10 04:18:53 2002 +++ ZendEngine2/zend_variables.c Sat Nov 30 06:20:25 2002 @@ -37,7 +37,7 @@ if (zvalue->type==IS_LONG) { return; } - switch(zvalue->type & ~IS_CONSTANT_INDEX) { + switch (zvalue->type & ~IS_CONSTANT_INDEX) { case IS_STRING: case IS_CONSTANT: CHECK_ZVAL_STRING_REL(zvalue);
Index: ZendEngine2/zend.c diff -u ZendEngine2/zend.c:1.192 ZendEngine2/zend.c:1.193 --- ZendEngine2/zend.c:1.192 Fri Nov 29 11:35:46 2002 +++ ZendEngine2/zend.c Sat Nov 30 06:20:25 2002 @@ -225,7 +225,7 @@ ZEND_API void zend_print_zval_r_ex(zend_write_func_t write_func, zval *expr, int indent) { - switch(expr->type) { + switch (expr->type) { case IS_ARRAY: ZEND_PUTS("Array\n"); if (++expr->value.ht->nApplyCount>1) { Index: ZendEngine2/zend_API.c diff -u ZendEngine2/zend_API.c:1.136 ZendEngine2/zend_API.c:1.137 --- ZendEngine2/zend_API.c:1.136 Sat Nov 23 15:44:12 2002 +++ ZendEngine2/zend_API.c Sat Nov 30 06:20:25 2002 @@ -1174,7 +1174,7 @@ */ int module_registry_cleanup(zend_module_entry *module TSRMLS_DC) { - switch(module->type) { + switch (module->type) { case MODULE_PERSISTENT: if (module->request_shutdown_func) { #if 0 Index: ZendEngine2/zend_builtin_functions.c diff -u ZendEngine2/zend_builtin_functions.c:1.158 ZendEngine2/zend_builtin_functions.c:1.159 --- ZendEngine2/zend_builtin_functions.c:1.158 Wed Nov 27 15:09:36 2002 +++ ZendEngine2/zend_builtin_functions.c Sat Nov 30 06:20:25 2002 @@ -433,7 +433,7 @@ int case_sensitive; zend_constant c; - switch(ZEND_NUM_ARGS()) { + switch (ZEND_NUM_ARGS()) { case 2: if (zend_get_parameters_ex(2, &var, &val)==FAILURE) { RETURN_FALSE; @@ -456,7 +456,7 @@ break; } - switch((*val)->type) { + switch ((*val)->type) { case IS_LONG: case IS_DOUBLE: case IS_STRING: @@ -897,7 +897,7 @@ int error_type = E_USER_NOTICE; zval **z_error_type, **z_error_message; - switch(ZEND_NUM_ARGS()) { + switch (ZEND_NUM_ARGS()) { case 1: if (zend_get_parameters_ex(1, &z_error_message)==FAILURE) { ZEND_WRONG_PARAM_COUNT(); Index: ZendEngine2/zend_compile.c diff -u ZendEngine2/zend_compile.c:1.327 ZendEngine2/zend_compile.c:1.328 --- ZendEngine2/zend_compile.c:1.327 Sun Nov 24 15:32:49 2002 +++ ZendEngine2/zend_compile.c Sat Nov 30 06:20:25 2002 @@ -208,7 +208,7 @@ if (last_op->opcode == ZEND_FETCH_OBJ_RW) { - switch(op) { + switch (op) { case ZEND_ASSIGN_ADD: opline->opcode = ZEND_ASSIGN_ADD_OBJ; break; @@ -287,10 +287,10 @@ opline_ptr->op2.u.EA.type = ZEND_FETCH_LOCAL; if (varname->op_type == IS_CONST && varname->u.constant.type == IS_STRING) { - if(zend_hash_exists(CG(auto_globals), varname->u.constant.value.str.val, varname->u.constant.value.str.len+1)) { + if (zend_hash_exists(CG(auto_globals), varname->u.constant.value.str.val, varname->u.constant.value.str.len+1)) { opline_ptr->op2.u.EA.type = ZEND_FETCH_GLOBAL; } else { - if(CG(active_op_array)->static_variables && zend_hash_exists(CG(active_op_array)->static_variables, varname->u.constant.value.str.val, varname->u.constant.value.str.len+1)) { + if (CG(active_op_array)->static_variables && zend_hash_exists(CG(active_op_array)->static_variables, varname->u.constant.value.str.val, varname->u.constant.value.str.len+1)) { opline_ptr->op2.u.EA.type = ZEND_FETCH_STATIC; } } @@ -1304,7 +1304,7 @@ } if (original_op == ZEND_SEND_VAR) { - switch(op) { + switch (op) { case ZEND_SEND_VAR_NO_REF: zend_do_end_variable_parse(BP_VAR_R, 0 TSRMLS_CC); break; @@ -2222,7 +2222,7 @@ SET_UNUSED(opline_ptr->op1); /* this means $this for objects */ opline_ptr->op2 = *property; /* if it was usual fetch, we change it to object fetch */ - switch(opline_ptr->opcode) { + switch (opline_ptr->opcode) { case ZEND_FETCH_W: opline_ptr->opcode = ZEND_FETCH_OBJ_W; break; @@ -2550,7 +2550,7 @@ opline = get_next_op(CG(active_op_array) TSRMLS_CC); if (dimension == tmp_dimension_llist->head) { /* first */ last_container = *expr; - switch(expr->op_type) { + switch (expr->op_type) { case IS_VAR: opline->opcode = ZEND_FETCH_DIM_R; break; @@ -2606,7 +2606,7 @@ ALLOC_ZVAL(tmp); convert_to_string(&varname->u.constant); - if(static_assignment) { + if (static_assignment) { *tmp = static_assignment->u.constant; } else { INIT_ZVAL(*tmp); @@ -3090,7 +3090,7 @@ zendlval->u.constant.type = IS_LONG; retval = lex_scan(&zendlval->u.constant TSRMLS_CC); - switch(retval) { + switch (retval) { case T_COMMENT: case T_OPEN_TAG: case T_WHITESPACE: Index: ZendEngine2/zend_execute.c diff -u ZendEngine2/zend_execute.c:1.399 ZendEngine2/zend_execute.c:1.400 --- ZendEngine2/zend_execute.c:1.399 Sun Nov 24 15:32:49 2002 +++ ZendEngine2/zend_execute.c Sat Nov 30 06:20:25 2002 @@ -52,7 +52,7 @@ static inline zval *_get_zval_ptr(znode *node, temp_variable *Ts, zval **should_free TSRMLS_DC) { - switch(node->op_type) { + switch (node->op_type) { case IS_CONST: *should_free = 0; return &node->u.constant; @@ -243,8 +243,8 @@ static inline zval **get_obj_zval_ptr_ptr(znode *op, temp_variable *Ts, int type TSRMLS_DC) { - if(op->op_type == IS_UNUSED) { - if(EG(This)) { + if (op->op_type == IS_UNUSED) { + if (EG(This)) { /* this should actually never be modified, _ptr_ptr is modified only when the object is empty */ return &EG(This); @@ -257,8 +257,8 @@ static inline zval *get_obj_zval_ptr(znode *op, temp_variable *Ts, zval **freeop, int type TSRMLS_DC) { - if(op->op_type == IS_UNUSED) { - if(EG(This)) { + if (op->op_type == IS_UNUSED) { + if (EG(This)) { return EG(This); } else { zend_error(E_ERROR, "Using $this when not in object context"); @@ -624,7 +624,7 @@ return EG(active_op_array)->static_variables; break; case ZEND_FETCH_STATIC_MEMBER: - if(T(opline->op2.u.var).EA.class_entry->parent) { + if (T(opline->op2.u.var).EA.class_entry->parent) { /* if inherited, try to look up */ return zend_find_inherited_static(T(opline->op2.u.var).EA.class_entry, variable); } else { @@ -784,7 +784,7 @@ zval ***retval = &T(result->u.var).var.ptr_ptr; if (!container_ptr) { - if(T(op1->u.var).EA.type == IS_STRING_OFFSET) { + if (T(op1->u.var).EA.type == IS_STRING_OFFSET) { zval *offset; zend_error(E_WARNING, "Cannot use string offset as an array"); @@ -1828,7 +1828,7 @@ zval *value, *value2; value = get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R); - switch(EX(opline)->op1.op_type) { + switch (EX(opline)->op1.op_type) { case IS_TMP_VAR: value2 = value; ALLOC_ZVAL(value); @@ -3030,7 +3030,7 @@ } } if (offset) { - switch(offset->type) { + switch (offset->type) { case IS_DOUBLE: zend_hash_index_update(array_ptr->value.ht, (long) offset->value.dval, &expr_ptr, sizeof(zval *), NULL); break; Index: ZendEngine2/zend_execute_API.c diff -u ZendEngine2/zend_execute_API.c:1.183 ZendEngine2/zend_execute_API.c:1.184 --- ZendEngine2/zend_execute_API.c:1.183 Tue Nov 19 12:51:30 2002 +++ ZendEngine2/zend_execute_API.c Sat Nov 30 06:20:25 2002 @@ -260,7 +260,7 @@ if (!zend_is_executing(TSRMLS_C)) { return NULL; } - switch(EG(function_state_ptr)->function->type) { + switch (EG(function_state_ptr)->function->type) { case ZEND_USER_FUNCTION: { char *function_name = ((zend_op_array *) EG(function_state_ptr)->function)->function_name; Index: ZendEngine2/zend_indent.c diff -u ZendEngine2/zend_indent.c:1.17 ZendEngine2/zend_indent.c:1.18 --- ZendEngine2/zend_indent.c:1.17 Sun Jan 6 10:21:35 2002 +++ ZendEngine2/zend_indent.c Sat Nov 30 06:20:25 2002 @@ -80,7 +80,7 @@ default: if (token.type==0) { /* keyword */ - switch(token_type) { + switch (token_type) { case ',': ZEND_PUTS(", "); goto dflt_printout; Index: ZendEngine2/zend_object_handlers.c diff -u ZendEngine2/zend_object_handlers.c:1.22 ZendEngine2/zend_object_handlers.c:1.23 --- ZendEngine2/zend_object_handlers.c:1.22 Sat Nov 23 15:44:12 2002 +++ ZendEngine2/zend_object_handlers.c Sat Nov 30 06:20:25 2002 @@ -207,7 +207,7 @@ } if (zend_hash_find(zobj->properties, Z_STRVAL_P(member), Z_STRLEN_P(member)+1, (void **) &variable_ptr) == SUCCESS) { - if(*variable_ptr == value) { + if (*variable_ptr == value) { /* if we already have this value there, we don't actually need to do anything */ setter_done = 1; } else { Index: ZendEngine2/zend_opcode.c diff -u ZendEngine2/zend_opcode.c:1.75 ZendEngine2/zend_opcode.c:1.76 --- ZendEngine2/zend_opcode.c:1.75 Thu Oct 24 14:24:55 2002 +++ ZendEngine2/zend_opcode.c Sat Nov 30 06:20:25 2002 @@ -339,7 +339,7 @@ ZEND_API unary_op_type get_unary_op(int opcode) { - switch(opcode) { + switch (opcode) { case ZEND_BW_NOT: return (unary_op_type) bitwise_not_function; break; Index: ZendEngine2/zend_operators.c diff -u ZendEngine2/zend_operators.c:1.138 ZendEngine2/zend_operators.c:1.139 --- ZendEngine2/zend_operators.c:1.138 Mon Nov 4 12:05:11 2002 +++ ZendEngine2/zend_operators.c Sat Nov 30 06:20:25 2002 @@ -504,7 +504,7 @@ { TSRMLS_FETCH(); - switch(op->type) { + switch (op->type) { case IS_ARRAY: return; break; @@ -538,7 +538,7 @@ ZEND_API void convert_to_object(zval *op) { - switch(op->type) { + switch (op->type) { case IS_ARRAY: { /* OBJECTS_OPTIMIZE */ @@ -1540,7 +1540,7 @@ op1->type = IS_LONG; break; } - switch(is_numeric_string(op1->value.str.val, op1->value.str.len, &lval, &dval, 0)) { + switch (is_numeric_string(op1->value.str.val, op1->value.str.len, &lval, &dval, 0)) { case IS_LONG: STR_FREE(op1->value.str.val); if (lval == LONG_MIN) { Index: ZendEngine2/zend_operators.h diff -u ZendEngine2/zend_operators.h:1.61 ZendEngine2/zend_operators.h:1.62 --- ZendEngine2/zend_operators.h:1.61 Sat Oct 12 17:15:35 2002 +++ ZendEngine2/zend_operators.h Sat Nov 30 06:20:25 2002 @@ -109,7 +109,7 @@ register char *ptr=str, *end=str+length; while (ptr<end) { - switch(*ptr++) { + switch (*ptr++) { case 'e': case 'E': /* scientific notation, not handled by the BC library */ Index: ZendEngine2/zend_variables.c diff -u ZendEngine2/zend_variables.c:1.47 ZendEngine2/zend_variables.c:1.48 --- ZendEngine2/zend_variables.c:1.47 Tue Sep 10 04:18:53 2002 +++ ZendEngine2/zend_variables.c Sat Nov 30 06:20:25 2002 @@ -37,7 +37,7 @@ if (zvalue->type==IS_LONG) { return; } - switch(zvalue->type & ~IS_CONSTANT_INDEX) { + switch (zvalue->type & ~IS_CONSTANT_INDEX) { case IS_STRING: case IS_CONSTANT: CHECK_ZVAL_STRING_REL(zvalue);