archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-20 01:14:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

*** empty log message ***

Browse source
This commit is contained in:
Zeev Suraski 2000-02-18 21:15:48 +00:00
parent d7e34cf6ea
commit c54864e3af
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Zend/zend-scanner.l
View file

@ -340,7 +340,6 @@ ZEND_API zend_op_array *v_compile_files(int mark_as_ref CLS_DC, int file_count,
int compiled_files=0; int compiled_files=0;
zend_bool original_in_compilation = CG(in_compilation); zend_bool original_in_compilation = CG(in_compilation);
CG(in_compilation) = 1;
init_op_array(op_array, INITIAL_OP_ARRAY_SIZE); init_op_array(op_array, INITIAL_OP_ARRAY_SIZE);
save_lexical_state(&original_lex_state CLS_CC); save_lexical_state(&original_lex_state CLS_CC);
@ -353,10 +352,12 @@ ZEND_API zend_op_array *v_compile_files(int mark_as_ref CLS_DC, int file_count,
if (open_file_for_scanning(file_handle CLS_CC)==FAILURE) { if (open_file_for_scanning(file_handle CLS_CC)==FAILURE) {
zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, file_handle->filename); zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, file_handle->filename);
} else { } else {
CG(in_compilation) = 1;
CG(active_op_array) = op_array; CG(active_op_array) = op_array;
compiler_result = zendparse(CLS_C); compiler_result = zendparse(CLS_C);
zend_close_file_handle(file_handle CLS_CC); zend_close_file_handle(file_handle CLS_CC);
restore_lexical_state(&original_lex_state CLS_CC); restore_lexical_state(&original_lex_state CLS_CC);
CG(in_compilation) = original_in_compilation;
if (compiler_result==1) { /* parser error */ if (compiler_result==1) { /* parser error */
CG(unclean_shutdown) = 1; CG(unclean_shutdown) = 1;
retval = NULL; retval = NULL;
@ -381,7 +382,6 @@ ZEND_API zend_op_array *v_compile_files(int mark_as_ref CLS_DC, int file_count,
retval = NULL; retval = NULL;
} }
} }
CG(in_compilation) = original_in_compilation;
return retval; return retval;
} }