diff options
| author | Zeev Suraski <zeev@php.net> | 2000-02-18 21:15:48 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2000-02-18 21:15:48 +0000 |
| commit | c54864e3af7acd73bffeba9c996917b82c5c133a (patch) | |
| tree | 63c84d02ea47ef073e8ccd1c3ededc71433f7017 | |
| parent | d7e34cf6ea77c1639ed367c5216fc4f5be0286d7 (diff) | |
| download | php-git-c54864e3af7acd73bffeba9c996917b82c5c133a.tar.gz | |
*** empty log message ***
| -rw-r--r-- | Zend/zend-scanner.l | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend-scanner.l b/Zend/zend-scanner.l index 02ea8f54f9..29620380db 100644 --- a/Zend/zend-scanner.l +++ b/Zend/zend-scanner.l @@ -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; zend_bool original_in_compilation = CG(in_compilation); - CG(in_compilation) = 1; init_op_array(op_array, INITIAL_OP_ARRAY_SIZE); 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) { zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, file_handle->filename); } else { + CG(in_compilation) = 1; CG(active_op_array) = op_array; compiler_result = zendparse(CLS_C); zend_close_file_handle(file_handle CLS_CC); restore_lexical_state(&original_lex_state CLS_CC); + CG(in_compilation) = original_in_compilation; if (compiler_result==1) { /* parser error */ CG(unclean_shutdown) = 1; 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; } } - CG(in_compilation) = original_in_compilation; return retval; } |