From: Johannes Schlüter Date: Mon, 22 Nov 2010 21:56:18 +0000 (+0000) Subject: - Update tokenizer data X-Git-Tag: php-5.4.0alpha1~191^2~615 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a876e5419670978823ee9275606c724536bfba3a;p=php - Update tokenizer data --- diff --git a/ext/tokenizer/tokenizer_data.c b/ext/tokenizer/tokenizer_data.c index 14871ad8d5..5a6182ac3a 100644 --- a/ext/tokenizer/tokenizer_data.c +++ b/ext/tokenizer/tokenizer_data.c @@ -66,6 +66,8 @@ void tokenizer_register_constants(INIT_FUNC_ARGS) { REGISTER_LONG_CONSTANT("T_ARRAY_CAST", T_ARRAY_CAST, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("T_STRING_CAST", T_STRING_CAST, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("T_DOUBLE_CAST", T_DOUBLE_CAST, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("T_SCALAR_CAST", T_SCALAR_CAST, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("T_NUMERIC_CAST", T_NUMERIC_CAST, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("T_INT_CAST", T_INT_CAST, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("T_DEC", T_DEC, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("T_INC", T_INC, CONST_CS | CONST_PERSISTENT); @@ -112,6 +114,7 @@ void tokenizer_register_constants(INIT_FUNC_ARGS) { REGISTER_LONG_CONSTANT("T_CATCH", T_CATCH, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("T_THROW", T_THROW, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("T_USE", T_USE, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("T_INSTEADOF", T_INSTEADOF, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("T_GLOBAL", T_GLOBAL, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("T_PUBLIC", T_PUBLIC, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("T_PROTECTED", T_PROTECTED, CONST_CS | CONST_PERSISTENT); @@ -125,6 +128,7 @@ void tokenizer_register_constants(INIT_FUNC_ARGS) { REGISTER_LONG_CONSTANT("T_EMPTY", T_EMPTY, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("T_HALT_COMPILER", T_HALT_COMPILER, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("T_CLASS", T_CLASS, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("T_TRAIT", T_TRAIT, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("T_INTERFACE", T_INTERFACE, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("T_EXTENDS", T_EXTENDS, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("T_IMPLEMENTS", T_IMPLEMENTS, CONST_CS | CONST_PERSISTENT); @@ -132,6 +136,14 @@ void tokenizer_register_constants(INIT_FUNC_ARGS) { REGISTER_LONG_CONSTANT("T_DOUBLE_ARROW", T_DOUBLE_ARROW, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("T_LIST", T_LIST, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("T_ARRAY", T_ARRAY, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("T_BOOL_HINT", T_BOOL_HINT, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("T_STRING_HINT", T_STRING_HINT, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("T_INT_HINT", T_INT_HINT, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("T_DOUBLE_HINT", T_DOUBLE_HINT, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("T_RESOURCE_HINT", T_RESOURCE_HINT, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("T_OBJECT_HINT", T_OBJECT_HINT, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("T_SCALAR_HINT", T_SCALAR_HINT, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("T_NUMERIC_HINT", T_NUMERIC_HINT, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("T_CLASS_C", T_CLASS_C, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("T_METHOD_C", T_METHOD_C, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("T_FUNC_C", T_FUNC_C, CONST_CS | CONST_PERSISTENT); @@ -196,6 +208,8 @@ char *get_token_type_name(int token_type) case T_ARRAY_CAST: return "T_ARRAY_CAST"; case T_STRING_CAST: return "T_STRING_CAST"; case T_DOUBLE_CAST: return "T_DOUBLE_CAST"; + case T_SCALAR_CAST: return "T_SCALAR_CAST"; + case T_NUMERIC_CAST: return "T_NUMERIC_CAST"; case T_INT_CAST: return "T_INT_CAST"; case T_DEC: return "T_DEC"; case T_INC: return "T_INC"; @@ -242,6 +256,7 @@ char *get_token_type_name(int token_type) case T_CATCH: return "T_CATCH"; case T_THROW: return "T_THROW"; case T_USE: return "T_USE"; + case T_INSTEADOF: return "T_INSTEADOF"; case T_GLOBAL: return "T_GLOBAL"; case T_PUBLIC: return "T_PUBLIC"; case T_PROTECTED: return "T_PROTECTED"; @@ -255,6 +270,7 @@ char *get_token_type_name(int token_type) case T_EMPTY: return "T_EMPTY"; case T_HALT_COMPILER: return "T_HALT_COMPILER"; case T_CLASS: return "T_CLASS"; + case T_TRAIT: return "T_TRAIT"; case T_INTERFACE: return "T_INTERFACE"; case T_EXTENDS: return "T_EXTENDS"; case T_IMPLEMENTS: return "T_IMPLEMENTS"; @@ -262,6 +278,14 @@ char *get_token_type_name(int token_type) case T_DOUBLE_ARROW: return "T_DOUBLE_ARROW"; case T_LIST: return "T_LIST"; case T_ARRAY: return "T_ARRAY"; + case T_BOOL_HINT: return "T_BOOL_HINT"; + case T_STRING_HINT: return "T_STRING_HINT"; + case T_INT_HINT: return "T_INT_HINT"; + case T_DOUBLE_HINT: return "T_DOUBLE_HINT"; + case T_RESOURCE_HINT: return "T_RESOURCE_HINT"; + case T_OBJECT_HINT: return "T_OBJECT_HINT"; + case T_SCALAR_HINT: return "T_SCALAR_HINT"; + case T_NUMERIC_HINT: return "T_NUMERIC_HINT"; case T_CLASS_C: return "T_CLASS_C"; case T_METHOD_C: return "T_METHOD_C"; case T_FUNC_C: return "T_FUNC_C"; diff --git a/ext/tokenizer/tokenizer_data_gen.sh b/ext/tokenizer/tokenizer_data_gen.sh index 169530c4cd..d707d48fd1 100755 --- a/ext/tokenizer/tokenizer_data_gen.sh +++ b/ext/tokenizer/tokenizer_data_gen.sh @@ -16,7 +16,7 @@ echo '/* +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2008 The PHP Group | + | Copyright (c) 1997-2010 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is |