felipe Sat, 10 Jul 2010 20:16:15 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=301156
Log:
- Fix the static_scalar rule
Changed paths:
U php/php-src/branches/LEMON/Zend/zend_compile.c
U php/php-src/branches/LEMON/Zend/zend_language_parser.y
U php/php-src/branches/LEMON/Zend/zend_language_scanner.c
U php/php-src/branches/LEMON/Zend/zend_language_scanner_defs.h
Modified: php/php-src/branches/LEMON/Zend/zend_compile.c
===================================================================
--- php/php-src/branches/LEMON/Zend/zend_compile.c 2010-07-10 17:11:10 UTC
(rev 301155)
+++ php/php-src/branches/LEMON/Zend/zend_compile.c 2010-07-10 20:16:15 UTC
(rev 301156)
@@ -6163,11 +6163,6 @@
}
ParseFree(pParser, free);
- /* We got a parse error occured */
- if (EG(exit_status) == 255) {
- return 1;
- }
-
return 0;
}
/* }}} */
Modified: php/php-src/branches/LEMON/Zend/zend_language_parser.y
===================================================================
--- php/php-src/branches/LEMON/Zend/zend_language_parser.y 2010-07-10
17:11:10 UTC (rev 301155)
+++ php/php-src/branches/LEMON/Zend/zend_language_parser.y 2010-07-10
20:16:15 UTC (rev 301156)
@@ -1370,7 +1370,7 @@
static_scalar(A) ::= NAMESPACE NS_SEPARATOR namespace_name(B). { A.op_type =
IS_CONST; ZVAL_EMPTY_STRING(&A.u.constant); zend_do_build_namespace_name(&A,
&A, &B TSRMLS_CC); B = A; zend_do_fetch_constant(&A, NULL, &B, ZEND_CT, 0
TSRMLS_CC); }
static_scalar(A) ::= NS_SEPARATOR namespace_name(B). { char *tmp =
estrndup(Z_STRVAL(B.u.constant), Z_STRLEN(B.u.constant)+1); memcpy(&(tmp[1]),
Z_STRVAL(B.u.constant), Z_STRLEN(B.u.constant)+1); tmp[0] = '\\';
efree(Z_STRVAL(B.u.constant)); Z_STRVAL(B.u.constant) = tmp;
++Z_STRLEN(B.u.constant); zend_do_fetch_constant(&A, NULL, &B, ZEND_CT, 0
TSRMLS_CC); }
static_scalar(A) ::= PLUS(B) static_scalar(C). { ZVAL_LONG(&B.u.constant, 0);
add_function(&C.u.constant, &B.u.constant, &C.u.constant TSRMLS_CC); A = C; }
-static_scalar(A) ::= MINUS(B) static_scalar(C). { ZVAL_LONG(&C.u.constant, 0);
sub_function(&C.u.constant, &B.u.constant, &C.u.constant TSRMLS_CC); A = C; }
+static_scalar(A) ::= MINUS(B) static_scalar(C). { ZVAL_LONG(&B.u.constant, 0);
sub_function(&C.u.constant, &B.u.constant, &C.u.constant TSRMLS_CC); A = C; }
static_scalar(A) ::= ARRAY LPAREN static_array_pair_list(B) RPAREN. { A = B;
Z_TYPE(A.u.constant) = IS_CONSTANT_ARRAY; }
static_scalar(A) ::= static_class_constant(B). { A = B; }
Modified: php/php-src/branches/LEMON/Zend/zend_language_scanner.c
===================================================================
--- php/php-src/branches/LEMON/Zend/zend_language_scanner.c 2010-07-10
17:11:10 UTC (rev 301155)
+++ php/php-src/branches/LEMON/Zend/zend_language_scanner.c 2010-07-10
20:16:15 UTC (rev 301156)
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Fri Jul 9 21:47:41 2010 */
+/* Generated by re2c 0.13.5 on Sat Jul 10 16:00:37 2010 */
#line 1 "Zend/zend_language_scanner.l"
/*
+----------------------------------------------------------------------+
Modified: php/php-src/branches/LEMON/Zend/zend_language_scanner_defs.h
===================================================================
--- php/php-src/branches/LEMON/Zend/zend_language_scanner_defs.h
2010-07-10 17:11:10 UTC (rev 301155)
+++ php/php-src/branches/LEMON/Zend/zend_language_scanner_defs.h
2010-07-10 20:16:15 UTC (rev 301156)
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Fri Jul 9 21:47:41 2010 */
+/* Generated by re2c 0.13.5 on Sat Jul 10 16:00:37 2010 */
#line 3 "Zend/zend_language_scanner_defs.h"
enum YYCONDTYPE {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
