* add new ZE2 tokens

diff --git a/ext/tokenizer/tokenizer.c b/ext/tokenizer/tokenizer.c
index 16995b1f3cc7b55d993028da719b693a39176044..afce4f7b7ebe2383211992eec90c387d4bef8e3c 100644 (file)
--- a/ext/tokenizer/tokenizer.c
+++ b/ext/tokenizer/tokenizer.c
@@ -270,6 +270,21 @@ PHP_MINIT_FUNCTION(tokenizer)
        REGISTER_LONG_CONSTANT("T_CURLY_OPEN", T_CURLY_OPEN, CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("T_PAAMAYIM_NEKUDOTAYIM", T_PAAMAYIM_NEKUDOTAYIM, CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("T_DOUBLE_COLON", T_PAAMAYIM_NEKUDOTAYIM, CONST_CS | CONST_PERSISTENT);
+#ifdef ZEND_ENGINE_2
+       REGISTER_LONG_CONSTANT("T_ABSTRACT", T_ABSTRACT, CONST_CS | CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("T_CATCH", T_CATCH, CONST_CS | CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("T_FINAL", T_FINAL, CONST_CS | CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("T_FROM", T_FROM, CONST_CS | CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("T_IMPORT", T_IMPORT, CONST_CS | CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("T_INSTANCEOF", T_INSTANCEOF, CONST_CS | CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("T_NAMESPACE", T_NAMESPACE, CONST_CS | CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("T_NAMESPACE_NAME", T_NAMESPACE_NAME, CONST_CS | CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("T_PRIVATE", T_PRIVATE, CONST_CS | CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("T_PROTECTED", T_PROTECTED, CONST_CS | CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("T_PUBLIC", T_PUBLIC, CONST_CS | CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("T_THROW", T_THROW, CONST_CS | CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("T_TRY", T_TRY, CONST_CS | CONST_PERSISTENT);
+#endif
        
        return SUCCESS;
 }
@@ -467,6 +482,21 @@ get_token_type_name(int token_type)
                case T_DOLLAR_OPEN_CURLY_BRACES: return "T_DOLLAR_OPEN_CURLY_BRACES";
                case T_CURLY_OPEN: return "T_CURLY_OPEN";
                case T_PAAMAYIM_NEKUDOTAYIM: return "T_DOUBLE_COLON";
+#ifdef ZEND_ENGINE_2
+               case T_ABSTRACT: return "T_ABSTRACT";
+               case T_CATCH: return "T_CATCH";
+               case T_FINAL: return "T_FINAL";
+               case T_FROM: return "T_FROM";
+               case T_IMPORT: return "T_IMPORT";
+               case T_INSTANCEOF: return "T_INSTANCEOF";
+               case T_NAMESPACE: return "T_NAMESPACE";
+               case T_NAMESPACE_NAME: return "T_NAMESPACE_NAME";
+               case T_PRIVATE: return "T_PRIVATE";
+               case T_PROTECTED: return "T_PROTECTED";
+               case T_PUBLIC: return "T_PUBLIC";
+               case T_THROW: return "T_THROW";
+               case T_TRY: return "T_TRY";
+#endif
        }
        return "UNKNOWN";
 }