- Drop T_SCALAR_CAST

diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index 0a52fe4a258b1583f4179ea0f821f76087987135..906242fb48212157e6079309e99c37f89cf10f47 100644 (file)
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -108,7 +108,6 @@ static YYSIZE_T zend_yytnamerr(char*, const char*);
 %token T_INC "++ (T_INC)"
 %token T_DEC "-- (T_DEC)"
 %token T_INT_CAST    "(int) (T_INT_CAST)"
-%token T_SCALAR_CAST "(scalar) (T_SCALAR_CAST)"
 %token T_DOUBLE_CAST "(double) (T_DOUBLE_CAST)"
 %token T_STRING_CAST "(string) (T_STRING_CAST)"
 %token T_ARRAY_CAST  "(array) (T_ARRAY_CAST)"

diff --git a/ext/tokenizer/tokenizer_data.c b/ext/tokenizer/tokenizer_data.c
index 54c10399a05f6209b92db933c891d0f0a3629963..55ad58c48bcc76e067244de4ae1c29ca65024490 100644 (file)
--- a/ext/tokenizer/tokenizer_data.c
+++ b/ext/tokenizer/tokenizer_data.c
@@ -69,7 +69,6 @@ void tokenizer_register_constants(INIT_FUNC_ARGS) {
        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);
-       REGISTER_LONG_CONSTANT("T_SCALAR_CAST", T_SCALAR_CAST, CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("T_CLONE", T_CLONE, CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("T_NEW", T_NEW, CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("T_EXIT", T_EXIT, CONST_CS | CONST_PERSISTENT);
@@ -137,6 +136,7 @@ void tokenizer_register_constants(INIT_FUNC_ARGS) {
        REGISTER_LONG_CONSTANT("T_ARRAY", T_ARRAY, CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("T_CALLABLE", T_CALLABLE, CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("T_CLASS_C", T_CLASS_C, CONST_CS | CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("T_TRAIT_C", T_TRAIT_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);
        REGISTER_LONG_CONSTANT("T_LINE", T_LINE, CONST_CS | CONST_PERSISTENT);
@@ -203,7 +203,6 @@ char *get_token_type_name(int token_type)
                case T_INT_CAST: return "T_INT_CAST";
                case T_DEC: return "T_DEC";
                case T_INC: return "T_INC";
-               case T_SCALAR_CAST: return "T_SCALAR_CAST";
                case T_CLONE: return "T_CLONE";
                case T_NEW: return "T_NEW";
                case T_EXIT: return "T_EXIT";
@@ -271,6 +270,7 @@ char *get_token_type_name(int token_type)
                case T_ARRAY: return "T_ARRAY";
                case T_CALLABLE: return "T_CALLABLE";
                case T_CLASS_C: return "T_CLASS_C";
+               case T_TRAIT_C: return "T_TRAIT_C";
                case T_METHOD_C: return "T_METHOD_C";
                case T_FUNC_C: return "T_FUNC_C";
                case T_LINE: return "T_LINE";