diff options
| author | Anatol Belski <ab@php.net> | 2014-08-25 19:24:55 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-08-25 19:24:55 +0200 |
| commit | c3e3c98ec666812daaaca896cf5ef758a8a6df14 (patch) | |
| tree | d82a76de5c8d117d1cf2dcca19bb30a283621870 /ext/tokenizer/tokenizer.c | |
| parent | 0cf2dbdf58645b52cb6582b1b2571c5cd9e9e6b3 (diff) | |
| download | php-git-c3e3c98ec666812daaaca896cf5ef758a8a6df14.tar.gz | |
master renames phase 1
Diffstat (limited to 'ext/tokenizer/tokenizer.c')
| -rw-r--r-- | ext/tokenizer/tokenizer.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ext/tokenizer/tokenizer.c b/ext/tokenizer/tokenizer.c index be0b6a302a..1847b0537d 100644 --- a/ext/tokenizer/tokenizer.c +++ b/ext/tokenizer/tokenizer.c @@ -131,7 +131,7 @@ static void tokenize(zval *return_value TSRMLS_DC) if (token_type >= 256) { array_init(&keyword); - add_next_index_int(&keyword, token_type); + add_next_index_long(&keyword, token_type); if (token_type == T_END_HEREDOC) { if (CG(increment_lineno)) { token_line = ++CG(zend_lineno); @@ -139,7 +139,7 @@ static void tokenize(zval *return_value TSRMLS_DC) } } add_next_index_stringl(&keyword, (char *)zendtext, zendleng); - add_next_index_int(&keyword, token_line); + add_next_index_long(&keyword, token_line); add_next_index_zval(return_value, &keyword); } else { add_next_index_stringl(return_value, (char *)zendtext, zendleng); @@ -158,9 +158,9 @@ static void tokenize(zval *return_value TSRMLS_DC) // fetch the rest into a T_INLINE_HTML if (zendcursor != zendlimit) { array_init(&keyword); - add_next_index_int(&keyword, T_INLINE_HTML); + add_next_index_long(&keyword, T_INLINE_HTML); add_next_index_stringl(&keyword, (char *)zendcursor, zendlimit - zendcursor); - add_next_index_int(&keyword, token_line); + add_next_index_long(&keyword, token_line); add_next_index_zval(return_value, &keyword); } break; @@ -185,7 +185,7 @@ PHP_FUNCTION(token_get_all) return; } - ZVAL_STR(&source_zval, STR_COPY(source)); + ZVAL_STR(&source_zval, zend_string_copy(source)); zend_save_lexical_state(&original_lex_state TSRMLS_CC); if (zend_prepare_string_for_scanning(&source_zval, "" TSRMLS_CC) == FAILURE) { @@ -206,9 +206,9 @@ PHP_FUNCTION(token_get_all) */ PHP_FUNCTION(token_name) { - php_int_t type; + zend_long type; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "i", &type) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &type) == FAILURE) { return; } |