From: Felipe Pena <felipe@php.net>
Date: Wed, 30 Jul 2008 01:25:49 +0000 (+0000)
Subject: - MFH: Fixed BC break: The magic constants must be case-insensitive.
X-Git-Tag: php-5.3.0alpha1~50
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=555a9b0768c752a2fbb58b4dee5d3dd6fe629a07;p=php

- MFH: Fixed BC break: The magic constants must be case-insensitive.
---

diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c
index 7006ec7643..f995f2431f 100644
--- a/Zend/zend_language_scanner.c
+++ b/Zend/zend_language_scanner.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Mon Jul 28 15:23:25 2008 */
+/* Generated by re2c 0.13.5 on Tue Jul 29 21:53:56 2008 */
 #line 1 "Zend/zend_language_scanner.l"
 /*
    +----------------------------------------------------------------------+
@@ -4861,25 +4861,25 @@ yy388:
 yy390:
 		YYDEBUG(390, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych <= 'H') {
-			if (yych <= 'D') {
-				if (yych <= 'B') goto yy280;
-				if (yych <= 'C') goto yy392;
-				goto yy396;
-			} else {
-				if (yych == 'F') goto yy393;
-				if (yych <= 'G') goto yy280;
-			}
-		} else {
-			if (yych <= 'M') {
-				if (yych <= 'K') goto yy280;
-				if (yych <= 'L') goto yy395;
-				goto yy394;
-			} else {
-				if (yych <= 'N') goto yy397;
-				if (yych != 'h') goto yy280;
-			}
+		YYDEBUG(-1, yych);
+		switch (yych) {
+		case 'C':
+		case 'c':	goto yy392;
+		case 'D':
+		case 'd':	goto yy396;
+		case 'F':
+		case 'f':	goto yy393;
+		case 'H':
+		case 'h':	goto yy391;
+		case 'L':
+		case 'l':	goto yy395;
+		case 'M':
+		case 'm':	goto yy394;
+		case 'N':
+		case 'n':	goto yy397;
+		default:	goto yy280;
 		}
+yy391:
 		YYDEBUG(391, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yych == 'A') goto yy451;
@@ -4889,53 +4889,83 @@ yy392:
 		YYDEBUG(392, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yych == 'L') goto yy444;
+		if (yych == 'l') goto yy444;
 		goto yy280;
 yy393:
 		YYDEBUG(393, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'I') goto yy428;
-		if (yych == 'U') goto yy429;
-		goto yy280;
+		if (yych <= 'U') {
+			if (yych == 'I') goto yy428;
+			if (yych <= 'T') goto yy280;
+			goto yy429;
+		} else {
+			if (yych <= 'i') {
+				if (yych <= 'h') goto yy280;
+				goto yy428;
+			} else {
+				if (yych == 'u') goto yy429;
+				goto yy280;
+			}
+		}
 yy394:
 		YYDEBUG(394, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yych == 'E') goto yy420;
+		if (yych == 'e') goto yy420;
 		goto yy280;
 yy395:
 		YYDEBUG(395, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yych == 'I') goto yy414;
+		if (yych == 'i') goto yy414;
 		goto yy280;
 yy396:
 		YYDEBUG(396, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yych == 'I') goto yy409;
+		if (yych == 'i') goto yy409;
 		goto yy280;
 yy397:
 		YYDEBUG(397, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych != 'A') goto yy280;
+		if (yych == 'A') goto yy398;
+		if (yych != 'a') goto yy280;
+yy398:
 		YYDEBUG(398, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych != 'M') goto yy280;
+		if (yych == 'M') goto yy399;
+		if (yych != 'm') goto yy280;
+yy399:
 		YYDEBUG(399, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych != 'E') goto yy280;
+		if (yych == 'E') goto yy400;
+		if (yych != 'e') goto yy280;
+yy400:
 		YYDEBUG(400, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych != 'S') goto yy280;
+		if (yych == 'S') goto yy401;
+		if (yych != 's') goto yy280;
+yy401:
 		YYDEBUG(401, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych != 'P') goto yy280;
+		if (yych == 'P') goto yy402;
+		if (yych != 'p') goto yy280;
+yy402:
 		YYDEBUG(402, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych != 'A') goto yy280;
+		if (yych == 'A') goto yy403;
+		if (yych != 'a') goto yy280;
+yy403:
 		YYDEBUG(403, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych != 'C') goto yy280;
+		if (yych == 'C') goto yy404;
+		if (yych != 'c') goto yy280;
+yy404:
 		YYDEBUG(404, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych != 'E') goto yy280;
+		if (yych == 'E') goto yy405;
+		if (yych != 'e') goto yy280;
+yy405:
 		YYDEBUG(405, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yych != '_') goto yy280;
@@ -4959,11 +4989,13 @@ yy397:
 	}
 	return T_NS_C;
 }
-#line 4963 "Zend/zend_language_scanner.c"
+#line 4993 "Zend/zend_language_scanner.c"
 yy409:
 		YYDEBUG(409, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych != 'R') goto yy280;
+		if (yych == 'R') goto yy410;
+		if (yych != 'r') goto yy280;
+yy410:
 		YYDEBUG(410, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yych != '_') goto yy280;
@@ -5004,14 +5036,18 @@ yy409:
 	zendlval->type = IS_STRING;
 	return T_DIR;
 }
-#line 5008 "Zend/zend_language_scanner.c"
+#line 5040 "Zend/zend_language_scanner.c"
 yy414:
 		YYDEBUG(414, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych != 'N') goto yy280;
+		if (yych == 'N') goto yy415;
+		if (yych != 'n') goto yy280;
+yy415:
 		YYDEBUG(415, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych != 'E') goto yy280;
+		if (yych == 'E') goto yy416;
+		if (yych != 'e') goto yy280;
+yy416:
 		YYDEBUG(416, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yych != '_') goto yy280;
@@ -5031,20 +5067,28 @@ yy414:
 	zendlval->type = IS_LONG;
 	return T_LINE;
 }
-#line 5035 "Zend/zend_language_scanner.c"
+#line 5071 "Zend/zend_language_scanner.c"
 yy420:
 		YYDEBUG(420, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych != 'T') goto yy280;
+		if (yych == 'T') goto yy421;
+		if (yych != 't') goto yy280;
+yy421:
 		YYDEBUG(421, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych != 'H') goto yy280;
+		if (yych == 'H') goto yy422;
+		if (yych != 'h') goto yy280;
+yy422:
 		YYDEBUG(422, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych != 'O') goto yy280;
+		if (yych == 'O') goto yy423;
+		if (yych != 'o') goto yy280;
+yy423:
 		YYDEBUG(423, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych != 'D') goto yy280;
+		if (yych == 'D') goto yy424;
+		if (yych != 'd') goto yy280;
+yy424:
 		YYDEBUG(424, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yych != '_') goto yy280;
@@ -5079,31 +5123,44 @@ yy420:
 	zendlval->type = IS_STRING;
 	return T_METHOD_C;
 }
-#line 5083 "Zend/zend_language_scanner.c"
+#line 5127 "Zend/zend_language_scanner.c"
 yy428:
 		YYDEBUG(428, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yych == 'L') goto yy439;
+		if (yych == 'l') goto yy439;
 		goto yy280;
 yy429:
 		YYDEBUG(429, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych != 'N') goto yy280;
+		if (yych == 'N') goto yy430;
+		if (yych != 'n') goto yy280;
+yy430:
 		YYDEBUG(430, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych != 'C') goto yy280;
+		if (yych == 'C') goto yy431;
+		if (yych != 'c') goto yy280;
+yy431:
 		YYDEBUG(431, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych != 'T') goto yy280;
+		if (yych == 'T') goto yy432;
+		if (yych != 't') goto yy280;
+yy432:
 		YYDEBUG(432, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych != 'I') goto yy280;
+		if (yych == 'I') goto yy433;
+		if (yych != 'i') goto yy280;
+yy433:
 		YYDEBUG(433, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych != 'O') goto yy280;
+		if (yych == 'O') goto yy434;
+		if (yych != 'o') goto yy280;
+yy434:
 		YYDEBUG(434, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych != 'N') goto yy280;
+		if (yych == 'N') goto yy435;
+		if (yych != 'n') goto yy280;
+yy435:
 		YYDEBUG(435, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yych != '_') goto yy280;
@@ -5133,11 +5190,13 @@ yy429:
 	zendlval->type = IS_STRING;
 	return T_FUNC_C;
 }
-#line 5137 "Zend/zend_language_scanner.c"
+#line 5194 "Zend/zend_language_scanner.c"
 yy439:
 		YYDEBUG(439, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych != 'E') goto yy280;
+		if (yych == 'E') goto yy440;
+		if (yych != 'e') goto yy280;
+yy440:
 		YYDEBUG(440, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yych != '_') goto yy280;
@@ -5163,17 +5222,23 @@ yy439:
 	zendlval->type = IS_STRING;
 	return T_FILE;
 }
-#line 5167 "Zend/zend_language_scanner.c"
+#line 5226 "Zend/zend_language_scanner.c"
 yy444:
 		YYDEBUG(444, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych != 'A') goto yy280;
+		if (yych == 'A') goto yy445;
+		if (yych != 'a') goto yy280;
+yy445:
 		YYDEBUG(445, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych != 'S') goto yy280;
+		if (yych == 'S') goto yy446;
+		if (yych != 's') goto yy280;
+yy446:
 		YYDEBUG(446, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych != 'S') goto yy280;
+		if (yych == 'S') goto yy447;
+		if (yych != 's') goto yy280;
+yy447:
 		YYDEBUG(447, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yych != '_') goto yy280;
@@ -5203,7 +5268,7 @@ yy444:
 	zendlval->type = IS_STRING;
 	return T_CLASS_C;
 }
-#line 5207 "Zend/zend_language_scanner.c"
+#line 5272 "Zend/zend_language_scanner.c"
 yy451:
 		YYDEBUG(451, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5269,7 +5334,7 @@ yy462:
 		{
 	return T_HALT_COMPILER;
 }
-#line 5273 "Zend/zend_language_scanner.c"
+#line 5338 "Zend/zend_language_scanner.c"
 yy464:
 		YYDEBUG(464, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5293,7 +5358,7 @@ yy466:
 		{
 	return T_USE;
 }
-#line 5297 "Zend/zend_language_scanner.c"
+#line 5362 "Zend/zend_language_scanner.c"
 yy468:
 		YYDEBUG(468, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5316,7 +5381,7 @@ yy470:
 		{
 	return T_UNSET;
 }
-#line 5320 "Zend/zend_language_scanner.c"
+#line 5385 "Zend/zend_language_scanner.c"
 yy472:
 		YYDEBUG(472, *YYCURSOR);
 		++YYCURSOR;
@@ -5492,7 +5557,7 @@ yy487:
 		{
 	return T_INT_CAST;
 }
-#line 5496 "Zend/zend_language_scanner.c"
+#line 5561 "Zend/zend_language_scanner.c"
 yy490:
 		YYDEBUG(490, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5540,7 +5605,7 @@ yy495:
 		{
 	return T_DOUBLE_CAST;
 }
-#line 5544 "Zend/zend_language_scanner.c"
+#line 5609 "Zend/zend_language_scanner.c"
 yy499:
 		YYDEBUG(499, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5614,7 +5679,7 @@ yy509:
 		{
 	return T_STRING_CAST;
 }
-#line 5618 "Zend/zend_language_scanner.c"
+#line 5683 "Zend/zend_language_scanner.c"
 yy513:
 		YYDEBUG(513, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5651,7 +5716,7 @@ yy516:
 		{
 	return T_ARRAY_CAST;
 }
-#line 5655 "Zend/zend_language_scanner.c"
+#line 5720 "Zend/zend_language_scanner.c"
 yy520:
 		YYDEBUG(520, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5693,7 +5758,7 @@ yy524:
 		{
 	return T_OBJECT_CAST;
 }
-#line 5697 "Zend/zend_language_scanner.c"
+#line 5762 "Zend/zend_language_scanner.c"
 yy528:
 		YYDEBUG(528, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5738,7 +5803,7 @@ yy533:
 		{
 	return T_BOOL_CAST;
 }
-#line 5742 "Zend/zend_language_scanner.c"
+#line 5807 "Zend/zend_language_scanner.c"
 yy536:
 		YYDEBUG(536, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5786,7 +5851,7 @@ yy541:
 		{
 	return T_STRING_CAST;
 }
-#line 5790 "Zend/zend_language_scanner.c"
+#line 5855 "Zend/zend_language_scanner.c"
 yy545:
 		YYDEBUG(545, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5823,7 +5888,7 @@ yy548:
 		{
 	return T_UNSET_CAST;
 }
-#line 5827 "Zend/zend_language_scanner.c"
+#line 5892 "Zend/zend_language_scanner.c"
 yy552:
 		YYDEBUG(552, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5841,7 +5906,7 @@ yy553:
 		{
 	return T_VAR;
 }
-#line 5845 "Zend/zend_language_scanner.c"
+#line 5910 "Zend/zend_language_scanner.c"
 yy555:
 		YYDEBUG(555, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5865,7 +5930,7 @@ yy557:
 		{
 	return T_NEW;
 }
-#line 5869 "Zend/zend_language_scanner.c"
+#line 5934 "Zend/zend_language_scanner.c"
 yy559:
 		YYDEBUG(559, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5908,7 +5973,7 @@ yy565:
 		{
 	return T_NAMESPACE;
 }
-#line 5912 "Zend/zend_language_scanner.c"
+#line 5977 "Zend/zend_language_scanner.c"
 yy567:
 		YYDEBUG(567, *YYCURSOR);
 		++YYCURSOR;
@@ -5918,7 +5983,7 @@ yy567:
 		{
 	return T_PAAMAYIM_NEKUDOTAYIM;
 }
-#line 5922 "Zend/zend_language_scanner.c"
+#line 5987 "Zend/zend_language_scanner.c"
 yy569:
 		YYDEBUG(569, *YYCURSOR);
 		++YYCURSOR;
@@ -5944,7 +6009,7 @@ yy571:
 		{
 	return T_MINUS_EQUAL;
 }
-#line 5948 "Zend/zend_language_scanner.c"
+#line 6013 "Zend/zend_language_scanner.c"
 yy573:
 		YYDEBUG(573, *YYCURSOR);
 		++YYCURSOR;
@@ -5954,7 +6019,7 @@ yy573:
 		{
 	return T_DEC;
 }
-#line 5958 "Zend/zend_language_scanner.c"
+#line 6023 "Zend/zend_language_scanner.c"
 yy575:
 		YYDEBUG(575, *YYCURSOR);
 		++YYCURSOR;
@@ -5965,7 +6030,7 @@ yy575:
 	yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC);
 	return T_OBJECT_OPERATOR;
 }
-#line 5969 "Zend/zend_language_scanner.c"
+#line 6034 "Zend/zend_language_scanner.c"
 yy577:
 		YYDEBUG(577, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6014,7 +6079,7 @@ yy582:
 		{
 	return T_PUBLIC;
 }
-#line 6018 "Zend/zend_language_scanner.c"
+#line 6083 "Zend/zend_language_scanner.c"
 yy584:
 		YYDEBUG(584, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6073,7 +6138,7 @@ yy591:
 		{
 	return T_PROTECTED;
 }
-#line 6077 "Zend/zend_language_scanner.c"
+#line 6142 "Zend/zend_language_scanner.c"
 yy593:
 		YYDEBUG(593, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6107,7 +6172,7 @@ yy597:
 		{
 	return T_PRIVATE;
 }
-#line 6111 "Zend/zend_language_scanner.c"
+#line 6176 "Zend/zend_language_scanner.c"
 yy599:
 		YYDEBUG(599, *YYCURSOR);
 		++YYCURSOR;
@@ -6120,7 +6185,7 @@ yy599:
 		{
 	return T_PRINT;
 }
-#line 6124 "Zend/zend_language_scanner.c"
+#line 6189 "Zend/zend_language_scanner.c"
 yy601:
 		YYDEBUG(601, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6149,7 +6214,7 @@ yy604:
 		{
 	return T_GOTO;
 }
-#line 6153 "Zend/zend_language_scanner.c"
+#line 6218 "Zend/zend_language_scanner.c"
 yy606:
 		YYDEBUG(606, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6177,7 +6242,7 @@ yy609:
 		{
 	return T_GLOBAL;
 }
-#line 6181 "Zend/zend_language_scanner.c"
+#line 6246 "Zend/zend_language_scanner.c"
 yy611:
 		YYDEBUG(611, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6215,7 +6280,7 @@ yy616:
 		{
 	return T_BREAK;
 }
-#line 6219 "Zend/zend_language_scanner.c"
+#line 6284 "Zend/zend_language_scanner.c"
 yy618:
 		YYDEBUG(618, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6259,7 +6324,7 @@ yy624:
 		{
 	return T_SWITCH;
 }
-#line 6263 "Zend/zend_language_scanner.c"
+#line 6328 "Zend/zend_language_scanner.c"
 yy626:
 		YYDEBUG(626, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6287,7 +6352,7 @@ yy629:
 		{
 	return T_STATIC;
 }
-#line 6291 "Zend/zend_language_scanner.c"
+#line 6356 "Zend/zend_language_scanner.c"
 yy631:
 		YYDEBUG(631, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6318,7 +6383,7 @@ yy634:
 		{
 	return T_AS;
 }
-#line 6322 "Zend/zend_language_scanner.c"
+#line 6387 "Zend/zend_language_scanner.c"
 yy636:
 		YYDEBUG(636, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6341,7 +6406,7 @@ yy638:
 		{
 	return T_ARRAY;
 }
-#line 6345 "Zend/zend_language_scanner.c"
+#line 6410 "Zend/zend_language_scanner.c"
 yy640:
 		YYDEBUG(640, *YYCURSOR);
 		++YYCURSOR;
@@ -6354,7 +6419,7 @@ yy640:
 		{
 	return T_LOGICAL_AND;
 }
-#line 6358 "Zend/zend_language_scanner.c"
+#line 6423 "Zend/zend_language_scanner.c"
 yy642:
 		YYDEBUG(642, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6392,7 +6457,7 @@ yy647:
 		{
 	return T_ABSTRACT;
 }
-#line 6396 "Zend/zend_language_scanner.c"
+#line 6461 "Zend/zend_language_scanner.c"
 yy649:
 		YYDEBUG(649, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6420,7 +6485,7 @@ yy652:
 		{
 	return T_WHILE;
 }
-#line 6424 "Zend/zend_language_scanner.c"
+#line 6489 "Zend/zend_language_scanner.c"
 yy654:
 		YYDEBUG(654, *YYCURSOR);
 		++YYCURSOR;
@@ -6433,7 +6498,7 @@ yy654:
 		{
 	return T_IF;
 }
-#line 6437 "Zend/zend_language_scanner.c"
+#line 6502 "Zend/zend_language_scanner.c"
 yy656:
 		YYDEBUG(656, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6489,7 +6554,7 @@ yy661:
 		{
 	return T_ISSET;
 }
-#line 6493 "Zend/zend_language_scanner.c"
+#line 6558 "Zend/zend_language_scanner.c"
 yy663:
 		YYDEBUG(663, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6547,7 +6612,7 @@ yy670:
 		{
 	return T_INCLUDE;
 }
-#line 6551 "Zend/zend_language_scanner.c"
+#line 6616 "Zend/zend_language_scanner.c"
 yy671:
 		YYDEBUG(671, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6580,7 +6645,7 @@ yy675:
 		{
 	return T_INCLUDE_ONCE;
 }
-#line 6584 "Zend/zend_language_scanner.c"
+#line 6649 "Zend/zend_language_scanner.c"
 yy677:
 		YYDEBUG(677, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6618,7 +6683,7 @@ yy682:
 		{
 	return T_INTERFACE;
 }
-#line 6622 "Zend/zend_language_scanner.c"
+#line 6687 "Zend/zend_language_scanner.c"
 yy684:
 		YYDEBUG(684, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6661,7 +6726,7 @@ yy690:
 		{
 	return T_INSTANCEOF;
 }
-#line 6665 "Zend/zend_language_scanner.c"
+#line 6730 "Zend/zend_language_scanner.c"
 yy692:
 		YYDEBUG(692, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6709,7 +6774,7 @@ yy699:
 		{
 	return T_IMPLEMENTS;
 }
-#line 6713 "Zend/zend_language_scanner.c"
+#line 6778 "Zend/zend_language_scanner.c"
 yy701:
 		YYDEBUG(701, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6733,7 +6798,7 @@ yy703:
 		{
 	return T_TRY;
 }
-#line 6737 "Zend/zend_language_scanner.c"
+#line 6802 "Zend/zend_language_scanner.c"
 yy705:
 		YYDEBUG(705, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6756,7 +6821,7 @@ yy707:
 		{
 	return T_THROW;
 }
-#line 6760 "Zend/zend_language_scanner.c"
+#line 6825 "Zend/zend_language_scanner.c"
 yy709:
 		YYDEBUG(709, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6821,7 +6886,7 @@ yy716:
 		{
 	return T_REQUIRE;
 }
-#line 6825 "Zend/zend_language_scanner.c"
+#line 6890 "Zend/zend_language_scanner.c"
 yy717:
 		YYDEBUG(717, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6854,7 +6919,7 @@ yy721:
 		{
 	return T_REQUIRE_ONCE;
 }
-#line 6858 "Zend/zend_language_scanner.c"
+#line 6923 "Zend/zend_language_scanner.c"
 yy723:
 		YYDEBUG(723, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6877,7 +6942,7 @@ yy725:
 		{
 	return T_RETURN;
 }
-#line 6881 "Zend/zend_language_scanner.c"
+#line 6946 "Zend/zend_language_scanner.c"
 yy727:
 		YYDEBUG(727, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6962,7 +7027,7 @@ yy736:
 		{
 	return T_CONTINUE;
 }
-#line 6966 "Zend/zend_language_scanner.c"
+#line 7031 "Zend/zend_language_scanner.c"
 yy738:
 		YYDEBUG(738, *YYCURSOR);
 		++YYCURSOR;
@@ -6975,7 +7040,7 @@ yy738:
 		{
 	return T_CONST;
 }
-#line 6979 "Zend/zend_language_scanner.c"
+#line 7044 "Zend/zend_language_scanner.c"
 yy740:
 		YYDEBUG(740, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -7004,7 +7069,7 @@ yy743:
 		{
 	return T_CLONE;
 }
-#line 7008 "Zend/zend_language_scanner.c"
+#line 7073 "Zend/zend_language_scanner.c"
 yy745:
 		YYDEBUG(745, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -7022,7 +7087,7 @@ yy746:
 		{
 	return T_CLASS;
 }
-#line 7026 "Zend/zend_language_scanner.c"
+#line 7091 "Zend/zend_language_scanner.c"
 yy748:
 		YYDEBUG(748, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -7046,7 +7111,7 @@ yy750:
 		{
 	return T_CASE;
 }
-#line 7050 "Zend/zend_language_scanner.c"
+#line 7115 "Zend/zend_language_scanner.c"
 yy752:
 		YYDEBUG(752, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -7064,7 +7129,7 @@ yy753:
 		{
 	return T_CATCH;
 }
-#line 7068 "Zend/zend_language_scanner.c"
+#line 7133 "Zend/zend_language_scanner.c"
 yy755:
 		YYDEBUG(755, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -7119,7 +7184,7 @@ yy763:
 		{
 	return T_FUNCTION;
 }
-#line 7123 "Zend/zend_language_scanner.c"
+#line 7188 "Zend/zend_language_scanner.c"
 yy765:
 		YYDEBUG(765, *YYCURSOR);
 		++YYCURSOR;
@@ -7147,7 +7212,7 @@ yy766:
 		{
 	return T_FOR;
 }
-#line 7151 "Zend/zend_language_scanner.c"
+#line 7216 "Zend/zend_language_scanner.c"
 yy767:
 		YYDEBUG(767, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -7175,7 +7240,7 @@ yy770:
 		{
 	return T_FOREACH;
 }
-#line 7179 "Zend/zend_language_scanner.c"
+#line 7244 "Zend/zend_language_scanner.c"
 yy772:
 		YYDEBUG(772, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -7198,7 +7263,7 @@ yy774:
 		{
 	return T_FINAL;
 }
-#line 7202 "Zend/zend_language_scanner.c"
+#line 7267 "Zend/zend_language_scanner.c"
 yy776:
 		YYDEBUG(776, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -7233,7 +7298,7 @@ yy778:
 		{
 	return T_DO;
 }
-#line 7237 "Zend/zend_language_scanner.c"
+#line 7302 "Zend/zend_language_scanner.c"
 yy780:
 		YYDEBUG(780, *YYCURSOR);
 		++YYCURSOR;
@@ -7246,7 +7311,7 @@ yy780:
 		{
 	return T_EXIT;
 }
-#line 7250 "Zend/zend_language_scanner.c"
+#line 7315 "Zend/zend_language_scanner.c"
 yy782:
 		YYDEBUG(782, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -7285,7 +7350,7 @@ yy787:
 		{
 	return T_DEFAULT;
 }
-#line 7289 "Zend/zend_language_scanner.c"
+#line 7354 "Zend/zend_language_scanner.c"
 yy789:
 		YYDEBUG(789, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -7313,7 +7378,7 @@ yy792:
 		{
 	return T_DECLARE;
 }
-#line 7317 "Zend/zend_language_scanner.c"
+#line 7382 "Zend/zend_language_scanner.c"
 yy794:
 		YYDEBUG(794, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -7397,7 +7462,7 @@ yy805:
 		{
 	return T_EXTENDS;
 }
-#line 7401 "Zend/zend_language_scanner.c"
+#line 7466 "Zend/zend_language_scanner.c"
 yy807:
 		YYDEBUG(807, *YYCURSOR);
 		++YYCURSOR;
@@ -7410,7 +7475,7 @@ yy807:
 		{
 	return T_EXIT;
 }
-#line 7414 "Zend/zend_language_scanner.c"
+#line 7479 "Zend/zend_language_scanner.c"
 yy809:
 		YYDEBUG(809, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -7428,7 +7493,7 @@ yy810:
 		{
 	return T_EVAL;
 }
-#line 7432 "Zend/zend_language_scanner.c"
+#line 7497 "Zend/zend_language_scanner.c"
 yy812:
 		YYDEBUG(812, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -7502,7 +7567,7 @@ yy821:
 		{
 	return T_ENDWHILE;
 }
-#line 7506 "Zend/zend_language_scanner.c"
+#line 7571 "Zend/zend_language_scanner.c"
 yy823:
 		YYDEBUG(823, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -7535,7 +7600,7 @@ yy827:
 		{
 	return T_ENDSWITCH;
 }
-#line 7539 "Zend/zend_language_scanner.c"
+#line 7604 "Zend/zend_language_scanner.c"
 yy829:
 		YYDEBUG(829, *YYCURSOR);
 		++YYCURSOR;
@@ -7548,7 +7613,7 @@ yy829:
 		{
 	return T_ENDIF;
 }
-#line 7552 "Zend/zend_language_scanner.c"
+#line 7617 "Zend/zend_language_scanner.c"
 yy831:
 		YYDEBUG(831, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -7581,7 +7646,7 @@ yy833:
 		{
 	return T_ENDFOR;
 }
-#line 7585 "Zend/zend_language_scanner.c"
+#line 7650 "Zend/zend_language_scanner.c"
 yy834:
 		YYDEBUG(834, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -7609,7 +7674,7 @@ yy837:
 		{
 	return T_ENDFOREACH;
 }
-#line 7613 "Zend/zend_language_scanner.c"
+#line 7678 "Zend/zend_language_scanner.c"
 yy839:
 		YYDEBUG(839, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -7647,7 +7712,7 @@ yy844:
 		{
 	return T_ENDDECLARE;
 }
-#line 7651 "Zend/zend_language_scanner.c"
+#line 7716 "Zend/zend_language_scanner.c"
 yy846:
 		YYDEBUG(846, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -7670,7 +7735,7 @@ yy848:
 		{
 	return T_EMPTY;
 }
-#line 7674 "Zend/zend_language_scanner.c"
+#line 7739 "Zend/zend_language_scanner.c"
 yy850:
 		YYDEBUG(850, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -7703,7 +7768,7 @@ yy852:
 		{
 	return T_ELSE;
 }
-#line 7707 "Zend/zend_language_scanner.c"
+#line 7772 "Zend/zend_language_scanner.c"
 yy853:
 		YYDEBUG(853, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -7721,7 +7786,7 @@ yy854:
 		{
 	return T_ELSEIF;
 }
-#line 7725 "Zend/zend_language_scanner.c"
+#line 7790 "Zend/zend_language_scanner.c"
 yy856:
 		YYDEBUG(856, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -7739,7 +7804,7 @@ yy857:
 		{
 	return T_ECHO;
 }
-#line 7743 "Zend/zend_language_scanner.c"
+#line 7808 "Zend/zend_language_scanner.c"
 	}
 /* *********************************** */
 yyc_ST_LOOKING_FOR_PROPERTY:
@@ -7820,7 +7885,7 @@ yy862:
 	HANDLE_NEWLINES(yytext, yyleng);
 	return T_WHITESPACE;
 }
-#line 7824 "Zend/zend_language_scanner.c"
+#line 7889 "Zend/zend_language_scanner.c"
 yy863:
 		YYDEBUG(863, *YYCURSOR);
 		++YYCURSOR;
@@ -7834,7 +7899,7 @@ yy864:
 	yy_pop_state(TSRMLS_C);
 	goto restart;
 }
-#line 7838 "Zend/zend_language_scanner.c"
+#line 7903 "Zend/zend_language_scanner.c"
 yy865:
 		YYDEBUG(865, *YYCURSOR);
 		++YYCURSOR;
@@ -7850,7 +7915,7 @@ yy866:
 	zendlval->type = IS_STRING;
 	return T_STRING;
 }
-#line 7854 "Zend/zend_language_scanner.c"
+#line 7919 "Zend/zend_language_scanner.c"
 yy867:
 		YYDEBUG(867, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -7875,7 +7940,7 @@ yy870:
 		{
 	return T_OBJECT_OPERATOR;
 }
-#line 7879 "Zend/zend_language_scanner.c"
+#line 7944 "Zend/zend_language_scanner.c"
 yy872:
 		YYDEBUG(872, *YYCURSOR);
 		++YYCURSOR;
@@ -7953,7 +8018,7 @@ yy877:
 	yy_push_state(ST_IN_SCRIPTING TSRMLS_CC);
 	return T_STRING_VARNAME;
 }
-#line 7957 "Zend/zend_language_scanner.c"
+#line 8022 "Zend/zend_language_scanner.c"
 yy878:
 		YYDEBUG(878, *YYCURSOR);
 		++YYCURSOR;
@@ -7966,7 +8031,7 @@ yy878:
 	yy_push_state(ST_IN_SCRIPTING TSRMLS_CC);
 	goto restart;
 }
-#line 7970 "Zend/zend_language_scanner.c"
+#line 8035 "Zend/zend_language_scanner.c"
 yy880:
 		YYDEBUG(880, *YYCURSOR);
 		++YYCURSOR;
@@ -8155,7 +8220,7 @@ yy893:
 		yymore();
 	}
 }
-#line 8159 "Zend/zend_language_scanner.c"
+#line 8224 "Zend/zend_language_scanner.c"
 yy895:
 		YYDEBUG(895, *YYCURSOR);
 		++YYCURSOR;
@@ -8266,7 +8331,7 @@ yy902:
 		{
 	yymore();
 }
-#line 8270 "Zend/zend_language_scanner.c"
+#line 8335 "Zend/zend_language_scanner.c"
 yy903:
 		YYDEBUG(903, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -8307,7 +8372,7 @@ yy907:
 			return T_COMMENT;
 	}
 }
-#line 8311 "Zend/zend_language_scanner.c"
+#line 8376 "Zend/zend_language_scanner.c"
 yy908:
 		YYDEBUG(908, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -8329,7 +8394,7 @@ yy909:
 	CG(zend_lineno)++;
 	return T_COMMENT;
 }
-#line 8333 "Zend/zend_language_scanner.c"
+#line 8398 "Zend/zend_language_scanner.c"
 yy912:
 		YYDEBUG(912, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -8352,7 +8417,7 @@ yy913:
 		yymore();
 	}
 }
-#line 8356 "Zend/zend_language_scanner.c"
+#line 8421 "Zend/zend_language_scanner.c"
 	}
 /* *********************************** */
 yyc_ST_VAR_OFFSET:
@@ -8465,7 +8530,7 @@ yy918:
 	}
 	return T_NUM_STRING;
 }
-#line 8469 "Zend/zend_language_scanner.c"
+#line 8534 "Zend/zend_language_scanner.c"
 yy919:
 		YYDEBUG(919, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -8490,7 +8555,7 @@ yy921:
 	/* Only '[' can be valid, but returning other tokens will allow a more explicit parse error */
 	return yytext[0];
 }
-#line 8494 "Zend/zend_language_scanner.c"
+#line 8559 "Zend/zend_language_scanner.c"
 yy922:
 		YYDEBUG(922, *YYCURSOR);
 		++YYCURSOR;
@@ -8501,7 +8566,7 @@ yy922:
 	yy_pop_state(TSRMLS_C);
 	return ']';
 }
-#line 8505 "Zend/zend_language_scanner.c"
+#line 8570 "Zend/zend_language_scanner.c"
 yy924:
 		YYDEBUG(924, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -8519,7 +8584,7 @@ yy925:
 	ZVAL_EMPTY_STRING(zendlval); /* Empty since it won't be used */
 	return T_ENCAPSED_AND_WHITESPACE;
 }
-#line 8523 "Zend/zend_language_scanner.c"
+#line 8588 "Zend/zend_language_scanner.c"
 yy927:
 		YYDEBUG(927, *YYCURSOR);
 		++YYCURSOR;
@@ -8534,7 +8599,7 @@ yy928:
 	zendlval->type = IS_STRING;
 	return T_STRING;
 }
-#line 8538 "Zend/zend_language_scanner.c"
+#line 8603 "Zend/zend_language_scanner.c"
 yy929:
 		YYDEBUG(929, *YYCURSOR);
 		++YYCURSOR;
@@ -8545,7 +8610,7 @@ yy929:
 	zend_error(E_COMPILE_WARNING,"Unexpected character in input:  '%c' (ASCII=%d) state=%d", yytext[0], yytext[0], YYSTATE);
 	goto restart;
 }
-#line 8549 "Zend/zend_language_scanner.c"
+#line 8614 "Zend/zend_language_scanner.c"
 yy931:
 		YYDEBUG(931, *YYCURSOR);
 		++YYCURSOR;
@@ -8587,7 +8652,7 @@ yy935:
 	zendlval->type = IS_STRING;
 	return T_VARIABLE;
 }
-#line 8591 "Zend/zend_language_scanner.c"
+#line 8656 "Zend/zend_language_scanner.c"
 yy936:
 		YYDEBUG(936, *YYCURSOR);
 		++YYCURSOR;
@@ -8626,7 +8691,7 @@ yy942:
 	zendlval->type = IS_STRING;
 	return T_NUM_STRING;
 }
-#line 8630 "Zend/zend_language_scanner.c"
+#line 8695 "Zend/zend_language_scanner.c"
 yy943:
 		YYDEBUG(943, *YYCURSOR);
 		++YYCURSOR;
diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
index 11449ad411..da73b1531f 100644
--- a/Zend/zend_language_scanner.l
+++ b/Zend/zend_language_scanner.l
@@ -1453,7 +1453,7 @@ NOWDOC_CHARS        ([^\n\r]|{NEWLINE}+([^a-zA-Z_\x7f-\xff\n\r]|({LABEL}([^a-zA-
 	return T_DNUMBER;
 }
 
-<ST_IN_SCRIPTING>'__CLASS__' {
+<ST_IN_SCRIPTING>"__CLASS__" {
 	char *class_name = NULL;
 
 	if (CG(active_class_entry)) {
@@ -1469,7 +1469,7 @@ NOWDOC_CHARS        ([^\n\r]|{NEWLINE}+([^a-zA-Z_\x7f-\xff\n\r]|({LABEL}([^a-zA-
 	return T_CLASS_C;
 }
 
-<ST_IN_SCRIPTING>'__FUNCTION__' {
+<ST_IN_SCRIPTING>"__FUNCTION__" {
 	char *func_name = NULL;
 
 	if (CG(active_op_array)) {
@@ -1485,7 +1485,7 @@ NOWDOC_CHARS        ([^\n\r]|{NEWLINE}+([^a-zA-Z_\x7f-\xff\n\r]|({LABEL}([^a-zA-
 	return T_FUNC_C;
 }
 
-<ST_IN_SCRIPTING>'__METHOD__' {
+<ST_IN_SCRIPTING>"__METHOD__" {
 	char *class_name = CG(active_class_entry) ? CG(active_class_entry)->name : NULL;
 	char *func_name = CG(active_op_array)? CG(active_op_array)->function_name : NULL;
 	size_t len = 0;
@@ -1506,13 +1506,13 @@ NOWDOC_CHARS        ([^\n\r]|{NEWLINE}+([^a-zA-Z_\x7f-\xff\n\r]|({LABEL}([^a-zA-
 	return T_METHOD_C;
 }
 
-<ST_IN_SCRIPTING>'__LINE__' {
+<ST_IN_SCRIPTING>"__LINE__" {
 	zendlval->value.lval = CG(zend_lineno);
 	zendlval->type = IS_LONG;
 	return T_LINE;
 }
 
-<ST_IN_SCRIPTING>'__FILE__' {
+<ST_IN_SCRIPTING>"__FILE__" {
 	char *filename = zend_get_compiled_filename(TSRMLS_C);
 
 	if (!filename) {
@@ -1524,7 +1524,7 @@ NOWDOC_CHARS        ([^\n\r]|{NEWLINE}+([^a-zA-Z_\x7f-\xff\n\r]|({LABEL}([^a-zA-
 	return T_FILE;
 }
 
-<ST_IN_SCRIPTING>'__DIR__' {
+<ST_IN_SCRIPTING>"__DIR__" {
 	char *filename = zend_get_compiled_filename(TSRMLS_C);
 	const size_t filename_len = strlen(filename);
 	char *dirname;
@@ -1551,7 +1551,7 @@ NOWDOC_CHARS        ([^\n\r]|{NEWLINE}+([^a-zA-Z_\x7f-\xff\n\r]|({LABEL}([^a-zA-
 	return T_DIR;
 }
 
-<ST_IN_SCRIPTING>'__NAMESPACE__' {
+<ST_IN_SCRIPTING>"__NAMESPACE__" {
 	if (CG(current_namespace)) {
 		*zendlval = *CG(current_namespace);
 		zval_copy_ctor(zendlval);