cvs: ZendEngine2 / 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:56:20 2006 UTC Modified files: /ZendEngine2 zend.c zend_compile.c zend_compile.h zend_execute_API.c zend_vm_def.h zend_vm_execute.h Log: Added hook for compile_string() http://cvs.php.net/viewcvs.cgi/ZendEngine2/zend.c?r1=1.360&r2=1.361&diff_format=u Index: ZendEngine2/zend.c diff -u ZendEngine2/zend.c:1.360 ZendEngine2/zend.c:1.361 --- ZendEngine2/zend.c:1.360 Mon Jun 12 22:48:46 2006 +++ ZendEngine2/zend.c Tue Jun 13 12:56:20 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend.c,v 1.360 2006/06/12 22:48:46 helly Exp $ */ +/* $Id: zend.c,v 1.361 2006/06/13 12:56:20 sesser Exp $ */ #include "zend.h" #include "zend_extensions.h" @@ -1004,6 +1004,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.716&r2=1.717&diff_format=u Index: ZendEngine2/zend_compile.c diff -u ZendEngine2/zend_compile.c:1.716 ZendEngine2/zend_compile.c:1.717 --- ZendEngine2/zend_compile.c:1.716 Wed Jun 7 09:23:58 2006 +++ ZendEngine2/zend_compile.c Tue Jun 13 12:56:20 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_compile.c,v 1.716 2006/06/07 09:23:58 helly Exp $ */ +/* $Id: zend_compile.c,v 1.717 2006/06/13 12:56:20 sesser Exp $ */ #include <zend_language_parser.h> #include "zend.h" @@ -28,6 +28,7 @@ #include "zend_fast_cache.h" 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.342&r2=1.343&diff_format=u Index: ZendEngine2/zend_compile.h diff -u ZendEngine2/zend_compile.h:1.342 ZendEngine2/zend_compile.h:1.343 --- ZendEngine2/zend_compile.h:1.342 Sat May 27 02:12:43 2006 +++ ZendEngine2/zend_compile.h Tue Jun 13 12:56:20 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_compile.h,v 1.342 2006/05/27 02:12:43 helly Exp $ */ +/* $Id: zend_compile.h,v 1.343 2006/06/13 12:56:20 sesser Exp $ */ #ifndef ZEND_COMPILE_H #define ZEND_COMPILE_H @@ -326,6 +326,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.372&r2=1.373&diff_format=u Index: ZendEngine2/zend_execute_API.c diff -u ZendEngine2/zend_execute_API.c:1.372 ZendEngine2/zend_execute_API.c:1.373 --- ZendEngine2/zend_execute_API.c:1.372 Thu May 25 07:23:38 2006 +++ ZendEngine2/zend_execute_API.c Tue Jun 13 12:56:20 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_execute_API.c,v 1.372 2006/05/25 07:23:38 dmitry Exp $ */ +/* $Id: zend_execute_API.c,v 1.373 2006/06/13 12:56:20 sesser Exp $ */ #include <stdio.h> #include <signal.h> @@ -1192,7 +1192,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.119&r2=1.120&diff_format=u Index: ZendEngine2/zend_vm_def.h diff -u ZendEngine2/zend_vm_def.h:1.119 ZendEngine2/zend_vm_def.h:1.120 --- ZendEngine2/zend_vm_def.h:1.119 Thu Jun 8 08:56:47 2006 +++ ZendEngine2/zend_vm_def.h Tue Jun 13 12:56:20 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_vm_def.h,v 1.119 2006/06/08 08:56:47 dmitry Exp $ */ +/* $Id: zend_vm_def.h,v 1.120 2006/06/13 12:56:20 sesser Exp $ */ /* If you change this file, please regenerate the zend_vm_execute.h and * zend_vm_opcodes.h files by running: @@ -2816,7 +2816,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.123&r2=1.124&diff_format=u Index: ZendEngine2/zend_vm_execute.h diff -u ZendEngine2/zend_vm_execute.h:1.123 ZendEngine2/zend_vm_execute.h:1.124 --- ZendEngine2/zend_vm_execute.h:1.123 Thu Jun 8 08:56:47 2006 +++ ZendEngine2/zend_vm_execute.h Tue Jun 13 12:56:20 2006 @@ -1927,7 +1927,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; @@ -4483,7 +4483,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; @@ -7636,7 +7636,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; @@ -20369,7 +20369,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;