diff options
| author | Felipe Pena <felipe@php.net> | 2010-07-10 20:16:15 +0000 |
|---|---|---|
| committer | Felipe Pena <felipe@php.net> | 2010-07-10 20:16:15 +0000 |
| commit | 2610647b0e859a47d407a074cafa631f7ab54670 (patch) | |
| tree | c95dbd0af0f8630fdd5c907c0e07a923233c5900 | |
| parent | 135252028698687a8b40e92df47a5eb772faa1ee (diff) | |
| download | php-git-2610647b0e859a47d407a074cafa631f7ab54670.tar.gz | |
- Fix the static_scalar rule
| -rw-r--r-- | Zend/zend_compile.c | 5 | ||||
| -rw-r--r-- | Zend/zend_language_parser.y | 2 | ||||
| -rw-r--r-- | Zend/zend_language_scanner.c | 2 | ||||
| -rw-r--r-- | Zend/zend_language_scanner_defs.h | 2 |
4 files changed, 3 insertions, 8 deletions
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 925277ef9b..50c69c2651 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -6163,11 +6163,6 @@ again: } ParseFree(pParser, free); - /* We got a parse error occured */ - if (EG(exit_status) == 255) { - return 1; - } - return 0; } /* }}} */ diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 1371b278ca..6914f3e3ca 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -1370,7 +1370,7 @@ static_scalar(A) ::= namespace_name(B). { zend_do_fetch_constant(&A, NULL, &B, Z 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; } diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c index f0a5207af6..c60ac7e50e 100644 --- a/Zend/zend_language_scanner.c +++ b/Zend/zend_language_scanner.c @@ -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" /* +----------------------------------------------------------------------+ diff --git a/Zend/zend_language_scanner_defs.h b/Zend/zend_language_scanner_defs.h index 5fec474479..1de5ccf7fc 100644 --- a/Zend/zend_language_scanner_defs.h +++ b/Zend/zend_language_scanner_defs.h @@ -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 { |