cvs: ZendEngine2(PHP_5_3) / zend_language_scanner.c zend_language_scanner.l

[email protected] ("Matt Wilmas")
Newsgroups php.zend-engine.cvs
Message-ID <cvsmattwil1210328872@cvsserver>
mattwil		Fri May  9 10:27:52 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /ZendEngine2	zend_language_scanner.c zend_language_scanner.l 
  Log:
  MFH: Fix loss of backslash at end of heredoc; For bug #44830 (Very minor issue with backslash in heredoc)
mattwil-20080509102752.txt (text/plain, 74.5 KB)
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_language_scanner.c?r1=1.1.2.10&r2=1.1.2.11&diff_format=u
Index: ZendEngine2/zend_language_scanner.c
diff -u ZendEngine2/zend_language_scanner.c:1.1.2.10 ZendEngine2/zend_language_scanner.c:1.1.2.11
--- ZendEngine2/zend_language_scanner.c:1.1.2.10	Thu Apr 10 19:19:03 2008
+++ ZendEngine2/zend_language_scanner.c	Fri May  9 10:27:51 2008
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5.dev on Thu Apr 10 20:01:41 2008 */
+/* Generated by re2c 0.13.4 on Fri May 09 05:04:28 2008 */
 #line 1 "Zend/zend_language_scanner.l"
 /*
    +----------------------------------------------------------------------+
@@ -23,7 +23,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_language_scanner.c,v 1.1.2.10 2008/04/10 19:19:03 nlopess Exp $ */
+/* $Id: zend_language_scanner.c,v 1.1.2.11 2008/05/09 10:27:51 mattwil Exp $ */
 
 #if 0
 # define YYDEBUG(s, c) printf("state: %d char: %c\n", s, c)
@@ -500,9 +500,7 @@
 	while (s<end) {
 		if (*s=='\\') {
 			s++;
-			if (s>=end) {
-				continue;
-			}
+
 			switch(*s) {
 				case 'n':
 					*t++ = '\n';
@@ -608,7 +606,7 @@
 	}
 
 
-#line 612 "Zend/zend_language_scanner.c"
+#line 610 "Zend/zend_language_scanner.c"
 {
 	YYCTYPE yych;
 	unsigned int yyaccept = 0;
@@ -732,7 +730,7 @@
 yy3:
 		YYDEBUG(3, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1400 "Zend/zend_language_scanner.l"
+#line 1398 "Zend/zend_language_scanner.l"
 		{
 
 	while (1) {
@@ -763,7 +761,7 @@
 	HANDLE_NEWLINES(yytext, yyleng);
 	return T_INLINE_HTML;
 }
-#line 767 "Zend/zend_language_scanner.c"
+#line 765 "Zend/zend_language_scanner.c"
 yy4:
 		YYDEBUG(4, *YYCURSOR);
 		yyaccept = 0;
@@ -790,7 +788,7 @@
 yy9:
 		YYDEBUG(9, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1391 "Zend/zend_language_scanner.l"
+#line 1389 "Zend/zend_language_scanner.l"
 		{
 	if ((YYCTYPE*)yytext == SCNG(yy_start)) {
 		/* ignore first line when it's started with a # */
@@ -799,7 +797,7 @@
 		goto inline_char_handler;
 	}
 }
-#line 803 "Zend/zend_language_scanner.c"
+#line 801 "Zend/zend_language_scanner.c"
 yy10:
 		YYDEBUG(10, *YYCURSOR);
 		yyaccept = 1;
@@ -825,7 +823,7 @@
 yy13:
 		YYDEBUG(13, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1375 "Zend/zend_language_scanner.l"
+#line 1373 "Zend/zend_language_scanner.l"
 		{
 	HANDLE_NEWLINES(yytext, yyleng);
 	if (CG(short_tags)) {
@@ -841,14 +839,14 @@
 		return T_INLINE_HTML;
 	}
 }
-#line 845 "Zend/zend_language_scanner.c"
+#line 843 "Zend/zend_language_scanner.c"
 yy14:
 		YYDEBUG(14, *YYCURSOR);
 		++YYCURSOR;
 		if ((yych = *YYCURSOR) == '=') goto yy50;
 		YYDEBUG(15, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1349 "Zend/zend_language_scanner.l"
+#line 1347 "Zend/zend_language_scanner.l"
 		{
 	if (CG(asp_tags)) {
 		zendlval->value.str.val = yytext; /* no copying - intentional */
@@ -863,7 +861,7 @@
 		return T_INLINE_HTML;
 	}
 }
-#line 867 "Zend/zend_language_scanner.c"
+#line 865 "Zend/zend_language_scanner.c"
 yy16:
 		YYDEBUG(16, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -1053,7 +1051,7 @@
 		++YYCURSOR;
 		YYDEBUG(45, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1307 "Zend/zend_language_scanner.l"
+#line 1305 "Zend/zend_language_scanner.l"
 		{
 	HANDLE_NEWLINES(yytext, yyleng);
 	zendlval->value.str.val = yytext; /* no copying - intentional */
@@ -1062,7 +1060,7 @@
 	BEGIN(ST_IN_SCRIPTING);
 	return T_OPEN_TAG;
 }
-#line 1066 "Zend/zend_language_scanner.c"
+#line 1064 "Zend/zend_language_scanner.c"
 yy46:
 		YYDEBUG(46, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -1089,7 +1087,7 @@
 		++YYCURSOR;
 		YYDEBUG(51, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1317 "Zend/zend_language_scanner.l"
+#line 1315 "Zend/zend_language_scanner.l"
 		{
 	if (CG(asp_tags)) {
 		zendlval->value.str.val = yytext; /* no copying - intentional */
@@ -1104,13 +1102,13 @@
 		return T_INLINE_HTML;
 	}
 }
-#line 1108 "Zend/zend_language_scanner.c"
+#line 1106 "Zend/zend_language_scanner.c"
 yy52:
 		YYDEBUG(52, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(53, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1333 "Zend/zend_language_scanner.l"
+#line 1331 "Zend/zend_language_scanner.l"
 		{
 	if (CG(short_tags)) {
 		zendlval->value.str.val = yytext; /* no copying - intentional */
@@ -1125,7 +1123,7 @@
 		return T_INLINE_HTML;
 	}
 }
-#line 1129 "Zend/zend_language_scanner.c"
+#line 1127 "Zend/zend_language_scanner.c"
 yy54:
 		YYDEBUG(54, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -1152,7 +1150,7 @@
 yy58:
 		YYDEBUG(58, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1365 "Zend/zend_language_scanner.l"
+#line 1363 "Zend/zend_language_scanner.l"
 		{
 	zendlval->value.str.val = yytext; /* no copying - intentional */
 	zendlval->value.str.len = yyleng;
@@ -1161,7 +1159,7 @@
 	BEGIN(ST_IN_SCRIPTING);
 	return T_OPEN_TAG;
 }
-#line 1165 "Zend/zend_language_scanner.c"
+#line 1163 "Zend/zend_language_scanner.c"
 yy59:
 		YYDEBUG(59, *YYCURSOR);
 		++YYCURSOR;
@@ -1252,13 +1250,13 @@
 yy64:
 		YYDEBUG(64, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1763 "Zend/zend_language_scanner.l"
+#line 1759 "Zend/zend_language_scanner.l"
 		{
 	zendlval->value.lval = (long) '{';
 	yy_push_state(ST_IN_SCRIPTING TSRMLS_CC);
 	return T_CURLY_OPEN;
 }
-#line 1262 "Zend/zend_language_scanner.c"
+#line 1260 "Zend/zend_language_scanner.c"
 yy65:
 		YYDEBUG(65, *YYCURSOR);
 		yyaccept = 1;
@@ -1276,12 +1274,12 @@
 yy67:
 		YYDEBUG(67, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1788 "Zend/zend_language_scanner.l"
+#line 1784 "Zend/zend_language_scanner.l"
 		{
 	zend_scan_escape_string(zendlval, yytext, yyleng, '`' TSRMLS_CC);
 	return T_ENCAPSED_AND_WHITESPACE;
 }
-#line 1285 "Zend/zend_language_scanner.c"
+#line 1283 "Zend/zend_language_scanner.c"
 yy68:
 		YYDEBUG(68, *YYCURSOR);
 		++YYCURSOR;
@@ -1293,12 +1291,12 @@
 		++YYCURSOR;
 		YYDEBUG(70, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1924 "Zend/zend_language_scanner.l"
+#line 1920 "Zend/zend_language_scanner.l"
 		{
 	BEGIN(ST_IN_SCRIPTING);
 	return '`';
 }
-#line 1302 "Zend/zend_language_scanner.c"
+#line 1300 "Zend/zend_language_scanner.c"
 yy71:
 		YYDEBUG(71, *YYCURSOR);
 		++YYCURSOR;
@@ -1386,13 +1384,13 @@
 yy77:
 		YYDEBUG(77, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1793 "Zend/zend_language_scanner.l"
+#line 1789 "Zend/zend_language_scanner.l"
 		{
 	yyless(yyleng - 1);
 	zend_scan_escape_string(zendlval, yytext, yyleng, '`' TSRMLS_CC);
 	return T_ENCAPSED_AND_WHITESPACE;
 }
-#line 1396 "Zend/zend_language_scanner.c"
+#line 1394 "Zend/zend_language_scanner.c"
 yy78:
 		YYDEBUG(78, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -1426,24 +1424,24 @@
 yy83:
 		YYDEBUG(83, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1453 "Zend/zend_language_scanner.l"
+#line 1451 "Zend/zend_language_scanner.l"
 		{
 	zend_copy_value(zendlval, (yytext+1), (yyleng-1));
 	zendlval->type = IS_STRING;
 	return T_VARIABLE;
 }
-#line 1436 "Zend/zend_language_scanner.c"
+#line 1434 "Zend/zend_language_scanner.c"
 yy84:
 		YYDEBUG(84, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(85, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1100 "Zend/zend_language_scanner.l"
+#line 1098 "Zend/zend_language_scanner.l"
 		{
 	yy_push_state(ST_LOOKING_FOR_VARNAME TSRMLS_CC);
 	return T_DOLLAR_OPEN_CURLY_BRACES;
 }
-#line 1447 "Zend/zend_language_scanner.c"
+#line 1445 "Zend/zend_language_scanner.c"
 yy86:
 		YYDEBUG(86, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -1454,7 +1452,7 @@
 		++YYCURSOR;
 		YYDEBUG(88, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1445 "Zend/zend_language_scanner.l"
+#line 1443 "Zend/zend_language_scanner.l"
 		{
 	yyless(yyleng - 1);
 	yy_push_state(ST_VAR_OFFSET TSRMLS_CC);
@@ -1462,7 +1460,7 @@
 	zendlval->type = IS_STRING;
 	return T_VARIABLE;
 }
-#line 1466 "Zend/zend_language_scanner.c"
+#line 1464 "Zend/zend_language_scanner.c"
 yy89:
 		YYDEBUG(89, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -1480,7 +1478,7 @@
 		++YYCURSOR;
 		YYDEBUG(91, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1435 "Zend/zend_language_scanner.l"
+#line 1433 "Zend/zend_language_scanner.l"
 		{
 	yyless(yyleng - 3);
 	yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC);
@@ -1488,7 +1486,7 @@
 	zendlval->type = IS_STRING;
 	return T_VARIABLE;
 }
-#line 1492 "Zend/zend_language_scanner.c"
+#line 1490 "Zend/zend_language_scanner.c"
 	}
 /* *********************************** */
 yyc_ST_COMMENT:
@@ -1545,34 +1543,34 @@
 		}
 		YYDEBUG(96, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1545 "Zend/zend_language_scanner.l"
+#line 1543 "Zend/zend_language_scanner.l"
 		{
 	yymore();
 }
-#line 1553 "Zend/zend_language_scanner.c"
+#line 1551 "Zend/zend_language_scanner.c"
 yy97:
 		YYDEBUG(97, *YYCURSOR);
 		++YYCURSOR;
 		if ((yych = *YYCURSOR) == '/') goto yy99;
 		YYDEBUG(98, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1563 "Zend/zend_language_scanner.l"
+#line 1561 "Zend/zend_language_scanner.l"
 		{
 	yymore();
 }
-#line 1564 "Zend/zend_language_scanner.c"
+#line 1562 "Zend/zend_language_scanner.c"
 yy99:
 		YYDEBUG(99, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(100, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1557 "Zend/zend_language_scanner.l"
+#line 1555 "Zend/zend_language_scanner.l"
 		{
 	HANDLE_NEWLINES(yytext, yyleng);
 	BEGIN(ST_IN_SCRIPTING);
 	return T_COMMENT;
 }
-#line 1576 "Zend/zend_language_scanner.c"
+#line 1574 "Zend/zend_language_scanner.c"
 	}
 /* *********************************** */
 yyc_ST_DOC_COMMENT:
@@ -1629,28 +1627,28 @@
 		}
 		YYDEBUG(105, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1545 "Zend/zend_language_scanner.l"
+#line 1543 "Zend/zend_language_scanner.l"
 		{
 	yymore();
 }
-#line 1637 "Zend/zend_language_scanner.c"
+#line 1635 "Zend/zend_language_scanner.c"
 yy106:
 		YYDEBUG(106, *YYCURSOR);
 		++YYCURSOR;
 		if ((yych = *YYCURSOR) == '/') goto yy108;
 		YYDEBUG(107, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1563 "Zend/zend_language_scanner.l"
+#line 1561 "Zend/zend_language_scanner.l"
 		{
 	yymore();
 }
-#line 1648 "Zend/zend_language_scanner.c"
+#line 1646 "Zend/zend_language_scanner.c"
 yy108:
 		YYDEBUG(108, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(109, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1549 "Zend/zend_language_scanner.l"
+#line 1547 "Zend/zend_language_scanner.l"
 		{
 	CG(doc_comment) = estrndup(yytext, yyleng);
 	CG(doc_comment_len) = yyleng;
@@ -1658,7 +1656,7 @@
 	BEGIN(ST_IN_SCRIPTING);
 	return T_DOC_COMMENT;
 }
-#line 1662 "Zend/zend_language_scanner.c"
+#line 1660 "Zend/zend_language_scanner.c"
 	}
 /* *********************************** */
 yyc_ST_DOUBLE_QUOTES:
@@ -1745,13 +1743,13 @@
 yy114:
 		YYDEBUG(114, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1763 "Zend/zend_language_scanner.l"
+#line 1759 "Zend/zend_language_scanner.l"
 		{
 	zendlval->value.lval = (long) '{';
 	yy_push_state(ST_IN_SCRIPTING TSRMLS_CC);
 	return T_CURLY_OPEN;
 }
-#line 1755 "Zend/zend_language_scanner.c"
+#line 1753 "Zend/zend_language_scanner.c"
 yy115:
 		YYDEBUG(115, *YYCURSOR);
 		yyaccept = 1;
@@ -1770,12 +1768,12 @@
 yy117:
 		YYDEBUG(117, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1770 "Zend/zend_language_scanner.l"
+#line 1766 "Zend/zend_language_scanner.l"
 		{
 	zend_scan_escape_string(zendlval, yytext, yyleng, '"' TSRMLS_CC);
 	return T_ENCAPSED_AND_WHITESPACE;
 }
-#line 1779 "Zend/zend_language_scanner.c"
+#line 1777 "Zend/zend_language_scanner.c"
 yy118:
 		YYDEBUG(118, *YYCURSOR);
 		++YYCURSOR;
@@ -1787,12 +1785,12 @@
 		++YYCURSOR;
 		YYDEBUG(120, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1918 "Zend/zend_language_scanner.l"
+#line 1914 "Zend/zend_language_scanner.l"
 		{
 	BEGIN(ST_IN_SCRIPTING);
 	return '"';
 }
-#line 1796 "Zend/zend_language_scanner.c"
+#line 1794 "Zend/zend_language_scanner.c"
 yy121:
 		YYDEBUG(121, *YYCURSOR);
 		++YYCURSOR;
@@ -1883,13 +1881,13 @@
 yy127:
 		YYDEBUG(127, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1781 "Zend/zend_language_scanner.l"
+#line 1777 "Zend/zend_language_scanner.l"
 		{
 	yyless(yyleng - 1);
 	zend_scan_escape_string(zendlval, yytext, yyleng, '"' TSRMLS_CC);
 	return T_ENCAPSED_AND_WHITESPACE;
 }
-#line 1893 "Zend/zend_language_scanner.c"
+#line 1891 "Zend/zend_language_scanner.c"
 yy128:
 		YYDEBUG(128, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -1923,24 +1921,24 @@
 yy133:
 		YYDEBUG(133, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1453 "Zend/zend_language_scanner.l"
+#line 1451 "Zend/zend_language_scanner.l"
 		{
 	zend_copy_value(zendlval, (yytext+1), (yyleng-1));
 	zendlval->type = IS_STRING;
 	return T_VARIABLE;
 }
-#line 1933 "Zend/zend_language_scanner.c"
+#line 1931 "Zend/zend_language_scanner.c"
 yy134:
 		YYDEBUG(134, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(135, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1100 "Zend/zend_language_scanner.l"
+#line 1098 "Zend/zend_language_scanner.l"
 		{
 	yy_push_state(ST_LOOKING_FOR_VARNAME TSRMLS_CC);
 	return T_DOLLAR_OPEN_CURLY_BRACES;
 }
-#line 1944 "Zend/zend_language_scanner.c"
+#line 1942 "Zend/zend_language_scanner.c"
 yy136:
 		YYDEBUG(136, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -1951,7 +1949,7 @@
 		++YYCURSOR;
 		YYDEBUG(138, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1445 "Zend/zend_language_scanner.l"
+#line 1443 "Zend/zend_language_scanner.l"
 		{
 	yyless(yyleng - 1);
 	yy_push_state(ST_VAR_OFFSET TSRMLS_CC);
@@ -1959,7 +1957,7 @@
 	zendlval->type = IS_STRING;
 	return T_VARIABLE;
 }
-#line 1963 "Zend/zend_language_scanner.c"
+#line 1961 "Zend/zend_language_scanner.c"
 yy139:
 		YYDEBUG(139, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -1977,7 +1975,7 @@
 		++YYCURSOR;
 		YYDEBUG(141, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1435 "Zend/zend_language_scanner.l"
+#line 1433 "Zend/zend_language_scanner.l"
 		{
 	yyless(yyleng - 3);
 	yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC);
@@ -1985,7 +1983,7 @@
 	zendlval->type = IS_STRING;
 	return T_VARIABLE;
 }
-#line 1989 "Zend/zend_language_scanner.c"
+#line 1987 "Zend/zend_language_scanner.c"
 	}
 /* *********************************** */
 yyc_ST_END_HEREDOC:
@@ -1996,7 +1994,7 @@
 	++YYCURSOR;
 	YYDEBUG(145, *YYCURSOR);
 	yyleng = YYCURSOR - SCNG(yy_text);
-#line 1752 "Zend/zend_language_scanner.l"
+#line 1748 "Zend/zend_language_scanner.l"
 	{
 	SCNG(yy_text) = Z_STRVAL_P(zendlval) = CG(heredoc);
 	SCNG(yy_leng) = Z_STRLEN_P(zendlval) = CG(heredoc_len);
@@ -2005,7 +2003,7 @@
 	BEGIN(ST_IN_SCRIPTING);
 	return T_END_HEREDOC;
 }
-#line 2009 "Zend/zend_language_scanner.c"
+#line 2007 "Zend/zend_language_scanner.c"
 /* *********************************** */
 yyc_ST_END_NOWDOC:
 	YYDEBUG(146, *YYCURSOR);
@@ -2015,7 +2013,7 @@
 	++YYCURSOR;
 	YYDEBUG(149, *YYCURSOR);
 	yyleng = YYCURSOR - SCNG(yy_text);
-#line 1907 "Zend/zend_language_scanner.l"
+#line 1903 "Zend/zend_language_scanner.l"
 	{
 	SCNG(yy_text) = Z_STRVAL_P(zendlval) = CG(heredoc);
 	SCNG(yy_leng) = Z_STRLEN_P(zendlval) = CG(heredoc_len);
@@ -2024,7 +2022,7 @@
 	BEGIN(ST_IN_SCRIPTING);
 	return T_END_NOWDOC;
 }
-#line 2028 "Zend/zend_language_scanner.c"
+#line 2026 "Zend/zend_language_scanner.c"
 /* *********************************** */
 yyc_ST_HEREDOC:
 	{
@@ -2081,12 +2079,12 @@
 yy152:
 		YYDEBUG(152, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1807 "Zend/zend_language_scanner.l"
+#line 1803 "Zend/zend_language_scanner.l"
 		{
 	zend_scan_escape_string(zendlval, yytext, yyleng, 0 TSRMLS_CC);
 	return T_ENCAPSED_AND_WHITESPACE;
 }
-#line 2090 "Zend/zend_language_scanner.c"
+#line 2088 "Zend/zend_language_scanner.c"
 yy153:
 		YYDEBUG(153, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -2132,13 +2130,13 @@
 yy155:
 		YYDEBUG(155, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1763 "Zend/zend_language_scanner.l"
+#line 1759 "Zend/zend_language_scanner.l"
 		{
 	zendlval->value.lval = (long) '{';
 	yy_push_state(ST_IN_SCRIPTING TSRMLS_CC);
 	return T_CURLY_OPEN;
 }
-#line 2142 "Zend/zend_language_scanner.c"
+#line 2140 "Zend/zend_language_scanner.c"
 yy156:
 		YYDEBUG(156, *YYCURSOR);
 		yyaccept = 0;
@@ -2389,13 +2387,13 @@
 yy174:
 		YYDEBUG(174, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1812 "Zend/zend_language_scanner.l"
+#line 1808 "Zend/zend_language_scanner.l"
 		{
 	yyless(yyleng - 1);
 	zend_scan_escape_string(zendlval, yytext, yyleng, 0 TSRMLS_CC);
 	return T_ENCAPSED_AND_WHITESPACE;
 }
-#line 2399 "Zend/zend_language_scanner.c"
+#line 2397 "Zend/zend_language_scanner.c"
 yy175:
 		YYDEBUG(175, *YYCURSOR);
 		yyaccept = 2;
@@ -2494,7 +2492,7 @@
 		++YYCURSOR;
 		YYDEBUG(182, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1712 "Zend/zend_language_scanner.l"
+#line 1708 "Zend/zend_language_scanner.l"
 		{
 	char *end = yytext + yyleng - 1;
 
@@ -2534,7 +2532,7 @@
 		yymore();
 	}
 }
-#line 2538 "Zend/zend_language_scanner.c"
+#line 2536 "Zend/zend_language_scanner.c"
 yy183:
 		YYDEBUG(183, *YYCURSOR);
 		yyaccept = 2;
@@ -2794,24 +2792,24 @@
 yy204:
 		YYDEBUG(204, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1453 "Zend/zend_language_scanner.l"
+#line 1451 "Zend/zend_language_scanner.l"
 		{
 	zend_copy_value(zendlval, (yytext+1), (yyleng-1));
 	zendlval->type = IS_STRING;
 	return T_VARIABLE;
 }
-#line 2804 "Zend/zend_language_scanner.c"
+#line 2802 "Zend/zend_language_scanner.c"
 yy205:
 		YYDEBUG(205, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(206, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1100 "Zend/zend_language_scanner.l"
+#line 1098 "Zend/zend_language_scanner.l"
 		{
 	yy_push_state(ST_LOOKING_FOR_VARNAME TSRMLS_CC);
 	return T_DOLLAR_OPEN_CURLY_BRACES;
 }
-#line 2815 "Zend/zend_language_scanner.c"
+#line 2813 "Zend/zend_language_scanner.c"
 yy207:
 		YYDEBUG(207, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -2822,7 +2820,7 @@
 		++YYCURSOR;
 		YYDEBUG(209, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1445 "Zend/zend_language_scanner.l"
+#line 1443 "Zend/zend_language_scanner.l"
 		{
 	yyless(yyleng - 1);
 	yy_push_state(ST_VAR_OFFSET TSRMLS_CC);
@@ -2830,7 +2828,7 @@
 	zendlval->type = IS_STRING;
 	return T_VARIABLE;
 }
-#line 2834 "Zend/zend_language_scanner.c"
+#line 2832 "Zend/zend_language_scanner.c"
 yy210:
 		YYDEBUG(210, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -2848,7 +2846,7 @@
 		++YYCURSOR;
 		YYDEBUG(212, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1435 "Zend/zend_language_scanner.l"
+#line 1433 "Zend/zend_language_scanner.l"
 		{
 	yyless(yyleng - 3);
 	yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC);
@@ -2856,7 +2854,7 @@
 	zendlval->type = IS_STRING;
 	return T_VARIABLE;
 }
-#line 2860 "Zend/zend_language_scanner.c"
+#line 2858 "Zend/zend_language_scanner.c"
 	}
 /* *********************************** */
 yyc_ST_IN_SCRIPTING:
@@ -3071,13 +3069,13 @@
 yy216:
 		YYDEBUG(216, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1477 "Zend/zend_language_scanner.l"
+#line 1475 "Zend/zend_language_scanner.l"
 		{
 	zend_copy_value(zendlval, yytext, yyleng);
 	zendlval->type = IS_STRING;
 	return T_STRING;
 }
-#line 3081 "Zend/zend_language_scanner.c"
+#line 3079 "Zend/zend_language_scanner.c"
 yy217:
 		YYDEBUG(217, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -3324,11 +3322,11 @@
 yy230:
 		YYDEBUG(230, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1089 "Zend/zend_language_scanner.l"
+#line 1087 "Zend/zend_language_scanner.l"
 		{
 	return yytext[0];
 }
-#line 3332 "Zend/zend_language_scanner.c"
+#line 3330 "Zend/zend_language_scanner.c"
 yy231:
 		YYDEBUG(231, *YYCURSOR);
 		++YYCURSOR;
@@ -3337,7 +3335,7 @@
 yy232:
 		YYDEBUG(232, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 828 "Zend/zend_language_scanner.l"
+#line 826 "Zend/zend_language_scanner.l"
 		{
 	zendlval->value.str.val = yytext; /* no copying - intentional */
 	zendlval->value.str.len = yyleng;
@@ -3345,7 +3343,7 @@
 	HANDLE_NEWLINES(yytext, yyleng);
 	return T_WHITESPACE;
 }
-#line 3349 "Zend/zend_language_scanner.c"
+#line 3347 "Zend/zend_language_scanner.c"
 yy233:
 		YYDEBUG(233, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -3578,18 +3576,18 @@
 		++YYCURSOR;
 		YYDEBUG(258, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1094 "Zend/zend_language_scanner.l"
+#line 1092 "Zend/zend_language_scanner.l"
 		{
 	yy_push_state(ST_IN_SCRIPTING TSRMLS_CC);
 	return '{';
 }
-#line 3587 "Zend/zend_language_scanner.c"
+#line 3585 "Zend/zend_language_scanner.c"
 yy259:
 		YYDEBUG(259, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(260, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1106 "Zend/zend_language_scanner.l"
+#line 1104 "Zend/zend_language_scanner.l"
 		{
 	RESET_DOC_COMMENT();
 	if (!zend_stack_is_empty(&SCNG(state_stack))) {
@@ -3597,7 +3595,7 @@
 	}
 	return '}';
 }
-#line 3601 "Zend/zend_language_scanner.c"
+#line 3599 "Zend/zend_language_scanner.c"
 yy261:
 		YYDEBUG(261, *YYCURSOR);
 		yyaccept = 2;
@@ -3620,7 +3618,7 @@
 yy262:
 		YYDEBUG(262, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1132 "Zend/zend_language_scanner.l"
+#line 1130 "Zend/zend_language_scanner.l"
 		{
 	if (yyleng < MAX_LENGTH_OF_LONG - 1) { /* Won't overflow */
 		zendlval->value.lval = strtol(yytext, NULL, 0);
@@ -3641,7 +3639,7 @@
 	zendlval->type = IS_LONG;
 	return T_LNUMBER;
 }
-#line 3645 "Zend/zend_language_scanner.c"
+#line 3643 "Zend/zend_language_scanner.c"
 yy263:
 		YYDEBUG(263, *YYCURSOR);
 		yyaccept = 2;
@@ -3669,12 +3667,12 @@
 yy266:
 		YYDEBUG(266, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1484 "Zend/zend_language_scanner.l"
+#line 1482 "Zend/zend_language_scanner.l"
 		{
 	BEGIN(ST_ONE_LINE_COMMENT);
 	yymore();
 }
-#line 3678 "Zend/zend_language_scanner.c"
+#line 3676 "Zend/zend_language_scanner.c"
 yy267:
 		YYDEBUG(267, *YYCURSOR);
 		yyaccept = 3;
@@ -3683,12 +3681,12 @@
 yy268:
 		YYDEBUG(268, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1644 "Zend/zend_language_scanner.l"
+#line 1640 "Zend/zend_language_scanner.l"
 		{
 	BEGIN(ST_DOUBLE_QUOTES);
 	return '"';
 }
-#line 3692 "Zend/zend_language_scanner.c"
+#line 3690 "Zend/zend_language_scanner.c"
 yy269:
 		YYDEBUG(269, *YYCURSOR);
 		yyaccept = 4;
@@ -3697,23 +3695,23 @@
 yy270:
 		YYDEBUG(270, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1930 "Zend/zend_language_scanner.l"
+#line 1926 "Zend/zend_language_scanner.l"
 		{
 	zend_error(E_COMPILE_WARNING,"Unexpected character in input:  '%c' (ASCII=%d) state=%d", yytext[0], yytext[0], YYSTATE);
 	goto restart;
 }
-#line 3706 "Zend/zend_language_scanner.c"
+#line 3704 "Zend/zend_language_scanner.c"
 yy271:
 		YYDEBUG(271, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(272, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1672 "Zend/zend_language_scanner.l"
+#line 1668 "Zend/zend_language_scanner.l"
 		{
 	BEGIN(ST_BACKQUOTE);
 	return '`';
 }
-#line 3717 "Zend/zend_language_scanner.c"
+#line 3715 "Zend/zend_language_scanner.c"
 yy273:
 		YYDEBUG(273, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -3739,7 +3737,7 @@
 		++YYCURSOR;
 		YYDEBUG(278, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1600 "Zend/zend_language_scanner.l"
+#line 1598 "Zend/zend_language_scanner.l"
 		{
 	register char *s, *t;
 	char *end;
@@ -3755,9 +3753,7 @@
 	while (s<end) {
 		if (*s=='\\') {
 			s++;
-			if (s>=end) {
-				continue;
-			}
+
 			switch(*s) {
 				case '\\':
 				case '\'':
@@ -3782,7 +3778,7 @@
 
 	return T_CONSTANT_ENCAPSED_STRING;
 }
-#line 3786 "Zend/zend_language_scanner.c"
+#line 3782 "Zend/zend_language_scanner.c"
 yy279:
 		YYDEBUG(279, *YYCURSOR);
 		++YYCURSOR;
@@ -3879,14 +3875,14 @@
 		++YYCURSOR;
 		YYDEBUG(288, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1592 "Zend/zend_language_scanner.l"
+#line 1590 "Zend/zend_language_scanner.l"
 		{
 	int bprefix = (yytext[0] != '"') ? 1 : 0;
 
 	zend_scan_escape_string(zendlval, yytext+bprefix+1, yyleng-bprefix-2, '"' TSRMLS_CC);
 	return T_CONSTANT_ENCAPSED_STRING;
 }
-#line 3890 "Zend/zend_language_scanner.c"
+#line 3886 "Zend/zend_language_scanner.c"
 yy289:
 		YYDEBUG(289, *YYCURSOR);
 		++YYCURSOR;
@@ -3919,13 +3915,13 @@
 yy294:
 		YYDEBUG(294, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1193 "Zend/zend_language_scanner.l"
+#line 1191 "Zend/zend_language_scanner.l"
 		{
 	zendlval->value.dval = zend_strtod(yytext, NULL);
 	zendlval->type = IS_DOUBLE;
 	return T_DNUMBER;
 }
-#line 3929 "Zend/zend_language_scanner.c"
+#line 3925 "Zend/zend_language_scanner.c"
 yy295:
 		YYDEBUG(295, *YYCURSOR);
 		yyaccept = 2;
@@ -3987,7 +3983,7 @@
 		}
 		YYDEBUG(304, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1153 "Zend/zend_language_scanner.l"
+#line 1151 "Zend/zend_language_scanner.l"
 		{
 	char *hex = yytext + 2; /* Skip "0x" */
 	int len = yyleng - 2;
@@ -4008,7 +4004,7 @@
 		return T_DNUMBER;
 	}
 }
-#line 4012 "Zend/zend_language_scanner.c"
+#line 4008 "Zend/zend_language_scanner.c"
 yy305:
 		YYDEBUG(305, *YYCURSOR);
 		++YYCURSOR;
@@ -4017,7 +4013,7 @@
 yy306:
 		YYDEBUG(306, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1567 "Zend/zend_language_scanner.l"
+#line 1565 "Zend/zend_language_scanner.l"
 		{
 	zendlval->value.str.val = yytext; /* no copying - intentional */
 	zendlval->value.str.len = yyleng;
@@ -4025,7 +4021,7 @@
 	BEGIN(INITIAL);
 	return T_CLOSE_TAG;  /* implicit ';' at php-end tag */
 }
-#line 4029 "Zend/zend_language_scanner.c"
+#line 4025 "Zend/zend_language_scanner.c"
 yy307:
 		YYDEBUG(307, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -4059,13 +4055,13 @@
 yy311:
 		YYDEBUG(311, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1453 "Zend/zend_language_scanner.l"
+#line 1451 "Zend/zend_language_scanner.l"
 		{
 	zend_copy_value(zendlval, (yytext+1), (yyleng-1));
 	zendlval->type = IS_STRING;
 	return T_VARIABLE;
 }
-#line 4069 "Zend/zend_language_scanner.c"
+#line 4065 "Zend/zend_language_scanner.c"
 yy312:
 		YYDEBUG(312, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -4079,11 +4075,11 @@
 		}
 		YYDEBUG(314, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1077 "Zend/zend_language_scanner.l"
+#line 1075 "Zend/zend_language_scanner.l"
 		{
 	return T_LOGICAL_XOR;
 }
-#line 4087 "Zend/zend_language_scanner.c"
+#line 4083 "Zend/zend_language_scanner.c"
 yy315:
 		YYDEBUG(315, *YYCURSOR);
 		++YYCURSOR;
@@ -4092,61 +4088,61 @@
 		}
 		YYDEBUG(316, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1069 "Zend/zend_language_scanner.l"
+#line 1067 "Zend/zend_language_scanner.l"
 		{
 	return T_LOGICAL_OR;
 }
-#line 4100 "Zend/zend_language_scanner.c"
+#line 4096 "Zend/zend_language_scanner.c"
 yy317:
 		YYDEBUG(317, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(318, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1057 "Zend/zend_language_scanner.l"
+#line 1055 "Zend/zend_language_scanner.l"
 		{
 	return T_XOR_EQUAL;
 }
-#line 4110 "Zend/zend_language_scanner.c"
+#line 4106 "Zend/zend_language_scanner.c"
 yy319:
 		YYDEBUG(319, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(320, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1061 "Zend/zend_language_scanner.l"
+#line 1059 "Zend/zend_language_scanner.l"
 		{
 	return T_BOOLEAN_OR;
 }
-#line 4120 "Zend/zend_language_scanner.c"
+#line 4116 "Zend/zend_language_scanner.c"
 yy321:
 		YYDEBUG(321, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(322, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1053 "Zend/zend_language_scanner.l"
+#line 1051 "Zend/zend_language_scanner.l"
 		{
 	return T_OR_EQUAL;
 }
-#line 4130 "Zend/zend_language_scanner.c"
+#line 4126 "Zend/zend_language_scanner.c"
 yy323:
 		YYDEBUG(323, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(324, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1065 "Zend/zend_language_scanner.l"
+#line 1063 "Zend/zend_language_scanner.l"
 		{
 	return T_BOOLEAN_AND;
 }
-#line 4140 "Zend/zend_language_scanner.c"
+#line 4136 "Zend/zend_language_scanner.c"
 yy325:
 		YYDEBUG(325, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(326, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1049 "Zend/zend_language_scanner.l"
+#line 1047 "Zend/zend_language_scanner.l"
 		{
 	return T_AND_EQUAL;
 }
-#line 4150 "Zend/zend_language_scanner.c"
+#line 4146 "Zend/zend_language_scanner.c"
 yy327:
 		YYDEBUG(327, *YYCURSOR);
 		++YYCURSOR;
@@ -4155,7 +4151,7 @@
 yy328:
 		YYDEBUG(328, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1576 "Zend/zend_language_scanner.l"
+#line 1574 "Zend/zend_language_scanner.l"
 		{
 	if (CG(asp_tags)) {
 		BEGIN(INITIAL);
@@ -4168,17 +4164,17 @@
 		return yytext[0];
 	}
 }
-#line 4172 "Zend/zend_language_scanner.c"
+#line 4168 "Zend/zend_language_scanner.c"
 yy329:
 		YYDEBUG(329, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(330, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1037 "Zend/zend_language_scanner.l"
+#line 1035 "Zend/zend_language_scanner.l"
 		{
 	return T_MOD_EQUAL;
 }
-#line 4182 "Zend/zend_language_scanner.c"
+#line 4178 "Zend/zend_language_scanner.c"
 yy331:
 		YYDEBUG(331, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -4209,11 +4205,11 @@
 		++YYCURSOR;
 		YYDEBUG(336, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1033 "Zend/zend_language_scanner.l"
+#line 1031 "Zend/zend_language_scanner.l"
 		{
 	return T_CONCAT_EQUAL;
 }
-#line 4217 "Zend/zend_language_scanner.c"
+#line 4213 "Zend/zend_language_scanner.c"
 yy337:
 		YYDEBUG(337, *YYCURSOR);
 		yyaccept = 6;
@@ -4222,12 +4218,12 @@
 yy338:
 		YYDEBUG(338, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1539 "Zend/zend_language_scanner.l"
+#line 1537 "Zend/zend_language_scanner.l"
 		{
 	BEGIN(ST_COMMENT);
 	yymore();
 }
-#line 4231 "Zend/zend_language_scanner.c"
+#line 4227 "Zend/zend_language_scanner.c"
 yy339:
 		YYDEBUG(339, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -4237,11 +4233,11 @@
 		++YYCURSOR;
 		YYDEBUG(341, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1029 "Zend/zend_language_scanner.l"
+#line 1027 "Zend/zend_language_scanner.l"
 		{
 	return T_DIV_EQUAL;
 }
-#line 4245 "Zend/zend_language_scanner.c"
+#line 4241 "Zend/zend_language_scanner.c"
 yy342:
 		YYDEBUG(342, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -4260,54 +4256,54 @@
 		}
 		YYDEBUG(345, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1533 "Zend/zend_language_scanner.l"
+#line 1531 "Zend/zend_language_scanner.l"
 		{
 	RESET_DOC_COMMENT();
 	BEGIN(ST_DOC_COMMENT);
 	yymore();
 }
-#line 4270 "Zend/zend_language_scanner.c"
+#line 4266 "Zend/zend_language_scanner.c"
 yy346:
 		YYDEBUG(346, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(347, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1025 "Zend/zend_language_scanner.l"
+#line 1023 "Zend/zend_language_scanner.l"
 		{
 	return T_MUL_EQUAL;
 }
-#line 4280 "Zend/zend_language_scanner.c"
+#line 4276 "Zend/zend_language_scanner.c"
 yy348:
 		YYDEBUG(348, *YYCURSOR);
 		++YYCURSOR;
 		if ((yych = *YYCURSOR) == '=') goto yy352;
 		YYDEBUG(349, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1085 "Zend/zend_language_scanner.l"
+#line 1083 "Zend/zend_language_scanner.l"
 		{
 	return T_SR;
 }
-#line 4291 "Zend/zend_language_scanner.c"
+#line 4287 "Zend/zend_language_scanner.c"
 yy350:
 		YYDEBUG(350, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(351, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1013 "Zend/zend_language_scanner.l"
+#line 1011 "Zend/zend_language_scanner.l"
 		{
 	return T_IS_GREATER_OR_EQUAL;
 }
-#line 4301 "Zend/zend_language_scanner.c"
+#line 4297 "Zend/zend_language_scanner.c"
 yy352:
 		YYDEBUG(352, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(353, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1045 "Zend/zend_language_scanner.l"
+#line 1043 "Zend/zend_language_scanner.l"
 		{
 	return T_SR_EQUAL;
 }
-#line 4311 "Zend/zend_language_scanner.c"
+#line 4307 "Zend/zend_language_scanner.c"
 yy354:
 		YYDEBUG(354, *YYCURSOR);
 		yyaccept = 7;
@@ -4318,11 +4314,11 @@
 yy355:
 		YYDEBUG(355, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1081 "Zend/zend_language_scanner.l"
+#line 1079 "Zend/zend_language_scanner.l"
 		{
 	return T_SL;
 }
-#line 4326 "Zend/zend_language_scanner.c"
+#line 4322 "Zend/zend_language_scanner.c"
 yy356:
 		YYDEBUG(356, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -4334,22 +4330,22 @@
 		++YYCURSOR;
 		YYDEBUG(358, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1009 "Zend/zend_language_scanner.l"
+#line 1007 "Zend/zend_language_scanner.l"
 		{
 	return T_IS_SMALLER_OR_EQUAL;
 }
-#line 4342 "Zend/zend_language_scanner.c"
+#line 4338 "Zend/zend_language_scanner.c"
 yy359:
 		YYDEBUG(359, *YYCURSOR);
 		++YYCURSOR;
 yy360:
 		YYDEBUG(360, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1005 "Zend/zend_language_scanner.l"
+#line 1003 "Zend/zend_language_scanner.l"
 		{
 	return T_IS_NOT_EQUAL;
 }
-#line 4353 "Zend/zend_language_scanner.c"
+#line 4349 "Zend/zend_language_scanner.c"
 yy361:
 		YYDEBUG(361, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -4400,11 +4396,11 @@
 		++YYCURSOR;
 		YYDEBUG(369, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1041 "Zend/zend_language_scanner.l"
+#line 1039 "Zend/zend_language_scanner.l"
 		{
 	return T_SL_EQUAL;
 }
-#line 4408 "Zend/zend_language_scanner.c"
+#line 4404 "Zend/zend_language_scanner.c"
 yy370:
 		YYDEBUG(370, *YYCURSOR);
 		++YYCURSOR;
@@ -4511,7 +4507,7 @@
 yy380:
 		YYDEBUG(380, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1650 "Zend/zend_language_scanner.l"
+#line 1646 "Zend/zend_language_scanner.l"
 		{
 	char *s;
 	int bprefix = (yytext[0] != '<') ? 1 : 0;
@@ -4532,7 +4528,7 @@
 	BEGIN(ST_START_HEREDOC);
 	return T_START_HEREDOC;
 }
-#line 4536 "Zend/zend_language_scanner.c"
+#line 4532 "Zend/zend_language_scanner.c"
 yy381:
 		YYDEBUG(381, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -4574,7 +4570,7 @@
 yy386:
 		YYDEBUG(386, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1821 "Zend/zend_language_scanner.l"
+#line 1817 "Zend/zend_language_scanner.l"
 		{
 	int bprefix = (yytext[0] != '<') ? 1 : 0;
 	char *s;
@@ -4591,7 +4587,7 @@
 	BEGIN(ST_START_NOWDOC);
 	return T_START_NOWDOC;
 }
-#line 4595 "Zend/zend_language_scanner.c"
+#line 4591 "Zend/zend_language_scanner.c"
 yy387:
 		YYDEBUG(387, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -4605,31 +4601,31 @@
 		++YYCURSOR;
 		YYDEBUG(390, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 997 "Zend/zend_language_scanner.l"
+#line 995 "Zend/zend_language_scanner.l"
 		{
 	return T_IS_NOT_IDENTICAL;
 }
-#line 4613 "Zend/zend_language_scanner.c"
+#line 4609 "Zend/zend_language_scanner.c"
 yy391:
 		YYDEBUG(391, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(392, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1017 "Zend/zend_language_scanner.l"
+#line 1015 "Zend/zend_language_scanner.l"
 		{
 	return T_PLUS_EQUAL;
 }
-#line 4623 "Zend/zend_language_scanner.c"
+#line 4619 "Zend/zend_language_scanner.c"
 yy393:
 		YYDEBUG(393, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(394, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 985 "Zend/zend_language_scanner.l"
+#line 983 "Zend/zend_language_scanner.l"
 		{
 	return T_INC;
 }
-#line 4633 "Zend/zend_language_scanner.c"
+#line 4629 "Zend/zend_language_scanner.c"
 yy395:
 		YYDEBUG(395, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -4648,42 +4644,42 @@
 		}
 		YYDEBUG(398, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 977 "Zend/zend_language_scanner.l"
+#line 975 "Zend/zend_language_scanner.l"
 		{
 	return T_LIST;
 }
-#line 4656 "Zend/zend_language_scanner.c"
+#line 4652 "Zend/zend_language_scanner.c"
 yy399:
 		YYDEBUG(399, *YYCURSOR);
 		++YYCURSOR;
 		if ((yych = *YYCURSOR) == '=') goto yy403;
 		YYDEBUG(400, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1001 "Zend/zend_language_scanner.l"
+#line 999 "Zend/zend_language_scanner.l"
 		{
 	return T_IS_EQUAL;
 }
-#line 4667 "Zend/zend_language_scanner.c"
+#line 4663 "Zend/zend_language_scanner.c"
 yy401:
 		YYDEBUG(401, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(402, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 973 "Zend/zend_language_scanner.l"
+#line 971 "Zend/zend_language_scanner.l"
 		{
 	return T_DOUBLE_ARROW;
 }
-#line 4677 "Zend/zend_language_scanner.c"
+#line 4673 "Zend/zend_language_scanner.c"
 yy403:
 		YYDEBUG(403, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(404, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 993 "Zend/zend_language_scanner.l"
+#line 991 "Zend/zend_language_scanner.l"
 		{
 	return T_IS_IDENTICAL;
 }
-#line 4687 "Zend/zend_language_scanner.c"
+#line 4683 "Zend/zend_language_scanner.c"
 yy405:
 		YYDEBUG(405, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -4775,7 +4771,7 @@
 		}
 		YYDEBUG(423, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1297 "Zend/zend_language_scanner.l"
+#line 1295 "Zend/zend_language_scanner.l"
 		{
 	if (CG(current_namespace)) {
 		*zendlval = *CG(current_namespace);
@@ -4785,7 +4781,7 @@
 	}
 	return T_NS_C;
 }
-#line 4789 "Zend/zend_language_scanner.c"
+#line 4785 "Zend/zend_language_scanner.c"
 yy424:
 		YYDEBUG(424, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -4803,7 +4799,7 @@
 		}
 		YYDEBUG(428, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1270 "Zend/zend_language_scanner.l"
+#line 1268 "Zend/zend_language_scanner.l"
 		{
 	char *filename = zend_get_compiled_filename(TSRMLS_C);
 	const size_t filename_len = strlen(filename);
@@ -4830,7 +4826,7 @@
 	zendlval->type = IS_STRING;
 	return T_DIR;
 }
-#line 4834 "Zend/zend_language_scanner.c"
+#line 4830 "Zend/zend_language_scanner.c"
 yy429:
 		YYDEBUG(429, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -4851,13 +4847,13 @@
 		}
 		YYDEBUG(434, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1252 "Zend/zend_language_scanner.l"
+#line 1250 "Zend/zend_language_scanner.l"
 		{
 	zendlval->value.lval = CG(zend_lineno);
 	zendlval->type = IS_LONG;
 	return T_LINE;
 }
-#line 4861 "Zend/zend_language_scanner.c"
+#line 4857 "Zend/zend_language_scanner.c"
 yy435:
 		YYDEBUG(435, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -4884,7 +4880,7 @@
 		}
 		YYDEBUG(442, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1231 "Zend/zend_language_scanner.l"
+#line 1229 "Zend/zend_language_scanner.l"
 		{
 	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;
@@ -4905,7 +4901,7 @@
 	zendlval->type = IS_STRING;
 	return T_METHOD_C;
 }
-#line 4909 "Zend/zend_language_scanner.c"
+#line 4905 "Zend/zend_language_scanner.c"
 yy443:
 		YYDEBUG(443, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -4943,7 +4939,7 @@
 		}
 		YYDEBUG(453, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1215 "Zend/zend_language_scanner.l"
+#line 1213 "Zend/zend_language_scanner.l"
 		{
 	char *func_name = NULL;
 
@@ -4959,7 +4955,7 @@
 	zendlval->type = IS_STRING;
 	return T_FUNC_C;
 }
-#line 4963 "Zend/zend_language_scanner.c"
+#line 4959 "Zend/zend_language_scanner.c"
 yy454:
 		YYDEBUG(454, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -4977,7 +4973,7 @@
 		}
 		YYDEBUG(458, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1258 "Zend/zend_language_scanner.l"
+#line 1256 "Zend/zend_language_scanner.l"
 		{
 	char *filename = zend_get_compiled_filename(TSRMLS_C);
 
@@ -4989,7 +4985,7 @@
 	zendlval->type = IS_STRING;
 	return T_FILE;
 }
-#line 4993 "Zend/zend_language_scanner.c"
+#line 4989 "Zend/zend_language_scanner.c"
 yy459:
 		YYDEBUG(459, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5013,7 +5009,7 @@
 		}
 		YYDEBUG(465, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1199 "Zend/zend_language_scanner.l"
+#line 1197 "Zend/zend_language_scanner.l"
 		{
 	char *class_name = NULL;
 
@@ -5029,7 +5025,7 @@
 	zendlval->type = IS_STRING;
 	return T_CLASS_C;
 }
-#line 5033 "Zend/zend_language_scanner.c"
+#line 5029 "Zend/zend_language_scanner.c"
 yy466:
 		YYDEBUG(466, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5091,11 +5087,11 @@
 		}
 		YYDEBUG(478, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 941 "Zend/zend_language_scanner.l"
+#line 939 "Zend/zend_language_scanner.l"
 		{
 	return T_HALT_COMPILER;
 }
-#line 5099 "Zend/zend_language_scanner.c"
+#line 5095 "Zend/zend_language_scanner.c"
 yy479:
 		YYDEBUG(479, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5115,11 +5111,11 @@
 		}
 		YYDEBUG(482, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 925 "Zend/zend_language_scanner.l"
+#line 923 "Zend/zend_language_scanner.l"
 		{
 	return T_USE;
 }
-#line 5123 "Zend/zend_language_scanner.c"
+#line 5119 "Zend/zend_language_scanner.c"
 yy483:
 		YYDEBUG(483, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5138,11 +5134,11 @@
 		}
 		YYDEBUG(486, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 969 "Zend/zend_language_scanner.l"
+#line 967 "Zend/zend_language_scanner.l"
 		{
 	return T_UNSET;
 }
-#line 5146 "Zend/zend_language_scanner.c"
+#line 5142 "Zend/zend_language_scanner.c"
 yy487:
 		YYDEBUG(487, *YYCURSOR);
 		++YYCURSOR;
@@ -5314,11 +5310,11 @@
 		++YYCURSOR;
 		YYDEBUG(504, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 869 "Zend/zend_language_scanner.l"
+#line 867 "Zend/zend_language_scanner.l"
 		{
 	return T_INT_CAST;
 }
-#line 5322 "Zend/zend_language_scanner.c"
+#line 5318 "Zend/zend_language_scanner.c"
 yy505:
 		YYDEBUG(505, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5362,11 +5358,11 @@
 		++YYCURSOR;
 		YYDEBUG(513, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 873 "Zend/zend_language_scanner.l"
+#line 871 "Zend/zend_language_scanner.l"
 		{
 	return T_DOUBLE_CAST;
 }
-#line 5370 "Zend/zend_language_scanner.c"
+#line 5366 "Zend/zend_language_scanner.c"
 yy514:
 		YYDEBUG(514, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5436,11 +5432,11 @@
 		++YYCURSOR;
 		YYDEBUG(527, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 877 "Zend/zend_language_scanner.l"
+#line 875 "Zend/zend_language_scanner.l"
 		{
 	return T_STRING_CAST;
 }
-#line 5444 "Zend/zend_language_scanner.c"
+#line 5440 "Zend/zend_language_scanner.c"
 yy528:
 		YYDEBUG(528, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5473,11 +5469,11 @@
 		++YYCURSOR;
 		YYDEBUG(534, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 885 "Zend/zend_language_scanner.l"
+#line 883 "Zend/zend_language_scanner.l"
 		{
 	return T_ARRAY_CAST;
 }
-#line 5481 "Zend/zend_language_scanner.c"
+#line 5477 "Zend/zend_language_scanner.c"
 yy535:
 		YYDEBUG(535, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5515,11 +5511,11 @@
 		++YYCURSOR;
 		YYDEBUG(542, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 889 "Zend/zend_language_scanner.l"
+#line 887 "Zend/zend_language_scanner.l"
 		{
 	return T_OBJECT_CAST;
 }
-#line 5523 "Zend/zend_language_scanner.c"
+#line 5519 "Zend/zend_language_scanner.c"
 yy543:
 		YYDEBUG(543, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5560,11 +5556,11 @@
 		++YYCURSOR;
 		YYDEBUG(550, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 893 "Zend/zend_language_scanner.l"
+#line 891 "Zend/zend_language_scanner.l"
 		{
 	return T_BOOL_CAST;
 }
-#line 5568 "Zend/zend_language_scanner.c"
+#line 5564 "Zend/zend_language_scanner.c"
 yy551:
 		YYDEBUG(551, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5608,11 +5604,11 @@
 		++YYCURSOR;
 		YYDEBUG(559, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 881 "Zend/zend_language_scanner.l"
+#line 879 "Zend/zend_language_scanner.l"
 		{
 	return T_STRING_CAST;
 }
-#line 5616 "Zend/zend_language_scanner.c"
+#line 5612 "Zend/zend_language_scanner.c"
 yy560:
 		YYDEBUG(560, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5645,11 +5641,11 @@
 		++YYCURSOR;
 		YYDEBUG(566, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 897 "Zend/zend_language_scanner.l"
+#line 895 "Zend/zend_language_scanner.l"
 		{
 	return T_UNSET_CAST;
 }
-#line 5653 "Zend/zend_language_scanner.c"
+#line 5649 "Zend/zend_language_scanner.c"
 yy567:
 		YYDEBUG(567, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5663,11 +5659,11 @@
 		}
 		YYDEBUG(569, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 865 "Zend/zend_language_scanner.l"
+#line 863 "Zend/zend_language_scanner.l"
 		{
 	return T_VAR;
 }
-#line 5671 "Zend/zend_language_scanner.c"
+#line 5667 "Zend/zend_language_scanner.c"
 yy570:
 		YYDEBUG(570, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5687,11 +5683,11 @@
 		}
 		YYDEBUG(573, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 857 "Zend/zend_language_scanner.l"
+#line 855 "Zend/zend_language_scanner.l"
 		{
 	return T_NEW;
 }
-#line 5695 "Zend/zend_language_scanner.c"
+#line 5691 "Zend/zend_language_scanner.c"
 yy574:
 		YYDEBUG(574, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5730,21 +5726,21 @@
 		}
 		YYDEBUG(581, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 921 "Zend/zend_language_scanner.l"
+#line 919 "Zend/zend_language_scanner.l"
 		{
 	return T_NAMESPACE;
 }
-#line 5738 "Zend/zend_language_scanner.c"
+#line 5734 "Zend/zend_language_scanner.c"
 yy582:
 		YYDEBUG(582, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(583, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 853 "Zend/zend_language_scanner.l"
+#line 851 "Zend/zend_language_scanner.l"
 		{
 	return T_PAAMAYIM_NEKUDOTAYIM;
 }
-#line 5748 "Zend/zend_language_scanner.c"
+#line 5744 "Zend/zend_language_scanner.c"
 yy584:
 		YYDEBUG(584, *YYCURSOR);
 		++YYCURSOR;
@@ -5766,32 +5762,32 @@
 		++YYCURSOR;
 		YYDEBUG(587, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1021 "Zend/zend_language_scanner.l"
+#line 1019 "Zend/zend_language_scanner.l"
 		{
 	return T_MINUS_EQUAL;
 }
-#line 5774 "Zend/zend_language_scanner.c"
+#line 5770 "Zend/zend_language_scanner.c"
 yy588:
 		YYDEBUG(588, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(589, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 989 "Zend/zend_language_scanner.l"
+#line 987 "Zend/zend_language_scanner.l"
 		{
 	return T_DEC;
 }
-#line 5784 "Zend/zend_language_scanner.c"
+#line 5780 "Zend/zend_language_scanner.c"
 yy590:
 		YYDEBUG(590, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(591, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 823 "Zend/zend_language_scanner.l"
+#line 821 "Zend/zend_language_scanner.l"
 		{
 	yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC);
 	return T_OBJECT_OPERATOR;
 }
-#line 5795 "Zend/zend_language_scanner.c"
+#line 5791 "Zend/zend_language_scanner.c"
 yy592:
 		YYDEBUG(592, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5836,11 +5832,11 @@
 		}
 		YYDEBUG(598, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 965 "Zend/zend_language_scanner.l"
+#line 963 "Zend/zend_language_scanner.l"
 		{
 	return T_PUBLIC;
 }
-#line 5844 "Zend/zend_language_scanner.c"
+#line 5840 "Zend/zend_language_scanner.c"
 yy599:
 		YYDEBUG(599, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5895,11 +5891,11 @@
 		}
 		YYDEBUG(607, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 961 "Zend/zend_language_scanner.l"
+#line 959 "Zend/zend_language_scanner.l"
 		{
 	return T_PROTECTED;
 }
-#line 5903 "Zend/zend_language_scanner.c"
+#line 5899 "Zend/zend_language_scanner.c"
 yy608:
 		YYDEBUG(608, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5929,11 +5925,11 @@
 		}
 		YYDEBUG(613, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 957 "Zend/zend_language_scanner.l"
+#line 955 "Zend/zend_language_scanner.l"
 		{
 	return T_PRIVATE;
 }
-#line 5937 "Zend/zend_language_scanner.c"
+#line 5933 "Zend/zend_language_scanner.c"
 yy614:
 		YYDEBUG(614, *YYCURSOR);
 		++YYCURSOR;
@@ -5942,11 +5938,11 @@
 		}
 		YYDEBUG(615, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 803 "Zend/zend_language_scanner.l"
+#line 801 "Zend/zend_language_scanner.l"
 		{
 	return T_PRINT;
 }
-#line 5950 "Zend/zend_language_scanner.c"
+#line 5946 "Zend/zend_language_scanner.c"
 yy616:
 		YYDEBUG(616, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5971,11 +5967,11 @@
 		}
 		YYDEBUG(620, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 795 "Zend/zend_language_scanner.l"
+#line 793 "Zend/zend_language_scanner.l"
 		{
 	return T_GOTO;
 }
-#line 5979 "Zend/zend_language_scanner.c"
+#line 5975 "Zend/zend_language_scanner.c"
 yy621:
 		YYDEBUG(621, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5999,11 +5995,11 @@
 		}
 		YYDEBUG(625, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 929 "Zend/zend_language_scanner.l"
+#line 927 "Zend/zend_language_scanner.l"
 		{
 	return T_GLOBAL;
 }
-#line 6007 "Zend/zend_language_scanner.c"
+#line 6003 "Zend/zend_language_scanner.c"
 yy626:
 		YYDEBUG(626, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6037,11 +6033,11 @@
 		}
 		YYDEBUG(632, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 787 "Zend/zend_language_scanner.l"
+#line 785 "Zend/zend_language_scanner.l"
 		{
 	return T_BREAK;
 }
-#line 6045 "Zend/zend_language_scanner.c"
+#line 6041 "Zend/zend_language_scanner.c"
 yy633:
 		YYDEBUG(633, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6081,11 +6077,11 @@
 		}
 		YYDEBUG(640, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 771 "Zend/zend_language_scanner.l"
+#line 769 "Zend/zend_language_scanner.l"
 		{
 	return T_SWITCH;
 }
-#line 6089 "Zend/zend_language_scanner.c"
+#line 6085 "Zend/zend_language_scanner.c"
 yy641:
 		YYDEBUG(641, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6109,11 +6105,11 @@
 		}
 		YYDEBUG(645, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 945 "Zend/zend_language_scanner.l"
+#line 943 "Zend/zend_language_scanner.l"
 		{
 	return T_STATIC;
 }
-#line 6117 "Zend/zend_language_scanner.c"
+#line 6113 "Zend/zend_language_scanner.c"
 yy646:
 		YYDEBUG(646, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6140,11 +6136,11 @@
 		}
 		YYDEBUG(650, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 767 "Zend/zend_language_scanner.l"
+#line 765 "Zend/zend_language_scanner.l"
 		{
 	return T_AS;
 }
-#line 6148 "Zend/zend_language_scanner.c"
+#line 6144 "Zend/zend_language_scanner.c"
 yy651:
 		YYDEBUG(651, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6163,11 +6159,11 @@
 		}
 		YYDEBUG(654, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 981 "Zend/zend_language_scanner.l"
+#line 979 "Zend/zend_language_scanner.l"
 		{
 	return T_ARRAY;
 }
-#line 6171 "Zend/zend_language_scanner.c"
+#line 6167 "Zend/zend_language_scanner.c"
 yy655:
 		YYDEBUG(655, *YYCURSOR);
 		++YYCURSOR;
@@ -6176,11 +6172,11 @@
 		}
 		YYDEBUG(656, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1073 "Zend/zend_language_scanner.l"
+#line 1071 "Zend/zend_language_scanner.l"
 		{
 	return T_LOGICAL_AND;
 }
-#line 6184 "Zend/zend_language_scanner.c"
+#line 6180 "Zend/zend_language_scanner.c"
 yy657:
 		YYDEBUG(657, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6214,11 +6210,11 @@
 		}
 		YYDEBUG(663, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 949 "Zend/zend_language_scanner.l"
+#line 947 "Zend/zend_language_scanner.l"
 		{
 	return T_ABSTRACT;
 }
-#line 6222 "Zend/zend_language_scanner.c"
+#line 6218 "Zend/zend_language_scanner.c"
 yy664:
 		YYDEBUG(664, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6242,11 +6238,11 @@
 		}
 		YYDEBUG(668, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 727 "Zend/zend_language_scanner.l"
+#line 725 "Zend/zend_language_scanner.l"
 		{
 	return T_WHILE;
 }
-#line 6250 "Zend/zend_language_scanner.c"
+#line 6246 "Zend/zend_language_scanner.c"
 yy669:
 		YYDEBUG(669, *YYCURSOR);
 		++YYCURSOR;
@@ -6255,11 +6251,11 @@
 		}
 		YYDEBUG(670, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 711 "Zend/zend_language_scanner.l"
+#line 709 "Zend/zend_language_scanner.l"
 		{
 	return T_IF;
 }
-#line 6263 "Zend/zend_language_scanner.c"
+#line 6259 "Zend/zend_language_scanner.c"
 yy671:
 		YYDEBUG(671, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6311,11 +6307,11 @@
 		}
 		YYDEBUG(677, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 933 "Zend/zend_language_scanner.l"
+#line 931 "Zend/zend_language_scanner.l"
 		{
 	return T_ISSET;
 }
-#line 6319 "Zend/zend_language_scanner.c"
+#line 6315 "Zend/zend_language_scanner.c"
 yy678:
 		YYDEBUG(678, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6369,11 +6365,11 @@
 yy685:
 		YYDEBUG(685, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 905 "Zend/zend_language_scanner.l"
+#line 903 "Zend/zend_language_scanner.l"
 		{
 	return T_INCLUDE;
 }
-#line 6377 "Zend/zend_language_scanner.c"
+#line 6373 "Zend/zend_language_scanner.c"
 yy686:
 		YYDEBUG(686, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6402,11 +6398,11 @@
 		}
 		YYDEBUG(691, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 909 "Zend/zend_language_scanner.l"
+#line 907 "Zend/zend_language_scanner.l"
 		{
 	return T_INCLUDE_ONCE;
 }
-#line 6410 "Zend/zend_language_scanner.c"
+#line 6406 "Zend/zend_language_scanner.c"
 yy692:
 		YYDEBUG(692, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6440,11 +6436,11 @@
 		}
 		YYDEBUG(698, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 811 "Zend/zend_language_scanner.l"
+#line 809 "Zend/zend_language_scanner.l"
 		{
 	return T_INTERFACE;
 }
-#line 6448 "Zend/zend_language_scanner.c"
+#line 6444 "Zend/zend_language_scanner.c"
 yy699:
 		YYDEBUG(699, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6483,11 +6479,11 @@
 		}
 		YYDEBUG(706, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 763 "Zend/zend_language_scanner.l"
+#line 761 "Zend/zend_language_scanner.l"
 		{
 	return T_INSTANCEOF;
 }
-#line 6491 "Zend/zend_language_scanner.c"
+#line 6487 "Zend/zend_language_scanner.c"
 yy707:
 		YYDEBUG(707, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6531,11 +6527,11 @@
 		}
 		YYDEBUG(715, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 819 "Zend/zend_language_scanner.l"
+#line 817 "Zend/zend_language_scanner.l"
 		{
 	return T_IMPLEMENTS;
 }
-#line 6539 "Zend/zend_language_scanner.c"
+#line 6535 "Zend/zend_language_scanner.c"
 yy716:
 		YYDEBUG(716, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6555,11 +6551,11 @@
 		}
 		YYDEBUG(719, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 699 "Zend/zend_language_scanner.l"
+#line 697 "Zend/zend_language_scanner.l"
 		{
 	return T_TRY;
 }
-#line 6563 "Zend/zend_language_scanner.c"
+#line 6559 "Zend/zend_language_scanner.c"
 yy720:
 		YYDEBUG(720, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6578,11 +6574,11 @@
 		}
 		YYDEBUG(723, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 707 "Zend/zend_language_scanner.l"
+#line 705 "Zend/zend_language_scanner.l"
 		{
 	return T_THROW;
 }
-#line 6586 "Zend/zend_language_scanner.c"
+#line 6582 "Zend/zend_language_scanner.c"
 yy724:
 		YYDEBUG(724, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6643,11 +6639,11 @@
 yy731:
 		YYDEBUG(731, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 913 "Zend/zend_language_scanner.l"
+#line 911 "Zend/zend_language_scanner.l"
 		{
 	return T_REQUIRE;
 }
-#line 6651 "Zend/zend_language_scanner.c"
+#line 6647 "Zend/zend_language_scanner.c"
 yy732:
 		YYDEBUG(732, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6676,11 +6672,11 @@
 		}
 		YYDEBUG(737, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 917 "Zend/zend_language_scanner.l"
+#line 915 "Zend/zend_language_scanner.l"
 		{
 	return T_REQUIRE_ONCE;
 }
-#line 6684 "Zend/zend_language_scanner.c"
+#line 6680 "Zend/zend_language_scanner.c"
 yy738:
 		YYDEBUG(738, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6699,11 +6695,11 @@
 		}
 		YYDEBUG(741, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 695 "Zend/zend_language_scanner.l"
+#line 693 "Zend/zend_language_scanner.l"
 		{
 	return T_RETURN;
 }
-#line 6707 "Zend/zend_language_scanner.c"
+#line 6703 "Zend/zend_language_scanner.c"
 yy742:
 		YYDEBUG(742, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6784,11 +6780,11 @@
 		}
 		YYDEBUG(752, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 791 "Zend/zend_language_scanner.l"
+#line 789 "Zend/zend_language_scanner.l"
 		{
 	return T_CONTINUE;
 }
-#line 6792 "Zend/zend_language_scanner.c"
+#line 6788 "Zend/zend_language_scanner.c"
 yy753:
 		YYDEBUG(753, *YYCURSOR);
 		++YYCURSOR;
@@ -6797,11 +6793,11 @@
 		}
 		YYDEBUG(754, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 691 "Zend/zend_language_scanner.l"
+#line 689 "Zend/zend_language_scanner.l"
 		{
 	return T_CONST;
 }
-#line 6805 "Zend/zend_language_scanner.c"
+#line 6801 "Zend/zend_language_scanner.c"
 yy755:
 		YYDEBUG(755, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6826,11 +6822,11 @@
 		}
 		YYDEBUG(759, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 861 "Zend/zend_language_scanner.l"
+#line 859 "Zend/zend_language_scanner.l"
 		{
 	return T_CLONE;
 }
-#line 6834 "Zend/zend_language_scanner.c"
+#line 6830 "Zend/zend_language_scanner.c"
 yy760:
 		YYDEBUG(760, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6844,11 +6840,11 @@
 		}
 		YYDEBUG(762, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 807 "Zend/zend_language_scanner.l"
+#line 805 "Zend/zend_language_scanner.l"
 		{
 	return T_CLASS;
 }
-#line 6852 "Zend/zend_language_scanner.c"
+#line 6848 "Zend/zend_language_scanner.c"
 yy763:
 		YYDEBUG(763, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6868,11 +6864,11 @@
 		}
 		YYDEBUG(766, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 779 "Zend/zend_language_scanner.l"
+#line 777 "Zend/zend_language_scanner.l"
 		{
 	return T_CASE;
 }
-#line 6876 "Zend/zend_language_scanner.c"
+#line 6872 "Zend/zend_language_scanner.c"
 yy767:
 		YYDEBUG(767, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6886,11 +6882,11 @@
 		}
 		YYDEBUG(769, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 703 "Zend/zend_language_scanner.l"
+#line 701 "Zend/zend_language_scanner.l"
 		{
 	return T_CATCH;
 }
-#line 6894 "Zend/zend_language_scanner.c"
+#line 6890 "Zend/zend_language_scanner.c"
 yy770:
 		YYDEBUG(770, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6941,11 +6937,11 @@
 		}
 		YYDEBUG(779, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 687 "Zend/zend_language_scanner.l"
+#line 685 "Zend/zend_language_scanner.l"
 		{
 	return T_FUNCTION;
 }
-#line 6949 "Zend/zend_language_scanner.c"
+#line 6945 "Zend/zend_language_scanner.c"
 yy780:
 		YYDEBUG(780, *YYCURSOR);
 		++YYCURSOR;
@@ -6969,11 +6965,11 @@
 yy781:
 		YYDEBUG(781, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 739 "Zend/zend_language_scanner.l"
+#line 737 "Zend/zend_language_scanner.l"
 		{
 	return T_FOR;
 }
-#line 6977 "Zend/zend_language_scanner.c"
+#line 6973 "Zend/zend_language_scanner.c"
 yy782:
 		YYDEBUG(782, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6997,11 +6993,11 @@
 		}
 		YYDEBUG(786, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 747 "Zend/zend_language_scanner.l"
+#line 745 "Zend/zend_language_scanner.l"
 		{
 	return T_FOREACH;
 }
-#line 7005 "Zend/zend_language_scanner.c"
+#line 7001 "Zend/zend_language_scanner.c"
 yy787:
 		YYDEBUG(787, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -7020,11 +7016,11 @@
 		}
 		YYDEBUG(790, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 953 "Zend/zend_language_scanner.l"
+#line 951 "Zend/zend_language_scanner.l"
 		{
 	return T_FINAL;
 }
-#line 7028 "Zend/zend_language_scanner.c"
+#line 7024 "Zend/zend_language_scanner.c"
 yy791:
 		YYDEBUG(791, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -7055,11 +7051,11 @@
 		}
 		YYDEBUG(794, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 735 "Zend/zend_language_scanner.l"
+#line 733 "Zend/zend_language_scanner.l"
 		{
 	return T_DO;
 }
-#line 7063 "Zend/zend_language_scanner.c"
+#line 7059 "Zend/zend_language_scanner.c"
 yy795:
 		YYDEBUG(795, *YYCURSOR);
 		++YYCURSOR;
@@ -7068,11 +7064,11 @@
 		}
 		YYDEBUG(796, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 683 "Zend/zend_language_scanner.l"
+#line 681 "Zend/zend_language_scanner.l"
 		{
 	return T_EXIT;
 }
-#line 7076 "Zend/zend_language_scanner.c"
+#line 7072 "Zend/zend_language_scanner.c"
 yy797:
 		YYDEBUG(797, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -7107,11 +7103,11 @@
 		}
 		YYDEBUG(803, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 783 "Zend/zend_language_scanner.l"
+#line 781 "Zend/zend_language_scanner.l"
 		{
 	return T_DEFAULT;
 }
-#line 7115 "Zend/zend_language_scanner.c"
+#line 7111 "Zend/zend_language_scanner.c"
 yy804:
 		YYDEBUG(804, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -7135,11 +7131,11 @@
 		}
 		YYDEBUG(808, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 755 "Zend/zend_language_scanner.l"
+#line 753 "Zend/zend_language_scanner.l"
 		{
 	return T_DECLARE;
 }
-#line 7143 "Zend/zend_language_scanner.c"
+#line 7139 "Zend/zend_language_scanner.c"
 yy809:
 		YYDEBUG(809, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -7219,11 +7215,11 @@
 		}
 		YYDEBUG(821, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 815 "Zend/zend_language_scanner.l"
+#line 813 "Zend/zend_language_scanner.l"
 		{
 	return T_EXTENDS;
 }
-#line 7227 "Zend/zend_language_scanner.c"
+#line 7223 "Zend/zend_language_scanner.c"
 yy822:
 		YYDEBUG(822, *YYCURSOR);
 		++YYCURSOR;
@@ -7232,11 +7228,11 @@
 		}
 		YYDEBUG(823, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 679 "Zend/zend_language_scanner.l"
+#line 677 "Zend/zend_language_scanner.l"
 		{
 	return T_EXIT;
 }
-#line 7240 "Zend/zend_language_scanner.c"
+#line 7236 "Zend/zend_language_scanner.c"
 yy824:
 		YYDEBUG(824, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -7250,11 +7246,11 @@
 		}
 		YYDEBUG(826, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 901 "Zend/zend_language_scanner.l"
+#line 899 "Zend/zend_language_scanner.l"
 		{
 	return T_EVAL;
 }
-#line 7258 "Zend/zend_language_scanner.c"
+#line 7254 "Zend/zend_language_scanner.c"
 yy827:
 		YYDEBUG(827, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -7324,11 +7320,11 @@
 		}
 		YYDEBUG(837, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 731 "Zend/zend_language_scanner.l"
+#line 729 "Zend/zend_language_scanner.l"
 		{
 	return T_ENDWHILE;
 }
-#line 7332 "Zend/zend_language_scanner.c"
+#line 7328 "Zend/zend_language_scanner.c"
 yy838:
 		YYDEBUG(838, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -7357,11 +7353,11 @@
 		}
 		YYDEBUG(843, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 775 "Zend/zend_language_scanner.l"
+#line 773 "Zend/zend_language_scanner.l"
 		{
 	return T_ENDSWITCH;
 }
-#line 7365 "Zend/zend_language_scanner.c"
+#line 7361 "Zend/zend_language_scanner.c"
 yy844:
 		YYDEBUG(844, *YYCURSOR);
 		++YYCURSOR;
@@ -7370,11 +7366,11 @@
 		}
 		YYDEBUG(845, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 719 "Zend/zend_language_scanner.l"
+#line 717 "Zend/zend_language_scanner.l"
 		{
 	return T_ENDIF;
 }
-#line 7378 "Zend/zend_language_scanner.c"
+#line 7374 "Zend/zend_language_scanner.c"
 yy846:
 		YYDEBUG(846, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -7403,11 +7399,11 @@
 yy848:
 		YYDEBUG(848, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 743 "Zend/zend_language_scanner.l"
+#line 741 "Zend/zend_language_scanner.l"
 		{
 	return T_ENDFOR;
 }
-#line 7411 "Zend/zend_language_scanner.c"
+#line 7407 "Zend/zend_language_scanner.c"
 yy849:
 		YYDEBUG(849, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -7431,11 +7427,11 @@
 		}
 		YYDEBUG(853, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 751 "Zend/zend_language_scanner.l"
+#line 749 "Zend/zend_language_scanner.l"
 		{
 	return T_ENDFOREACH;
 }
-#line 7439 "Zend/zend_language_scanner.c"
+#line 7435 "Zend/zend_language_scanner.c"
 yy854:
 		YYDEBUG(854, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -7469,11 +7465,11 @@
 		}
 		YYDEBUG(860, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 759 "Zend/zend_language_scanner.l"
+#line 757 "Zend/zend_language_scanner.l"
 		{
 	return T_ENDDECLARE;
 }
-#line 7477 "Zend/zend_language_scanner.c"
+#line 7473 "Zend/zend_language_scanner.c"
 yy861:
 		YYDEBUG(861, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -7492,11 +7488,11 @@
 		}
 		YYDEBUG(864, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 937 "Zend/zend_language_scanner.l"
+#line 935 "Zend/zend_language_scanner.l"
 		{
 	return T_EMPTY;
 }
-#line 7500 "Zend/zend_language_scanner.c"
+#line 7496 "Zend/zend_language_scanner.c"
 yy865:
 		YYDEBUG(865, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -7525,11 +7521,11 @@
 yy867:
 		YYDEBUG(867, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 723 "Zend/zend_language_scanner.l"
+#line 721 "Zend/zend_language_scanner.l"
 		{
 	return T_ELSE;
 }
-#line 7533 "Zend/zend_language_scanner.c"
+#line 7529 "Zend/zend_language_scanner.c"
 yy868:
 		YYDEBUG(868, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -7543,11 +7539,11 @@
 		}
 		YYDEBUG(870, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 715 "Zend/zend_language_scanner.l"
+#line 713 "Zend/zend_language_scanner.l"
 		{
 	return T_ELSEIF;
 }
-#line 7551 "Zend/zend_language_scanner.c"
+#line 7547 "Zend/zend_language_scanner.c"
 yy871:
 		YYDEBUG(871, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -7561,11 +7557,11 @@
 		}
 		YYDEBUG(873, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 799 "Zend/zend_language_scanner.l"
+#line 797 "Zend/zend_language_scanner.l"
 		{
 	return T_ECHO;
 }
-#line 7569 "Zend/zend_language_scanner.c"
+#line 7565 "Zend/zend_language_scanner.c"
 	}
 /* *********************************** */
 yyc_ST_LOOKING_FOR_PROPERTY:
@@ -7638,7 +7634,7 @@
 yy877:
 		YYDEBUG(877, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 828 "Zend/zend_language_scanner.l"
+#line 826 "Zend/zend_language_scanner.l"
 		{
 	zendlval->value.str.val = yytext; /* no copying - intentional */
 	zendlval->value.str.len = yyleng;
@@ -7646,7 +7642,7 @@
 	HANDLE_NEWLINES(yytext, yyleng);
 	return T_WHITESPACE;
 }
-#line 7650 "Zend/zend_language_scanner.c"
+#line 7646 "Zend/zend_language_scanner.c"
 yy878:
 		YYDEBUG(878, *YYCURSOR);
 		++YYCURSOR;
@@ -7654,13 +7650,13 @@
 yy879:
 		YYDEBUG(879, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 847 "Zend/zend_language_scanner.l"
+#line 845 "Zend/zend_language_scanner.l"
 		{
 	yyless(0);
 	yy_pop_state(TSRMLS_C);
 	goto restart;
 }
-#line 7664 "Zend/zend_language_scanner.c"
+#line 7660 "Zend/zend_language_scanner.c"
 yy880:
 		YYDEBUG(880, *YYCURSOR);
 		++YYCURSOR;
@@ -7669,14 +7665,14 @@
 yy881:
 		YYDEBUG(881, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 840 "Zend/zend_language_scanner.l"
+#line 838 "Zend/zend_language_scanner.l"
 		{
 	yy_pop_state(TSRMLS_C);
 	zend_copy_value(zendlval, yytext, yyleng);
 	zendlval->type = IS_STRING;
 	return T_STRING;
 }
-#line 7680 "Zend/zend_language_scanner.c"
+#line 7676 "Zend/zend_language_scanner.c"
 yy882:
 		YYDEBUG(882, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -7697,11 +7693,11 @@
 		++YYCURSOR;
 		YYDEBUG(886, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 836 "Zend/zend_language_scanner.l"
+#line 834 "Zend/zend_language_scanner.l"
 		{
 	return T_OBJECT_OPERATOR;
 }
-#line 7705 "Zend/zend_language_scanner.c"
+#line 7701 "Zend/zend_language_scanner.c"
 yy887:
 		YYDEBUG(887, *YYCURSOR);
 		++YYCURSOR;
@@ -7771,7 +7767,7 @@
 yy892:
 		YYDEBUG(892, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1115 "Zend/zend_language_scanner.l"
+#line 1113 "Zend/zend_language_scanner.l"
 		{
 	zend_copy_value(zendlval, yytext, yyleng);
 	zendlval->type = IS_STRING;
@@ -7779,20 +7775,20 @@
 	yy_push_state(ST_IN_SCRIPTING TSRMLS_CC);
 	return T_STRING_VARNAME;
 }
-#line 7783 "Zend/zend_language_scanner.c"
+#line 7779 "Zend/zend_language_scanner.c"
 yy893:
 		YYDEBUG(893, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(894, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1124 "Zend/zend_language_scanner.l"
+#line 1122 "Zend/zend_language_scanner.l"
 		{
 	yyless(0);
 	yy_pop_state(TSRMLS_C);
 	yy_push_state(ST_IN_SCRIPTING TSRMLS_CC);
 	goto restart;
 }
-#line 7796 "Zend/zend_language_scanner.c"
+#line 7792 "Zend/zend_language_scanner.c"
 yy895:
 		YYDEBUG(895, *YYCURSOR);
 		++YYCURSOR;
@@ -8254,7 +8250,7 @@
 		++YYCURSOR;
 		YYDEBUG(933, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1864 "Zend/zend_language_scanner.l"
+#line 1860 "Zend/zend_language_scanner.l"
 		{
 	char *end = yytext + yyleng - 1;
 
@@ -8297,7 +8293,7 @@
 		yymore();
 	}
 }
-#line 8301 "Zend/zend_language_scanner.c"
+#line 8297 "Zend/zend_language_scanner.c"
 	}
 /* *********************************** */
 yyc_ST_ONE_LINE_COMMENT:
@@ -8354,11 +8350,11 @@
 yy937:
 		YYDEBUG(937, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1489 "Zend/zend_language_scanner.l"
+#line 1487 "Zend/zend_language_scanner.l"
 		{
 	yymore();
 }
-#line 8362 "Zend/zend_language_scanner.c"
+#line 8358 "Zend/zend_language_scanner.c"
 yy938:
 		YYDEBUG(938, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -8381,7 +8377,7 @@
 yy942:
 		YYDEBUG(942, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1493 "Zend/zend_language_scanner.l"
+#line 1491 "Zend/zend_language_scanner.l"
 		{
 	switch (yytext[yyleng-1]) {
 		case '?': case '%': case '>':
@@ -8399,7 +8395,7 @@
 			return T_COMMENT;
 	}
 }
-#line 8403 "Zend/zend_language_scanner.c"
+#line 8399 "Zend/zend_language_scanner.c"
 yy943:
 		YYDEBUG(943, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -8412,7 +8408,7 @@
 		++YYCURSOR;
 		YYDEBUG(946, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1511 "Zend/zend_language_scanner.l"
+#line 1509 "Zend/zend_language_scanner.l"
 		{
 	zendlval->value.str.val = yytext; /* no copying - intentional */
 	zendlval->value.str.len = yyleng;
@@ -8421,7 +8417,7 @@
 	CG(zend_lineno)++;
 	return T_COMMENT;
 }
-#line 8425 "Zend/zend_language_scanner.c"
+#line 8421 "Zend/zend_language_scanner.c"
 yy947:
 		YYDEBUG(947, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -8431,7 +8427,7 @@
 		++YYCURSOR;
 		YYDEBUG(949, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1520 "Zend/zend_language_scanner.l"
+#line 1518 "Zend/zend_language_scanner.l"
 		{
     if (CG(asp_tags) || yytext[yyleng-2] != '%') { /* asp comment? */
 		zendlval->value.str.val = yytext; /* no copying - intentional */
@@ -8444,7 +8440,7 @@
 		yymore();
 	}
 }
-#line 8448 "Zend/zend_language_scanner.c"
+#line 8444 "Zend/zend_language_scanner.c"
 	}
 /* *********************************** */
 yyc_ST_START_HEREDOC:
@@ -8501,13 +8497,13 @@
 yy953:
 		YYDEBUG(953, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1678 "Zend/zend_language_scanner.l"
+#line 1674 "Zend/zend_language_scanner.l"
 		{
 	yyless(0);
 	BEGIN(ST_HEREDOC);
 	goto restart;
 }
-#line 8511 "Zend/zend_language_scanner.c"
+#line 8507 "Zend/zend_language_scanner.c"
 yy954:
 		YYDEBUG(954, *YYCURSOR);
 		yyaccept = 0;
@@ -8552,7 +8548,7 @@
 		++YYCURSOR;
 		YYDEBUG(960, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1684 "Zend/zend_language_scanner.l"
+#line 1680 "Zend/zend_language_scanner.l"
 		{
 	int label_len = yyleng - 1;
 
@@ -8574,7 +8570,7 @@
 		yymore();
 	}
 }
-#line 8578 "Zend/zend_language_scanner.c"
+#line 8574 "Zend/zend_language_scanner.c"
 	}
 /* *********************************** */
 yyc_ST_START_NOWDOC:
@@ -8631,13 +8627,13 @@
 yy964:
 		YYDEBUG(964, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1838 "Zend/zend_language_scanner.l"
+#line 1834 "Zend/zend_language_scanner.l"
 		{
 	yyless(0);
 	BEGIN(ST_NOWDOC);
 	goto restart;
 }
-#line 8641 "Zend/zend_language_scanner.c"
+#line 8637 "Zend/zend_language_scanner.c"
 yy965:
 		YYDEBUG(965, *YYCURSOR);
 		yyaccept = 0;
@@ -8682,7 +8678,7 @@
 		++YYCURSOR;
 		YYDEBUG(971, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1844 "Zend/zend_language_scanner.l"
+#line 1840 "Zend/zend_language_scanner.l"
 		{
 	int label_len = yyleng - 1;
 
@@ -8702,7 +8698,7 @@
 		yymore();
 	}
 }
-#line 8706 "Zend/zend_language_scanner.c"
+#line 8702 "Zend/zend_language_scanner.c"
 	}
 /* *********************************** */
 yyc_ST_VAR_OFFSET:
@@ -8803,7 +8799,7 @@
 yy975:
 		YYDEBUG(975, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1174 "Zend/zend_language_scanner.l"
+#line 1172 "Zend/zend_language_scanner.l"
 		{ /* Offset could be treated as a long */
 	if (yyleng < MAX_LENGTH_OF_LONG - 1 || (yyleng == MAX_LENGTH_OF_LONG - 1 && strcmp(yytext, long_min_digits) < 0)) {
 		zendlval->value.lval = strtol(yytext, NULL, 10);
@@ -8815,7 +8811,7 @@
 	}
 	return T_NUM_STRING;
 }
-#line 8819 "Zend/zend_language_scanner.c"
+#line 8815 "Zend/zend_language_scanner.c"
 yy976:
 		YYDEBUG(976, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -8835,23 +8831,23 @@
 yy978:
 		YYDEBUG(978, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1464 "Zend/zend_language_scanner.l"
+#line 1462 "Zend/zend_language_scanner.l"
 		{
 	/* Only '[' can be valid, but returning other tokens will allow a more explicit parse error */
 	return yytext[0];
 }
-#line 8844 "Zend/zend_language_scanner.c"
+#line 8840 "Zend/zend_language_scanner.c"
 yy979:
 		YYDEBUG(979, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(980, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1459 "Zend/zend_language_scanner.l"
+#line 1457 "Zend/zend_language_scanner.l"
 		{
 	yy_pop_state(TSRMLS_C);
 	return ']';
 }
-#line 8855 "Zend/zend_language_scanner.c"
+#line 8851 "Zend/zend_language_scanner.c"
 yy981:
 		YYDEBUG(981, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -8861,7 +8857,7 @@
 		++YYCURSOR;
 		YYDEBUG(983, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1469 "Zend/zend_language_scanner.l"
+#line 1467 "Zend/zend_language_scanner.l"
 		{
 	/* Invalid rule to return a more explicit parse error with proper line number */
 	yyless(0);
@@ -8869,7 +8865,7 @@
 	ZVAL_EMPTY_STRING(zendlval); /* Empty since it won't be used */
 	return T_ENCAPSED_AND_WHITESPACE;
 }
-#line 8873 "Zend/zend_language_scanner.c"
+#line 8869 "Zend/zend_language_scanner.c"
 yy984:
 		YYDEBUG(984, *YYCURSOR);
 		++YYCURSOR;
@@ -8878,24 +8874,24 @@
 yy985:
 		YYDEBUG(985, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1477 "Zend/zend_language_scanner.l"
+#line 1475 "Zend/zend_language_scanner.l"
 		{
 	zend_copy_value(zendlval, yytext, yyleng);
 	zendlval->type = IS_STRING;
 	return T_STRING;
 }
-#line 8888 "Zend/zend_language_scanner.c"
+#line 8884 "Zend/zend_language_scanner.c"
 yy986:
 		YYDEBUG(986, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(987, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1930 "Zend/zend_language_scanner.l"
+#line 1926 "Zend/zend_language_scanner.l"
 		{
 	zend_error(E_COMPILE_WARNING,"Unexpected character in input:  '%c' (ASCII=%d) state=%d", yytext[0], yytext[0], YYSTATE);
 	goto restart;
 }
-#line 8899 "Zend/zend_language_scanner.c"
+#line 8895 "Zend/zend_language_scanner.c"
 yy988:
 		YYDEBUG(988, *YYCURSOR);
 		++YYCURSOR;
@@ -8931,13 +8927,13 @@
 yy992:
 		YYDEBUG(992, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1453 "Zend/zend_language_scanner.l"
+#line 1451 "Zend/zend_language_scanner.l"
 		{
 	zend_copy_value(zendlval, (yytext+1), (yyleng-1));
 	zendlval->type = IS_STRING;
 	return T_VARIABLE;
 }
-#line 8941 "Zend/zend_language_scanner.c"
+#line 8937 "Zend/zend_language_scanner.c"
 yy993:
 		YYDEBUG(993, *YYCURSOR);
 		++YYCURSOR;
@@ -8969,14 +8965,14 @@
 yy999:
 		YYDEBUG(999, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1186 "Zend/zend_language_scanner.l"
+#line 1184 "Zend/zend_language_scanner.l"
 		{ /* Offset must be treated as a string */
 	zendlval->value.str.val = (char *)estrndup(yytext, yyleng);
 	zendlval->value.str.len = yyleng;
 	zendlval->type = IS_STRING;
 	return T_NUM_STRING;
 }
-#line 8980 "Zend/zend_language_scanner.c"
+#line 8976 "Zend/zend_language_scanner.c"
 yy1000:
 		YYDEBUG(1000, *YYCURSOR);
 		++YYCURSOR;
@@ -8989,6 +8985,6 @@
 		goto yy999;
 	}
 }
-#line 1935 "Zend/zend_language_scanner.l"
+#line 1931 "Zend/zend_language_scanner.l"
 
 }
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_language_scanner.l?r1=1.131.2.11.2.13.2.15&r2=1.131.2.11.2.13.2.16&diff_format=u
Index: ZendEngine2/zend_language_scanner.l
diff -u ZendEngine2/zend_language_scanner.l:1.131.2.11.2.13.2.15 ZendEngine2/zend_language_scanner.l:1.131.2.11.2.13.2.16
--- ZendEngine2/zend_language_scanner.l:1.131.2.11.2.13.2.15	Thu Apr 10 19:19:04 2008
+++ ZendEngine2/zend_language_scanner.l	Fri May  9 10:27:51 2008
@@ -21,7 +21,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_language_scanner.l,v 1.131.2.11.2.13.2.15 2008/04/10 19:19:04 nlopess Exp $ */
+/* $Id: zend_language_scanner.l,v 1.131.2.11.2.13.2.16 2008/05/09 10:27:51 mattwil Exp $ */
 
 #if 0
 # define YYDEBUG(s, c) printf("state: %d char: %c\n", s, c)
@@ -498,9 +498,7 @@
 	while (s<end) {
 		if (*s=='\\') {
 			s++;
-			if (s>=end) {
-				continue;
-			}
+
 			switch(*s) {
 				case 'n':
 					*t++ = '\n';
@@ -1612,9 +1610,7 @@
 	while (s<end) {
 		if (*s=='\\') {
 			s++;
-			if (s>=end) {
-				continue;
-			}
+
 			switch(*s) {
 				case '\\':
 				case '\'':
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.