diff options
| author | Zeev Suraski <zeev@php.net> | 2003-03-04 13:52:03 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2003-03-04 13:52:03 +0000 |
| commit | d5ada686542d8306caec596ac813753d66fb77c0 (patch) | |
| tree | ccd60c7a6b07fb7a8c849a287a3b14ac89d65c0f | |
| parent | a18bf5c277629ba755145f6f7cea93dec855d51d (diff) | |
| download | php-git-d5ada686542d8306caec596ac813753d66fb77c0.tar.gz | |
Remove legacy code
| -rw-r--r-- | Zend/zend_compile.c | 4 | ||||
| -rw-r--r-- | Zend/zend_language_parser.y | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 1013ebdb0a..1d05de1eda 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -284,8 +284,6 @@ void fetch_simple_variable_ex(znode *result, znode *varname, int bp, zend_uchar 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 { @@ -2149,6 +2147,8 @@ void zend_do_begin_class_declaration(znode *class_token, znode *class_name, znod 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"))) { zend_error(E_COMPILE_ERROR, "Cannot use '%s' as class name as it is reserved", class_name->u.constant.value.str.val); diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 04df71db38..7accb8e069 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -287,7 +287,7 @@ unticked_function_declaration_statement: ; 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 @@ extends_from: 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: |