svn: /php/php-src/branches/LEMON/Zend/ zend_language_parser.y
| From: | Felipe Pena | Date: | Sat, 10 Jul 2010 15:49:15 +0000 |
| Subject: | svn: /php/php-src/branches/LEMON/Zend/ zend_language_parser.y | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-63096@lists.php.net to get a copy of this message | ||
felipe Sat, 10 Jul 2010 15:49:15 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=301153
Log:
- Fixed heredoc bug
Changed paths:
U php/php-src/branches/LEMON/Zend/zend_language_parser.y
Modified: php/php-src/branches/LEMON/Zend/zend_language_parser.y
===================================================================
--- php/php-src/branches/LEMON/Zend/zend_language_parser.y 2010-07-10 13:56:33 UTC (rev 301152)
+++ php/php-src/branches/LEMON/Zend/zend_language_parser.y 2010-07-10 15:49:15 UTC (rev 301153)
@@ -1700,7 +1700,7 @@
//;
encaps_list(A) ::= encaps_list(B) encaps_var(C). { zend_do_end_variable_parse(&B, BP_VAR_R, 0
TSRMLS_CC); zend_do_add_variable(&A, &B, &C TSRMLS_CC); }
-encaps_list(A) ::= encaps_list(B) ENCAPSED_AND_WHITESPACE(C). { zend_do_add_string(&A, &B,
&C TSRMLS_CC); }
+encaps_list(A) ::= encaps_list(B) ENCAPSED_AND_WHITESPACE(C). { zend_do_add_string(&B, &B,
&C TSRMLS_CC); A = B; }
encaps_list(A) ::= encaps_var(B). { zend_do_end_variable_parse(&B, BP_VAR_R, 0 TSRMLS_CC);
zend_do_add_variable(&A, NULL, &B TSRMLS_CC); }
encaps_list(A) ::= ENCAPSED_AND_WHITESPACE(B) encaps_var(C). { zend_do_add_string(&A, NULL,
&B TSRMLS_CC); zend_do_end_variable_parse(&C, BP_VAR_R, 0 TSRMLS_CC);
zend_do_add_variable(&A, &A, &C TSRMLS_CC); }