From: Andi Gutmans <andi@php.net>
Date: Tue, 5 Nov 2002 18:25:09 +0000 (+0000)
Subject: - ATTENTION: Finally nuke old_function and cfunction. I think it is time
X-Git-Tag: php-4.3.0RC1~253
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=983be5c73ce38e41acc27a8be891843a8d7e0017;p=php

- ATTENTION: Finally nuke old_function and cfunction. I think it is time
- to get rid of these BC notations. This is from the days of the move from
- PHP/FI 2 -> PHP 3
---

diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index f7d293c5e9..f9b6212983 100644
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -102,7 +102,6 @@
 %token T_DEFAULT
 %token T_BREAK
 %token T_CONTINUE
-%token T_OLD_FUNCTION
 %token T_FUNCTION
 %token T_CONST
 %token T_RETURN
@@ -276,8 +275,6 @@ class_declaration_statement:
 unticked_function_declaration_statement:
 		T_FUNCTION { $1.u.opline_num = CG(zend_lineno); } is_reference T_STRING { zend_do_begin_function_declaration(&$1, &$4, 0, $3.op_type TSRMLS_CC); }
 			'(' parameter_list ')' '{' inner_statement_list '}' { zend_do_end_function_declaration(&$1 TSRMLS_CC); }
-	|	T_OLD_FUNCTION { $1.u.opline_num = CG(zend_lineno); } is_reference T_STRING  { zend_do_begin_function_declaration(&$1, &$4, 0, $3.op_type TSRMLS_CC); }
-			parameter_list '(' inner_statement_list ')' ';' { zend_do_end_function_declaration(&$1 TSRMLS_CC); }
 ;
 
 unticked_class_declaration_statement:
@@ -443,8 +440,6 @@ class_statement:
 	|	class_constant_declaration ';'
 	|	T_FUNCTION { $1.u.opline_num = CG(zend_lineno); } is_reference T_STRING { zend_do_begin_function_declaration(&$1, &$4, 1, $3.op_type TSRMLS_CC); } '(' 
 			parameter_list ')' '{' inner_statement_list '}' { zend_do_end_function_declaration(&$1 TSRMLS_CC); }
-	|	T_OLD_FUNCTION { $1.u.opline_num = CG(zend_lineno); } is_reference T_STRING { zend_do_begin_function_declaration(&$1, &$4, 1, $3.op_type TSRMLS_CC); }
-			parameter_list '(' inner_statement_list ')' ';' { zend_do_end_function_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); }
 ;
 
diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
index 2c1e21fdb1..62390f1785 100644
--- a/Zend/zend_language_scanner.l
+++ b/Zend/zend_language_scanner.l
@@ -488,11 +488,7 @@ NEWLINE ("\r"|"\n"|"\r\n")
 	return T_EXIT;
 }
 
-<ST_IN_SCRIPTING>"old_function" {
-	return T_OLD_FUNCTION;
-}
-
-<ST_IN_SCRIPTING>"function"|"cfunction" {
+<ST_IN_SCRIPTING>"function" {
 	return T_FUNCTION;
 }