felipe Tue, 16 Aug 2011 12:13:35 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=315018
Log:
- Drop T_SCALAR_CAST
Changed paths:
U php/php-src/branches/PHP_5_4/Zend/zend_language_parser.y
U php/php-src/branches/PHP_5_4/ext/tokenizer/tokenizer_data.c
U php/php-src/trunk/Zend/zend_language_parser.y
U php/php-src/trunk/ext/tokenizer/tokenizer_data.c
Modified: php/php-src/branches/PHP_5_4/Zend/zend_language_parser.y
===================================================================
--- php/php-src/branches/PHP_5_4/Zend/zend_language_parser.y 2011-08-16
12:01:36 UTC (rev 315017)
+++ php/php-src/branches/PHP_5_4/Zend/zend_language_parser.y 2011-08-16
12:13:35 UTC (rev 315018)
@@ -108,7 +108,6 @@
%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)"
Modified: php/php-src/branches/PHP_5_4/ext/tokenizer/tokenizer_data.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/tokenizer/tokenizer_data.c 2011-08-16
12:01:36 UTC (rev 315017)
+++ php/php-src/branches/PHP_5_4/ext/tokenizer/tokenizer_data.c 2011-08-16
12:13:35 UTC (rev 315018)
@@ -69,7 +69,6 @@
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 @@
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 @@
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 @@
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";
Modified: php/php-src/trunk/Zend/zend_language_parser.y
===================================================================
--- php/php-src/trunk/Zend/zend_language_parser.y 2011-08-16 12:01:36 UTC
(rev 315017)
+++ php/php-src/trunk/Zend/zend_language_parser.y 2011-08-16 12:13:35 UTC
(rev 315018)
@@ -108,7 +108,6 @@
%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)"
Modified: php/php-src/trunk/ext/tokenizer/tokenizer_data.c
===================================================================
--- php/php-src/trunk/ext/tokenizer/tokenizer_data.c 2011-08-16 12:01:36 UTC
(rev 315017)
+++ php/php-src/trunk/ext/tokenizer/tokenizer_data.c 2011-08-16 12:13:35 UTC
(rev 315018)
@@ -69,7 +69,6 @@
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 @@
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 @@
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 @@
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";
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
