- Remove all for now

# - the optimization part can be done in apc or compareable products
# - NULL can be reintroduced later when needed

diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index 257849fd2642fb837016eb6d4e3318626782ca5e..6d85f8be7a8745c1289742d1f41bc4888fb25fac 100644 (file)
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -142,9 +142,6 @@
 %token T_DOLLAR_OPEN_CURLY_BRACES
 %token T_CURLY_OPEN
 %token T_PAAMAYIM_NEKUDOTAYIM
-%token T_NULL
-%token T_FALSE
-%token T_TRUE
 
 %% /* Rules */
 
@@ -678,9 +675,6 @@ common_scalar:
        |       T_CLASS_C                                       { $$ = $1; }
        |       T_METHOD_C                                      { $$ = $1; }
        |       T_FUNC_C                                        { $$ = $1; }
-       |       T_NULL                                          { $$ = $1; }
-       |       T_FALSE                                         { $$ = $1; }
-       |       T_TRUE                                          { $$ = $1; }
 ;
 
 

diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
index 00deccd7315c0ddefa3acef57d045a053887c4da..9fa890d14646eed2a93cf588b3de23e310adfbc9 100644 (file)
--- a/Zend/zend_language_scanner.l
+++ b/Zend/zend_language_scanner.l
@@ -1304,21 +1304,6 @@ NEWLINE ("\r"|"\n"|"\r\n")
        return T_FILE;
 }
 
-<ST_IN_SCRIPTING>"NULL" {
-       ZVAL_NULL(zendlval);
-       return T_NULL;
-}
-
-<ST_IN_SCRIPTING>"FALSE" {
-       ZVAL_FALSE(zendlval);
-       return T_FALSE;
-}
-
-<ST_IN_SCRIPTING>"TRUE" {
-       ZVAL_TRUE(zendlval);
-       return T_TRUE;
-}
-
 <INITIAL>(([^<]|"<"[^?%s<]){1,400})|"<s"|"<" {
 #ifdef ZEND_MULTIBYTE
        if (SCNG(output_filter)) {