diff options
| author | Dmitry Stogov <dmitry@php.net> | 2008-07-26 15:30:28 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2008-07-26 15:30:28 +0000 |
| commit | 478acfd8b4ae8f209e0f515faa391d53256f364f (patch) | |
| tree | 3fc56d5ac3bca480c2988cd842a8d55e9aa9197f /ext/tokenizer | |
| parent | 8b142365579afb27bb199c75baefd53fd454fb76 (diff) | |
| download | php-git-478acfd8b4ae8f209e0f515faa391d53256f364f.tar.gz | |
. Added support for using static HEREDOCs to initialize static variables and class members or constants. (Matt)
. Improved syntax highlighting and consistency for variables in double-quoted strings and literal text in HEREDOCs and backticks. (Matt)
. Optimized interpolated strings to use one less opcode. (Matt)
Diffstat (limited to 'ext/tokenizer')
| -rw-r--r-- | ext/tokenizer/tokenizer.c | 2 | ||||
| -rw-r--r-- | ext/tokenizer/tokenizer_data.c | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/ext/tokenizer/tokenizer.c b/ext/tokenizer/tokenizer.c index bd76ac1a28..b31b28e440 100644 --- a/ext/tokenizer/tokenizer.c +++ b/ext/tokenizer/tokenizer.c @@ -132,7 +132,7 @@ static void tokenize(zval *return_value TSRMLS_DC) MAKE_STD_ZVAL(keyword); array_init(keyword); add_next_index_long(keyword, token_type); - if (token_type == T_END_HEREDOC || token_type == T_END_NOWDOC) { + if (token_type == T_END_HEREDOC) { if (CG(increment_lineno)) { token_line = ++CG(zend_lineno); CG(increment_lineno) = 0; diff --git a/ext/tokenizer/tokenizer_data.c b/ext/tokenizer/tokenizer_data.c index 344ed59deb..0dcac6f500 100644 --- a/ext/tokenizer/tokenizer_data.c +++ b/ext/tokenizer/tokenizer_data.c @@ -151,8 +151,6 @@ void tokenizer_register_constants(INIT_FUNC_ARGS) { REGISTER_LONG_CONSTANT("T_NAMESPACE", T_NAMESPACE, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("T_NS_C", T_NS_C, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("T_DIR", T_DIR, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("T_START_NOWDOC", T_START_NOWDOC, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("T_END_NOWDOC", T_END_NOWDOC, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("T_DOUBLE_COLON", T_PAAMAYIM_NEKUDOTAYIM, CONST_CS | CONST_PERSISTENT); } @@ -282,8 +280,6 @@ char *get_token_type_name(int token_type) case T_NAMESPACE: return "T_NAMESPACE"; case T_NS_C: return "T_NS_C"; case T_DIR: return "T_DIR"; - case T_START_NOWDOC: return "T_START_NOWDOC"; - case T_END_NOWDOC: return "T_END_NOWDOC"; } return "UNKNOWN"; |