[PHP-CVS] svn: /php/php-src/branches/LEMON/Zend/ zend_compile.c zend_compile.h zend_language_parser.y

[Felipe Pena]

felipe                                   Mon, 12 Jul 2010 11:50:17 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=301182

Log:
- Added parser name and prototype declaration

Changed paths:
    U   php/php-src/branches/LEMON/Zend/zend_compile.c
    U   php/php-src/branches/LEMON/Zend/zend_compile.h
    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-12 10:41:23 UTC 
(rev 301181)
+++ php/php-src/branches/LEMON/Zend/zend_compile.c      2010-07-12 11:50:17 UTC 
(rev 301182)
@@ -6112,8 +6112,8 @@
        int token, halting = 0;
        void *pParser;

-       if ((pParser = ParseAlloc(malloc)) == NULL) {
-               ParseFree(pParser, free);
+       if ((pParser = zend_lang_parseAlloc(malloc)) == NULL) {
+               zend_lang_parseFree(pParser, free);
                return 1;
        }

@@ -6159,15 +6159,15 @@
                        default:
                                break;
                }
-               Parse(pParser, token, zendlval TSRMLS_CC);
+               zend_lang_parse(pParser, token, zendlval TSRMLS_CC);
                if (token == 0) {
                        break;
                } else if (halting == 1 && token == T_SEMICOLON) {
-                       Parse(pParser, 0, zendlval TSRMLS_CC);
+                       zend_lang_parse(pParser, 0, zendlval TSRMLS_CC);
                        break;
                }
        }
-       ParseFree(pParser, free);
+       zend_lang_parseFree(pParser, free);

        return 0;
 }

Modified: php/php-src/branches/LEMON/Zend/zend_compile.h
===================================================================
--- php/php-src/branches/LEMON/Zend/zend_compile.h      2010-07-12 10:41:23 UTC 
(rev 301181)
+++ php/php-src/branches/LEMON/Zend/zend_compile.h      2010-07-12 11:50:17 UTC 
(rev 301182)
@@ -662,7 +662,11 @@
 ZEND_API int zend_auto_global_disable_jit(const char *varname, zend_uint 
varname_length TSRMLS_DC);
 ZEND_API size_t zend_dirname(char *path, size_t len);

+/* Parser */
 int zendparse(TSRMLS_D);
+void *zend_lang_parseAlloc(void *(*mallocProc)(size_t));
+void zend_lang_parseFree(void *p, void (*freeProc)(void*));
+void zend_lang_parse(void *yyp, int yymajor, znode yyminor TSRMLS_DC);

 int zend_add_literal(zend_op_array *op_array, const zval *zv);


Modified: php/php-src/branches/LEMON/Zend/zend_language_parser.y
===================================================================
--- php/php-src/branches/LEMON/Zend/zend_language_parser.y      2010-07-12 
10:41:23 UTC (rev 301181)
+++ php/php-src/branches/LEMON/Zend/zend_language_parser.y      2010-07-12 
11:50:17 UTC (rev 301182)
@@ -31,6 +31,8 @@
 #include "zend_constants.h"
 }

+%name zend_lang_parse
+
 %syntax_error {
     zend_error(E_PARSE, "syntax error, unexpected '%.*s'", LANG_SCNG(yy_leng), 
LANG_SCNG(yy_text));
     zend_bailout();


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php