com php-src: fixes to tokenizer: ext/tokenizer/tokenizer.c ext/tokenizer/tokenizer_data_gen.sh

Commit: 58aa0f8df898a6df36725c21e05a036bbf5e3216 Author: Anatol Belski <ab@php.net> Tue, 19 Aug 2014 13:05:20 +0200 Parents: 40912abf1d8203cc7899888713594f54a82cf004 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=58aa0f8df898a6df36725c21e05a036bbf5e3216 Log: fixes to tokenizer Changed paths: M ext/tokenizer/tokenizer.c M ext/tokenizer/tokenizer_data_gen.sh Diff: diff --git a/ext/tokenizer/tokenizer.c b/ext/tokenizer/tokenizer.c index d2c58ff..be0b6a3 100644 --- a/ext/tokenizer/tokenizer.c +++ b/ext/tokenizer/tokenizer.c @@ -206,9 +206,9 @@ PHP_FUNCTION(token_get_all) */ PHP_FUNCTION(token_name) { - long type; + php_int_t type; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &type) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "i", &type) == FAILURE) { return; } diff --git a/ext/tokenizer/tokenizer_data_gen.sh b/ext/tokenizer/tokenizer_data_gen.sh index 9a675c4..1ed76e3 100755 --- a/ext/tokenizer/tokenizer_data_gen.sh +++ b/ext/tokenizer/tokenizer_data_gen.sh @@ -45,8 +45,8 @@ echo '/* echo 'void tokenizer_register_constants(INIT_FUNC_ARGS) {' >> $OUTFILE -$AWK '/^#define T_/ { print " REGISTER_LONG_CONSTANT(\"" $2 "\", " $2 ", CONST_CS | CONST_PERSISTENT);" }' < $INFILE >> $OUTFILE -echo ' REGISTER_LONG_CONSTANT("T_DOUBLE_COLON", T_PAAMAYIM_NEKUDOTAYIM, CONST_CS | CONST_PERSISTENT);' >> $OUTFILE +$AWK '/^#define T_/ { print " REGISTER_INT_CONSTANT(\"" $2 "\", " $2 ", CONST_CS | CONST_PERSISTENT);" }' < $INFILE >> $OUTFILE +echo ' REGISTER_INT_CONSTANT("T_DOUBLE_COLON", T_PAAMAYIM_NEKUDOTAYIM, CONST_CS | CONST_PERSISTENT);' >> $OUTFILE echo '}' >> $OUTFILE