cvs: ZendEngine2(PHP_5_3) / zend_language_parser.y
[email protected] ("Dmitry Stogov")
| Newsgroups | php.zend-engine.cvs |
|---|---|
| Message-ID | <cvsdmitry1202806148@cvsserver> |
dmitry Tue Feb 12 08:49:08 2008 UTC
Modified files: (Branch: PHP_5_3)
/ZendEngine2 zend_language_parser.y
Log:
Fixed ext/tokenizer test failures because of token renumbering
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_language_parser.y?r1=1.160.2.4.2.8.2.15&r2=1.160.2.4.2.8.2.16&diff_format=u
Index: ZendEngine2/zend_language_parser.y
diff -u ZendEngine2/zend_language_parser.y:1.160.2.4.2.8.2.15 ZendEngine2/zend_language_parser.y:1.160.2.4.2.8.2.16
--- ZendEngine2/zend_language_parser.y:1.160.2.4.2.8.2.15 Tue Feb 12 00:20:33 2008
+++ ZendEngine2/zend_language_parser.y Tue Feb 12 08:49:08 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_language_parser.y,v 1.160.2.4.2.8.2.15 2008/02/12 00:20:33 stas Exp $ */
+/* $Id: zend_language_parser.y,v 1.160.2.4.2.8.2.16 2008/02/12 08:49:08 dmitry Exp $ */
/*
* LALR shift/reduce conflicts and how they are resolved:
@@ -132,7 +132,6 @@
%token T_FUNC_C
%token T_LINE
%token T_FILE
-%token T_DIR
%token T_COMMENT
%token T_DOC_COMMENT
%token T_OPEN_TAG
@@ -146,6 +145,7 @@
%token T_PAAMAYIM_NEKUDOTAYIM
%token T_NAMESPACE
%token T_NS_C
+%token T_DIR
%% /* Rules */