diff options
| author | Stanislav Malyshev <stas@php.net> | 2013-06-16 15:29:25 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-06-16 15:29:25 -0700 |
| commit | ac343d5c1f8de884921d8acddb2cc81227674615 (patch) | |
| tree | 8c84c0c0b5b2ec8279177b64a6dca6f35e885d52 /Zend/zend_language_scanner.l | |
| parent | 3625b83aaa242c7c6aff045c03203a1b195bc310 (diff) | |
| parent | 2208447d428542960c73cfeceaf52e95ff0ca2d0 (diff) | |
| download | php-git-ac343d5c1f8de884921d8acddb2cc81227674615.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #64936 - clean doc comment state at the beginning and end of the scan
ws fix
Conflicts:
Zend/zend_language_scanner.c
Zend/zend_language_scanner.l
Zend/zend_language_scanner_defs.h
Diffstat (limited to 'Zend/zend_language_scanner.l')
| -rw-r--r-- | Zend/zend_language_scanner.l | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l index 3e117a32e0..d2e7243bb2 100644 --- a/Zend/zend_language_scanner.l +++ b/Zend/zend_language_scanner.l @@ -258,6 +258,8 @@ ZEND_API void zend_restore_lexical_state(zend_lex_state *lex_state TSRMLS_DC) SCNG(input_filter) = lex_state->input_filter; SCNG(output_filter) = lex_state->output_filter; SCNG(script_encoding) = lex_state->script_encoding; + + RESET_DOC_COMMENT(); } ZEND_API void zend_destroy_file_handle(zend_file_handle *file_handle TSRMLS_DC) @@ -541,6 +543,7 @@ ZEND_API int open_file_for_scanning(zend_file_handle *file_handle TSRMLS_DC) CG(zend_lineno) = 1; } + RESET_DOC_COMMENT(); CG(increment_lineno) = 0; return SUCCESS; } @@ -691,6 +694,7 @@ ZEND_API int zend_prepare_string_for_scanning(zval *str, char *filename TSRMLS_D zend_set_compiled_filename(filename TSRMLS_CC); CG(zend_lineno) = 1; CG(increment_lineno) = 0; + RESET_DOC_COMMENT(); return SUCCESS; } |