cvs: ZendEngine2 / zend_language_parser.y zend_language_scanner.l
| From: | Marcus Boerger | Date: | Mon, 02 Aug 2004 16:38:09 +0000 |
| Subject: | cvs: ZendEngine2 / zend_language_parser.y zend_language_scanner.l | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-2836@lists.php.net to get a copy of this message | ||
helly Mon Aug 2 12:38:09 2004 EDT
Modified files:
/ZendEngine2 zend_language_parser.y zend_language_scanner.l
Log:
- Remove all for now
# - the optimization part can be done in apc or compareable products
# - NULL can be reintroduced later when needed
http://cvs.php.net/diff.php/ZendEngine2/zend_language_parser.y?r1=1.147&r2=1.148&ty=u
Index: ZendEngine2/zend_language_parser.y
diff -u ZendEngine2/zend_language_parser.y:1.147 ZendEngine2/zend_language_parser.y:1.148
--- ZendEngine2/zend_language_parser.y:1.147 Thu Jul 29 13:45:31 2004
+++ ZendEngine2/zend_language_parser.y Mon Aug 2 12:38:09 2004
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_language_parser.y,v 1.147 2004/07/29 17:45:31 pollita Exp $ */
+/* $Id: zend_language_parser.y,v 1.148 2004/08/02 16:38:09 helly Exp $ */
/*
* LALR shift/reduce conflicts and how they are resolved:
@@ -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 @@
| T_CLASS_C { $$ = $1; }
| T_METHOD_C { $$ = $1; }
| T_FUNC_C { $$ = $1; }
- | T_NULL { $$ = $1; }
- | T_FALSE { $$ = $1; }
- | T_TRUE { $$ = $1; }
;
http://cvs.php.net/diff.php/ZendEngine2/zend_language_scanner.l?r1=1.114&r2=1.115&ty=u
Index: ZendEngine2/zend_language_scanner.l
diff -u ZendEngine2/zend_language_scanner.l:1.114 ZendEngine2/zend_language_scanner.l:1.115
--- ZendEngine2/zend_language_scanner.l:1.114 Thu Jul 29 13:45:31 2004
+++ ZendEngine2/zend_language_scanner.l Mon Aug 2 12:38:09 2004
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_language_scanner.l,v 1.114 2004/07/29 17:45:31 pollita Exp $ */
+/* $Id: zend_language_scanner.l,v 1.115 2004/08/02 16:38:09 helly Exp $ */
#define yyleng SCNG(yy_leng)
#define yytext SCNG(yy_text)
@@ -1302,21 +1302,6 @@
zendlval->value.str.val = estrndup(filename, zendlval->value.str.len);
zendlval->type = IS_STRING;
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"|"<" {