cvs: ZendEngine2 / zend_compile.c zend_language_parser.y

zeev Tue Mar 4 08:52:03 2003 EDT Modified files: /ZendEngine2 zend_compile.c zend_language_parser.y Log: Remove legacy code Index: ZendEngine2/zend_compile.c diff -u ZendEngine2/zend_compile.c:1.380 ZendEngine2/zend_compile.c:1.381 --- ZendEngine2/zend_compile.c:1.380 Tue Mar 4 08:36:16 2003 +++ ZendEngine2/zend_compile.c Tue Mar 4 08:52:03 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_compile.c,v 1.380 2003/03/04 13:36:16 zeev Exp $ */ +/* $Id: zend_compile.c,v 1.381 2003/03/04 13:52:03 zeev Exp $ */ #include "zend_language_parser.h" #include "zend.h" @@ -284,8 +284,6 @@ opline_ptr->op2.u.EA.type = ZEND_FETCH_LOCAL; if (varname->op_type == IS_CONST && varname->u.constant.type == IS_STRING) { - zend_auto_global *auto_global; - if (zend_is_auto_global(varname->u.constant.value.str.val, varname->u.constant.value.str.len+1 TSRMLS_CC)) { opline_ptr->op2.u.EA.type = ZEND_FETCH_GLOBAL; } else { @@ -2148,6 +2146,8 @@ zend_op *opline; int doing_inheritance = 0; zend_class_entry *new_class_entry = emalloc(sizeof(zend_class_entry)); + + zend_str_tolower(class_name->u.constant.value.str.val, class_name->u.constant.value.str.len); if (!(strcmp(class_name->u.constant.value.str.val, "main") && strcmp(class_name->u.constant.value.str.val, "self") && strcmp(class_name->u.constant.value.str.val, "parent"))) { Index: ZendEngine2/zend_language_parser.y diff -u ZendEngine2/zend_language_parser.y:1.94 ZendEngine2/zend_language_parser.y:1.95 --- ZendEngine2/zend_language_parser.y:1.94 Mon Feb 24 07:05:58 2003 +++ ZendEngine2/zend_language_parser.y Tue Mar 4 08:52:03 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_language_parser.y,v 1.94 2003/02/24 12:05:58 zeev Exp $ */ +/* $Id: zend_language_parser.y,v 1.95 2003/03/04 13:52:03 zeev Exp $ */ /* * LALR shift/reduce conflicts and how they are resolved: @@ -287,7 +287,7 @@ ; unticked_class_declaration_statement: - T_CLASS declaration_class_name extends_from '{' { zend_do_begin_class_declaration(&$1, &$2, &$3 TSRMLS_CC); } class_statement_list '}' { zend_do_end_class_declaration(&$1 TSRMLS_CC); } + T_CLASS T_STRING extends_from '{' { zend_do_begin_class_declaration(&$1, &$2, &$3 TSRMLS_CC); } class_statement_list '}' { zend_do_end_class_declaration(&$1 TSRMLS_CC); } ; namespace_declaration_statement: @@ -329,7 +329,7 @@ declaration_class_name: namespace_name T_PAAMAYIM_NEKUDOTAYIM T_STRING { do_fetch_class_name(&$$, &$1, &$3, 0 TSRMLS_CC); } - | T_STRING { $$ = $1; zend_str_tolower($$.u.constant.value.str.val, $$.u.constant.value.str.len); } + | ; foreach_optional_arg: