cvs: ZendEngine2 / zend_language_parser.y
[email protected] ("Pierre-Alain Joye")
| Newsgroups | php.zend-engine.cvs |
|---|---|
| Message-ID | <cvspajoye1228849028@cvsserver> |
pajoye Tue Dec 9 18:57:08 2008 UTC
Modified files:
/ZendEngine2 zend_language_parser.y
Log:
- fix EOL (which makes on bison 1.7 cry), nb: pls use unix EOL on mac
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_language_parser.y?r1=1.212&r2=1.213&diff_format=u
Index: ZendEngine2/zend_language_parser.y
diff -u ZendEngine2/zend_language_parser.y:1.212 ZendEngine2/zend_language_parser.y:1.213
--- ZendEngine2/zend_language_parser.y:1.212 Thu Dec 4 20:12:29 2008
+++ ZendEngine2/zend_language_parser.y Tue Dec 9 18:57:08 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_language_parser.y,v 1.212 2008/12/04 20:12:29 stas Exp $ */
+/* $Id: zend_language_parser.y,v 1.213 2008/12/09 18:57:08 pajoye Exp $ */
/*
* LALR shift/reduce conflicts and how they are resolved:
@@ -168,17 +168,17 @@
;
top_statement:
- statement { zend_verify_namespace(TSRMLS_C); }
- | function_declaration_statement { zend_verify_namespace(TSRMLS_C); zend_do_early_binding(TSRMLS_C); }
- | class_declaration_statement { zend_verify_namespace(TSRMLS_C); zend_do_early_binding(TSRMLS_C); }
- | T_HALT_COMPILER '(' ')' ';' { zend_do_halt_compiler_register(TSRMLS_C); YYACCEPT; }
- | T_NAMESPACE namespace_name ';' { zend_do_begin_namespace(&$2, 0 TSRMLS_CC); }
- | T_NAMESPACE namespace_name '{' { zend_do_begin_namespace(&$2, 1 TSRMLS_CC); }
- top_statement_list '}' { zend_do_end_namespace(TSRMLS_C); }
- | T_NAMESPACE '{' { zend_do_begin_namespace(NULL, 1 TSRMLS_CC); }
- top_statement_list '}' { zend_do_end_namespace(TSRMLS_C); }
- | T_USE use_declarations ';' { zend_verify_namespace(TSRMLS_C); }
- | constant_declaration ';' { zend_verify_namespace(TSRMLS_C); }
+ statement { zend_verify_namespace(TSRMLS_C); }
+ | function_declaration_statement { zend_verify_namespace(TSRMLS_C); zend_do_early_binding(TSRMLS_C); }
+ | class_declaration_statement { zend_verify_namespace(TSRMLS_C); zend_do_early_binding(TSRMLS_C); }
+ | T_HALT_COMPILER '(' ')' ';' { zend_do_halt_compiler_register(TSRMLS_C); YYACCEPT; }
+ | T_NAMESPACE namespace_name ';' { zend_do_begin_namespace(&$2, 0 TSRMLS_CC); }
+ | T_NAMESPACE namespace_name '{' { zend_do_begin_namespace(&$2, 1 TSRMLS_CC); }
+ top_statement_list '}' { zend_do_end_namespace(TSRMLS_C); }
+ | T_NAMESPACE '{' { zend_do_begin_namespace(NULL, 1 TSRMLS_CC); }
+ top_statement_list '}' { zend_do_end_namespace(TSRMLS_C); }
+ | T_USE use_declarations ';' { zend_verify_namespace(TSRMLS_C); }
+ | constant_declaration ';' { zend_verify_namespace(TSRMLS_C); }
;
use_declarations: