[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/tokenizer/tokenizer_data.c trunk/ext/tokenizer/tokenizer_data.c

2011-06-02 Thread Stanislav Malyshev
stas Fri, 03 Jun 2011 01:16:01 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=311747

Log:
and clean the tokenizer too

Changed paths:
U   php/php-src/branches/PHP_5_4/ext/tokenizer/tokenizer_data.c
U   php/php-src/trunk/ext/tokenizer/tokenizer_data.c

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-06-03 
01:09:32 UTC (rev 311746)
+++ php/php-src/branches/PHP_5_4/ext/tokenizer/tokenizer_data.c 2011-06-03 
01:16:01 UTC (rev 311747)
@@ -66,8 +66,6 @@
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);
@@ -200,8 +198,6 @@
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;

Modified: php/php-src/trunk/ext/tokenizer/tokenizer_data.c
===
--- php/php-src/trunk/ext/tokenizer/tokenizer_data.c2011-06-03 01:09:32 UTC 
(rev 311746)
+++ php/php-src/trunk/ext/tokenizer/tokenizer_data.c2011-06-03 01:16:01 UTC 
(rev 311747)
@@ -66,8 +66,6 @@
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);
@@ -200,8 +198,6 @@
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;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/tokenizer/tokenizer_data.c trunk/ext/tokenizer/tokenizer_data.c

2011-05-14 Thread Stanislav Malyshev
stas Sun, 15 May 2011 00:48:05 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=311034

Log:
forgot tokenizer...

Changed paths:
U   php/php-src/branches/PHP_5_4/ext/tokenizer/tokenizer_data.c
U   php/php-src/trunk/ext/tokenizer/tokenizer_data.c

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-05-15 
00:40:12 UTC (rev 311033)
+++ php/php-src/branches/PHP_5_4/ext/tokenizer/tokenizer_data.c 2011-05-15 
00:48:05 UTC (rev 311034)
@@ -136,14 +136,6 @@
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);
@@ -278,14 +270,6 @@
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;

Modified: php/php-src/trunk/ext/tokenizer/tokenizer_data.c
===
--- php/php-src/trunk/ext/tokenizer/tokenizer_data.c2011-05-15 00:40:12 UTC 
(rev 311033)
+++ php/php-src/trunk/ext/tokenizer/tokenizer_data.c2011-05-15 00:48:05 UTC 
(rev 311034)
@@ -136,14 +136,6 @@
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);
@@ -278,14 +270,6 @@
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;
  

Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/tokenizer/tokenizer_data.c trunk/ext/tokenizer/tokenizer_data.c

2011-05-14 Thread Pierre Joye
hi Stas,

what's that?


While we must begin soonish with 5.4 release process, we MUST adopt
the RFC before anything happen officially.

Cheers,

On Sun, May 15, 2011 at 2:48 AM, Stanislav Malyshev s...@php.net wrote:
 stas                                     Sun, 15 May 2011 00:48:05 +

 Revision: http://svn.php.net/viewvc?view=revisionrevision=311034

 Log:
 forgot tokenizer...

 Changed paths:
    U   php/php-src/branches/PHP_5_4/ext/tokenizer/tokenizer_data.c
    U   php/php-src/trunk/ext/tokenizer/tokenizer_data.c

 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-05-15 
 00:40:12 UTC (rev 311033)
 +++ php/php-src/branches/PHP_5_4/ext/tokenizer/tokenizer_data.c 2011-05-15 
 00:48:05 UTC (rev 311034)
 @@ -136,14 +136,6 @@
        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);
 @@ -278,14 +270,6 @@
                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;

 Modified: php/php-src/trunk/ext/tokenizer/tokenizer_data.c
 ===
 --- php/php-src/trunk/ext/tokenizer/tokenizer_data.c    2011-05-15 00:40:12 
 UTC (rev 311033)
 +++ php/php-src/trunk/ext/tokenizer/tokenizer_data.c    2011-05-15 00:48:05 
 UTC (rev 311034)
 @@ -136,14 +136,6 @@
        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);
 @@ -278,14 +270,6 @@
                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