cvs: ZendEngine2(PHP_5_2) / zend.c zend_compile.c zend_compile.h zend_execute_API.c zend_vm_def.h zend_vm_execute.h

sesser Tue Jun 13 12:57:50 2006 UTC Modified files: (Branch: PHP_5_2) /ZendEngine2 zend.c zend_compile.c zend_compile.h zend_execute_API.c zend_vm_def.h zend_vm_execute.h Log: MFH: Added hook for compile_string() http://cvs.php.net/viewcvs.cgi/ZendEngine2/zend.c?r1=1.308.2.12.2.11&r2=1.308.2.12.2.12&diff_format=u Index: ZendEngine2/zend.c diff -u ZendEngine2/zend.c:1.308.2.12.2.11 ZendEngine2/zend.c:1.308.2.12.2.12 --- ZendEngine2/zend.c:1.308.2.12.2.11 Sun Jun 11 16:28:24 2006 +++ ZendEngine2/zend.c Tue Jun 13 12:57:48 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend.c,v 1.308.2.12.2.11 2006/06/11 16:28:24 iliaa Exp $ */ +/* $Id: zend.c,v 1.308.2.12.2.12 2006/06/13 12:57:48 sesser Exp $ */ #include "zend.h" #include "zend_extensions.h" @@ -605,6 +605,7 @@ zend_getenv = utility_functions->getenv_function; zend_compile_file = compile_file; + zend_compile_string = compile_string; zend_execute = execute; zend_execute_internal = NULL; zend_throw_exception_hook = NULL; http://cvs.php.net/viewcvs.cgi/ZendEngine2/zend_compile.c?r1=1.647.2.27.2.12&r2=1.647.2.27.2.13&diff_format=u Index: ZendEngine2/zend_compile.c diff -u ZendEngine2/zend_compile.c:1.647.2.27.2.12 ZendEngine2/zend_compile.c:1.647.2.27.2.13 --- ZendEngine2/zend_compile.c:1.647.2.27.2.12 Wed Jun 7 09:21:06 2006 +++ ZendEngine2/zend_compile.c Tue Jun 13 12:57:48 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_compile.c,v 1.647.2.27.2.12 2006/06/07 09:21:06 helly Exp $ */ +/* $Id: zend_compile.c,v 1.647.2.27.2.13 2006/06/13 12:57:48 sesser Exp $ */ #include <zend_language_parser.h> #include "zend.h" @@ -32,6 +32,7 @@ #endif /* ZEND_MULTIBYTE */ ZEND_API zend_op_array *(*zend_compile_file)(zend_file_handle *file_handle, int type TSRMLS_DC); +ZEND_API zend_op_array *(*zend_compile_string)(zval *source_string, char *filename TSRMLS_DC); #ifndef ZTS http://cvs.php.net/viewcvs.cgi/ZendEngine2/zend_compile.h?r1=1.316.2.8.2.3&r2=1.316.2.8.2.4&diff_format=u Index: ZendEngine2/zend_compile.h diff -u ZendEngine2/zend_compile.h:1.316.2.8.2.3 ZendEngine2/zend_compile.h:1.316.2.8.2.4 --- ZendEngine2/zend_compile.h:1.316.2.8.2.3 Sat May 27 18:39:53 2006 +++ ZendEngine2/zend_compile.h Tue Jun 13 12:57:48 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_compile.h,v 1.316.2.8.2.3 2006/05/27 18:39:53 helly Exp $ */ +/* $Id: zend_compile.h,v 1.316.2.8.2.4 2006/06/13 12:57:48 sesser Exp $ */ #ifndef ZEND_COMPILE_H #define ZEND_COMPILE_H @@ -321,6 +321,7 @@ void zend_init_compiler_data_structures(TSRMLS_D); extern ZEND_API zend_op_array *(*zend_compile_file)(zend_file_handle *file_handle, int type TSRMLS_DC); +extern ZEND_API zend_op_array *(*zend_compile_string)(zval *source_string, char *filename TSRMLS_DC); ZEND_API int lex_scan(zval *zendlval TSRMLS_DC); void startup_scanner(TSRMLS_D); http://cvs.php.net/viewcvs.cgi/ZendEngine2/zend_execute_API.c?r1=1.331.2.20.2.3&r2=1.331.2.20.2.4&diff_format=u Index: ZendEngine2/zend_execute_API.c diff -u ZendEngine2/zend_execute_API.c:1.331.2.20.2.3 ZendEngine2/zend_execute_API.c:1.331.2.20.2.4 --- ZendEngine2/zend_execute_API.c:1.331.2.20.2.3 Mon Jun 5 13:58:51 2006 +++ ZendEngine2/zend_execute_API.c Tue Jun 13 12:57:48 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_execute_API.c,v 1.331.2.20.2.3 2006/06/05 13:58:51 zeev Exp $ */ +/* $Id: zend_execute_API.c,v 1.331.2.20.2.4 2006/06/13 12:57:48 sesser Exp $ */ #include <stdio.h> #include <signal.h> @@ -1101,7 +1101,7 @@ original_handle_op_arrays = CG(handle_op_arrays); CG(handle_op_arrays) = 0; - new_op_array = compile_string(&pv, string_name TSRMLS_CC); + new_op_array = zend_compile_string(&pv, string_name TSRMLS_CC); CG(handle_op_arrays) = original_handle_op_arrays; if (new_op_array) { http://cvs.php.net/viewcvs.cgi/ZendEngine2/zend_vm_def.h?r1=1.59.2.29.2.9&r2=1.59.2.29.2.10&diff_format=u Index: ZendEngine2/zend_vm_def.h diff -u ZendEngine2/zend_vm_def.h:1.59.2.29.2.9 ZendEngine2/zend_vm_def.h:1.59.2.29.2.10 --- ZendEngine2/zend_vm_def.h:1.59.2.29.2.9 Thu Jun 8 08:56:26 2006 +++ ZendEngine2/zend_vm_def.h Tue Jun 13 12:57:48 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_vm_def.h,v 1.59.2.29.2.9 2006/06/08 08:56:26 dmitry Exp $ */ +/* $Id: zend_vm_def.h,v 1.59.2.29.2.10 2006/06/13 12:57:48 sesser Exp $ */ /* If you change this file, please regenerate the zend_vm_execute.h and * zend_vm_opcodes.h files by running: @@ -2766,7 +2766,7 @@ case ZEND_EVAL: { char *eval_desc = zend_make_compiled_string_description("eval()'d code" TSRMLS_CC); - new_op_array = compile_string(inc_filename, eval_desc TSRMLS_CC); + new_op_array = zend_compile_string(inc_filename, eval_desc TSRMLS_CC); efree(eval_desc); } break; http://cvs.php.net/viewcvs.cgi/ZendEngine2/zend_vm_execute.h?r1=1.62.2.30.2.9&r2=1.62.2.30.2.10&diff_format=u Index: ZendEngine2/zend_vm_execute.h diff -u ZendEngine2/zend_vm_execute.h:1.62.2.30.2.9 ZendEngine2/zend_vm_execute.h:1.62.2.30.2.10 --- ZendEngine2/zend_vm_execute.h:1.62.2.30.2.9 Thu Jun 8 08:56:26 2006 +++ ZendEngine2/zend_vm_execute.h Tue Jun 13 12:57:48 2006 @@ -1960,7 +1960,7 @@ case ZEND_EVAL: { char *eval_desc = zend_make_compiled_string_description("eval()'d code" TSRMLS_CC); - new_op_array = compile_string(inc_filename, eval_desc TSRMLS_CC); + new_op_array = zend_compile_string(inc_filename, eval_desc TSRMLS_CC); efree(eval_desc); } break; @@ -4460,7 +4460,7 @@ case ZEND_EVAL: { char *eval_desc = zend_make_compiled_string_description("eval()'d code" TSRMLS_CC); - new_op_array = compile_string(inc_filename, eval_desc TSRMLS_CC); + new_op_array = zend_compile_string(inc_filename, eval_desc TSRMLS_CC); efree(eval_desc); } break; @@ -7542,7 +7542,7 @@ case ZEND_EVAL: { char *eval_desc = zend_make_compiled_string_description("eval()'d code" TSRMLS_CC); - new_op_array = compile_string(inc_filename, eval_desc TSRMLS_CC); + new_op_array = zend_compile_string(inc_filename, eval_desc TSRMLS_CC); efree(eval_desc); } break; @@ -19764,7 +19764,7 @@ case ZEND_EVAL: { char *eval_desc = zend_make_compiled_string_description("eval()'d code" TSRMLS_CC); - new_op_array = compile_string(inc_filename, eval_desc TSRMLS_CC); + new_op_array = zend_compile_string(inc_filename, eval_desc TSRMLS_CC); efree(eval_desc); } break;