From: Dmitry Stogov <dmitry@php.net>
Date: Tue, 17 Jan 2012 08:11:32 +0000 (+0000)
Subject: Regenerated scanners
X-Git-Tag: php-5.4.0RC6~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a1525977a06951729a8426a152a2f67bda9c0345;p=php

Regenerated scanners
---

diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c
index df05b91669..1bcb964a42 100644
--- a/Zend/zend_language_scanner.c
+++ b/Zend/zend_language_scanner.c
@@ -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 @@ yy365:
 	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;
diff --git a/Zend/zend_language_scanner_defs.h b/Zend/zend_language_scanner_defs.h
index d9abaa168f..0a72f090ae 100644
--- a/Zend/zend_language_scanner_defs.h
+++ b/Zend/zend_language_scanner_defs.h
@@ -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 {