diff options
| author | Nikita Popov <nikic@php.net> | 2015-04-20 20:16:58 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2015-04-21 17:39:07 +0200 |
| commit | d2607a0110fae2ec403ac7317d064ab74aa40e09 (patch) | |
| tree | ead4c395fc54ff4d4f99965bb9a24dfd77cb1a67 /Zend/zend_language_scanner.l | |
| parent | a18c4c99eac408e9c7725738e64ba55cbaaf7acb (diff) | |
| download | php-git-d2607a0110fae2ec403ac7317d064ab74aa40e09.tar.gz | |
Move more stuff to file_context
Introduce helper macro FC(x) for CG(file_context).x.
end_compilation() now handled by file_context_end().
While at it, dropped zval wrapper for ticcks.
Diffstat (limited to 'Zend/zend_language_scanner.l')
| -rw-r--r-- | Zend/zend_language_scanner.l | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l index c94792a358..c778a9a4c3 100644 --- a/Zend/zend_language_scanner.l +++ b/Zend/zend_language_scanner.l @@ -593,7 +593,6 @@ ZEND_API zend_op_array *compile_file(zend_file_handle *file_handle, int type) zend_file_context_begin(&original_file_context); zend_oparray_context_begin(&original_oparray_context); zend_compile_top_stmt(CG(ast)); - zend_do_end_compilation(); zend_emit_final_return(&retval_zv); pass_two(op_array); zend_oparray_context_end(&original_oparray_context); @@ -757,7 +756,6 @@ zend_op_array *compile_string(zval *source_string, char *filename) zend_file_context_begin(&original_file_context); zend_oparray_context_begin(&original_oparray_context); zend_compile_top_stmt(CG(ast)); - zend_do_end_compilation(); zend_emit_final_return(NULL); pass_two(op_array); zend_oparray_context_end(&original_oparray_context); |