From 7f5c3957811ede94a43a60d740a32f00b89e5ced Mon Sep 17 00:00:00 2001 From: Andrei Zmievski Date: Thu, 23 Feb 2006 18:06:36 +0000 Subject: [PATCH] *** empty log message *** --- Zend/zend_language_parser.y | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 0c13a5289d..a0addb86dc 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -611,13 +611,8 @@ expr_without_variable: | internal_functions_in_yacc { $$ = $1; } | T_INT_CAST expr { zend_do_cast(&$$, &$2, IS_LONG TSRMLS_CC); } | T_DOUBLE_CAST expr { zend_do_cast(&$$, &$2, IS_DOUBLE TSRMLS_CC); } -<<<<<<< zend_language_parser.y - | T_STRING_CAST expr { zend_do_cast(&$$, &$2, IS_STRING TSRMLS_CC); } - | T_UNICODE_CAST expr { zend_do_cast(&$$, &$2, IS_UNICODE TSRMLS_CC); } -======= | T_STRING_CAST expr { zend_do_cast(&$$, &$2, UG(unicode)?IS_UNICODE:IS_STRING TSRMLS_CC); } | T_UNICODE_CAST expr { zend_do_cast(&$$, &$2, IS_UNICODE TSRMLS_CC); } ->>>>>>> 1.167 | T_ARRAY_CAST expr { zend_do_cast(&$$, &$2, IS_ARRAY TSRMLS_CC); } | T_OBJECT_CAST expr { zend_do_cast(&$$, &$2, IS_OBJECT TSRMLS_CC); } | T_BOOL_CAST expr { zend_do_cast(&$$, &$2, IS_BOOL TSRMLS_CC); } -- 2.50.1