diff options
| author | Nikita Popov <nikic@php.net> | 2015-07-09 19:10:06 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2015-07-09 19:11:48 +0200 |
| commit | d91aad5966f01259f0e1a431a754d917807761b5 (patch) | |
| tree | 61c8a47a8df510506e09730234d5d9c65fb59777 /ext/tokenizer/tokenizer_data.c | |
| parent | 8abc3022b070a378dc31f9727ddece78557ca7a8 (diff) | |
| download | php-git-d91aad5966f01259f0e1a431a754d917807761b5.tar.gz | |
Fix bug #69430
Don't throw from token_get_all() unless TOKEN_PARSE is used. Errors
are reported as T_ERROR tokens.
Diffstat (limited to 'ext/tokenizer/tokenizer_data.c')
| -rw-r--r-- | ext/tokenizer/tokenizer_data.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/tokenizer/tokenizer_data.c b/ext/tokenizer/tokenizer_data.c index 6769202a3b..5aeff66f3f 100644 --- a/ext/tokenizer/tokenizer_data.c +++ b/ext/tokenizer/tokenizer_data.c @@ -162,6 +162,7 @@ void tokenizer_register_constants(INIT_FUNC_ARGS) { REGISTER_LONG_CONSTANT("T_NS_C", T_NS_C, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("T_NS_SEPARATOR", T_NS_SEPARATOR, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("T_ELLIPSIS", T_ELLIPSIS, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("T_ERROR", T_ERROR, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("T_DOUBLE_COLON", T_PAAMAYIM_NEKUDOTAYIM, CONST_CS | CONST_PERSISTENT); } @@ -302,6 +303,7 @@ char *get_token_type_name(int token_type) case T_NS_C: return "T_NS_C"; case T_NS_SEPARATOR: return "T_NS_SEPARATOR"; case T_ELLIPSIS: return "T_ELLIPSIS"; + case T_ERROR: return "T_ERROR"; } return "UNKNOWN"; |