diff options
Diffstat (limited to 'Zend/zend_language_scanner.l')
-rw-r--r-- | Zend/zend_language_scanner.l | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l index 7dcb4dfcee..f2a3d15c74 100644 --- a/Zend/zend_language_scanner.l +++ b/Zend/zend_language_scanner.l @@ -685,7 +685,7 @@ zend_op_array *compile_filename(int type, zval *filename) return retval; } -ZEND_API int zend_prepare_string_for_scanning(zval *str, char *filename) +ZEND_API int zend_prepare_string_for_scanning(zval *str, const char *filename) { char *buf; size_t size, old_len; @@ -753,7 +753,7 @@ ZEND_API size_t zend_get_scanned_file_offset(void) return offset; } -zend_op_array *compile_string(zval *source_string, char *filename) +zend_op_array *compile_string(zval *source_string, const char *filename) { zend_lex_state original_lex_state; zend_op_array *op_array = NULL; @@ -784,7 +784,7 @@ zend_op_array *compile_string(zval *source_string, char *filename) BEGIN_EXTERN_C() -int highlight_file(char *filename, zend_syntax_highlighter_ini *syntax_highlighter_ini) +int highlight_file(const char *filename, zend_syntax_highlighter_ini *syntax_highlighter_ini) { zend_lex_state original_lex_state; zend_file_handle file_handle; @@ -806,7 +806,7 @@ int highlight_file(char *filename, zend_syntax_highlighter_ini *syntax_highlight return SUCCESS; } -int highlight_string(zval *str, zend_syntax_highlighter_ini *syntax_highlighter_ini, char *str_name) +int highlight_string(zval *str, zend_syntax_highlighter_ini *syntax_highlighter_ini, const char *str_name) { zend_lex_state original_lex_state; zval tmp; @@ -2859,14 +2859,7 @@ nowdoc_scan_done: RETURN_TOKEN(END); } - if (!SCNG(heredoc_scan_ahead)) { - zend_error(E_COMPILE_WARNING, "Unexpected character in input: '%c' (ASCII=%d) state=%d", yytext[0], yytext[0], YYSTATE); - } - if (PARSER_MODE()) { - goto restart; - } else { - RETURN_TOKEN(T_BAD_CHARACTER); - } + RETURN_TOKEN(T_BAD_CHARACTER); } */ |