dmitry                                   Tue, 17 Jan 2012 08:11:32 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=322380

Log:
Regenerated scanners

Changed paths:
    U   php/php-src/branches/PHP_5_4/Zend/zend_language_scanner.c
    U   php/php-src/branches/PHP_5_4/Zend/zend_language_scanner_defs.h
    U   php/php-src/trunk/Zend/zend_language_scanner.c
    U   php/php-src/trunk/Zend/zend_language_scanner_defs.h

Modified: php/php-src/branches/PHP_5_4/Zend/zend_language_scanner.c
===================================================================
--- php/php-src/branches/PHP_5_4/Zend/zend_language_scanner.c   2012-01-17 
08:11:07 UTC (rev 322379)
+++ php/php-src/branches/PHP_5_4/Zend/zend_language_scanner.c   2012-01-17 
08:11:32 UTC (rev 322380)
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Sun Jan  1 17:48:29 2012 */
+/* Generated by re2c 0.13.5 on Mon Jan 16 14:45:55 2012 */
 #line 1 "Zend/zend_language_scanner.l"
 /*
    +----------------------------------------------------------------------+
@@ -4490,11 +4490,11 @@
        if (CG(active_class_entry)
                && (ZEND_ACC_TRAIT ==
                        (CG(active_class_entry)->ce_flags & ZEND_ACC_TRAIT))) {
-               // This is a hack, we abuse IS_NULL to indicate an invalid value
-               // if __CLASS__ is encountered in a trait, however, we also not 
that we
-               // should fix it up when we copy the method into an actual class
-               zendlval->value.lval = ZEND_ACC_TRAIT;
-               zendlval->type = IS_NULL;
+               /* We create a special __CLASS__ constant that is going to be 
resolved
+                  at run-time */
+               zendlval->value.str.len = sizeof("__CLASS__")-1;
+               zendlval->value.str.val = estrndup("__CLASS__", 
zendlval->value.str.len);
+               zendlval->type = IS_CONSTANT;
        } else {
                if (CG(active_class_entry)) {
                        class_name = CG(active_class_entry)->name;

Modified: php/php-src/branches/PHP_5_4/Zend/zend_language_scanner_defs.h
===================================================================
--- php/php-src/branches/PHP_5_4/Zend/zend_language_scanner_defs.h      
2012-01-17 08:11:07 UTC (rev 322379)
+++ php/php-src/branches/PHP_5_4/Zend/zend_language_scanner_defs.h      
2012-01-17 08:11:32 UTC (rev 322380)
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Tue Sep 13 17:29:46 2011 */
+/* Generated by re2c 0.13.5 on Mon Jan 16 14:45:55 2012 */
 #line 3 "Zend/zend_language_scanner_defs.h"

 enum YYCONDTYPE {

Modified: php/php-src/trunk/Zend/zend_language_scanner.c
===================================================================
--- php/php-src/trunk/Zend/zend_language_scanner.c      2012-01-17 08:11:07 UTC 
(rev 322379)
+++ php/php-src/trunk/Zend/zend_language_scanner.c      2012-01-17 08:11:32 UTC 
(rev 322380)
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Sun Jan  1 17:47:27 2012 */
+/* Generated by re2c 0.13.5 on Tue Jan 17 11:54:12 2012 */
 #line 1 "Zend/zend_language_scanner.l"
 /*
    +----------------------------------------------------------------------+
@@ -4490,11 +4490,11 @@
        if (CG(active_class_entry)
                && (ZEND_ACC_TRAIT ==
                        (CG(active_class_entry)->ce_flags & ZEND_ACC_TRAIT))) {
-               // This is a hack, we abuse IS_NULL to indicate an invalid value
-               // if __CLASS__ is encountered in a trait, however, we also not 
that we
-               // should fix it up when we copy the method into an actual class
-               zendlval->value.lval = ZEND_ACC_TRAIT;
-               zendlval->type = IS_NULL;
+               /* We create a special __CLASS__ constant that is going to be 
resolved
+                  at run-time */
+               zendlval->value.str.len = sizeof("__CLASS__")-1;
+               zendlval->value.str.val = estrndup("__CLASS__", 
zendlval->value.str.len);
+               zendlval->type = IS_CONSTANT;
        } else {
                if (CG(active_class_entry)) {
                        class_name = CG(active_class_entry)->name;

Modified: php/php-src/trunk/Zend/zend_language_scanner_defs.h
===================================================================
--- php/php-src/trunk/Zend/zend_language_scanner_defs.h 2012-01-17 08:11:07 UTC 
(rev 322379)
+++ php/php-src/trunk/Zend/zend_language_scanner_defs.h 2012-01-17 08:11:32 UTC 
(rev 322380)
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Tue Sep 13 17:29:49 2011 */
+/* Generated by re2c 0.13.5 on Tue Jan 17 11:54:12 2012 */
 #line 3 "Zend/zend_language_scanner_defs.h"

 enum YYCONDTYPE {

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

Reply via email to