felipe Wed, 14 Jul 2010 02:21:38 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=301255
Log: - Disable error recovery Changed paths: U php/php-src/branches/LEMON/Zend/zend_compile.c U php/php-src/branches/LEMON/Zend/zend_language_parser.y Modified: php/php-src/branches/LEMON/Zend/zend_compile.c =================================================================== --- php/php-src/branches/LEMON/Zend/zend_compile.c 2010-07-14 00:57:24 UTC (rev 301254) +++ php/php-src/branches/LEMON/Zend/zend_compile.c 2010-07-14 02:21:38 UTC (rev 301255) @@ -6167,24 +6167,22 @@ zend_lang_parse(pParser, token, zendlval TSRMLS_CC); CG(zend_lineno) = lineno; - if (token == 0) { + if (token == 0 || EG(exit_status) == 255) { break; - } else if (EG(exit_status) == 255 || (halting == 1 && token == T_SEMICOLON)) { - /* Handles E_PARSE and __HALT_COMPILER(); */ + } else if (halting == 1 && token == T_SEMICOLON){ + /* Handles __HALT_COMPILER(); */ zend_lang_parse(pParser, 0, zendlval TSRMLS_CC); - if (EG(exit_status) == 255) { - goto end_parse; - } break; } } -end_parse: zend_lang_parseFree(pParser, free); + if (EG(exit_status) == 255) { /* We got an E_PARSE */ return 1; } EG(exit_status) = old_exit_status; + 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-14 00:57:24 UTC (rev 301254) +++ php/php-src/branches/LEMON/Zend/zend_language_parser.y 2010-07-14 02:21:38 UTC (rev 301255) @@ -30,6 +30,7 @@ #include "zend_API.h" #include "zend_constants.h" +#define YYNOERRORRECOVERY #define NDEBUG }
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php