]> granicus.if.org Git - php/commitdiff
MFB: Fixes to heredoc and cleanup of new re2c scanner. (Patch by Matt Wilmas)
authorScott MacVicar <scottmac@php.net>
Wed, 9 Apr 2008 21:07:45 +0000 (21:07 +0000)
committerScott MacVicar <scottmac@php.net>
Wed, 9 Apr 2008 21:07:45 +0000 (21:07 +0000)
Zend/zend_globals.h
Zend/zend_language_scanner.c
Zend/zend_language_scanner.l

index 7f6ad15d92d2a595468af1f857e835283c903962..388cafb19ac8041033d055427924e136b75df940 100644 (file)
@@ -85,7 +85,7 @@ struct _zend_compiler_globals {
        char *compiled_filename;
 
        int zend_lineno;
-       int comment_start_line;
+
        char *heredoc;
        int heredoc_len;
 
index 3d08a19e0bb02257bb29bb2b9c612f2aa71070c8..68e8d84062621835e0982058ca1b45f0afd7fe52 100644 (file)
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.4 on Sat Apr  5 19:52:56 2008 */
+/* Generated by re2c 0.13.5.dev on Wed Apr  9 22:05:25 2008 */
 #line 1 "Zend/zend_language_scanner.l"
 /*
    +----------------------------------------------------------------------+
@@ -1333,7 +1333,7 @@ yymore_restart:
        if (YYCURSOR >= YYLIMIT) {
                /* special case */
                if (YYSTATE == STATE(ST_COMMENT) || YYSTATE == STATE(ST_DOC_COMMENT)) {
-                       zend_error(E_COMPILE_WARNING,"Unterminated comment starting line %d", CG(comment_start_line));
+                       zend_error(E_COMPILE_WARNING, "Unterminated comment starting line %d", CG(zend_lineno));
                }
                return 0;
        }
@@ -1463,7 +1463,7 @@ yyc_INITIAL:
 yy3:
                YYDEBUG(3, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2164 "Zend/zend_language_scanner.l"
+#line 2166 "Zend/zend_language_scanner.l"
                {
 
        while (1) {
@@ -1521,7 +1521,7 @@ yy8:
 yy9:
                YYDEBUG(9, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2155 "Zend/zend_language_scanner.l"
+#line 2157 "Zend/zend_language_scanner.l"
                {
        if ((YYCTYPE*)yytext == SCNG(yy_start)) {
                /* ignore first line when it's started with a # */
@@ -1556,7 +1556,7 @@ yy12:
 yy13:
                YYDEBUG(13, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2139 "Zend/zend_language_scanner.l"
+#line 2141 "Zend/zend_language_scanner.l"
                {
        HANDLE_NEWLINES(yytext, yyleng);
        if (CG(short_tags)) {
@@ -1579,7 +1579,7 @@ yy14:
                if ((yych = *YYCURSOR) == '=') goto yy50;
                YYDEBUG(15, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2113 "Zend/zend_language_scanner.l"
+#line 2115 "Zend/zend_language_scanner.l"
                {
        if (CG(asp_tags)) {
                Z_STRVAL_P(zendlval) = yytext; /* no copying - intentional */
@@ -1784,7 +1784,7 @@ yy42:
                ++YYCURSOR;
                YYDEBUG(45, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2072 "Zend/zend_language_scanner.l"
+#line 2074 "Zend/zend_language_scanner.l"
                {
        HANDLE_NEWLINES(yytext, yyleng);
        Z_STRVAL_P(zendlval) = yytext; /* no copying - intentional */
@@ -1820,7 +1820,7 @@ yy50:
                ++YYCURSOR;
                YYDEBUG(51, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2081 "Zend/zend_language_scanner.l"
+#line 2083 "Zend/zend_language_scanner.l"
                {
        if (CG(asp_tags)) {
                Z_STRVAL_P(zendlval) = yytext; /* no copying - intentional */
@@ -1841,7 +1841,7 @@ yy52:
                ++YYCURSOR;
                YYDEBUG(53, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2097 "Zend/zend_language_scanner.l"
+#line 2099 "Zend/zend_language_scanner.l"
                {
        if (CG(short_tags)) {
                Z_STRVAL_P(zendlval) = yytext; /* no copying - intentional */
@@ -1883,7 +1883,7 @@ yy57:
 yy58:
                YYDEBUG(58, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2129 "Zend/zend_language_scanner.l"
+#line 2131 "Zend/zend_language_scanner.l"
                {
        Z_STRVAL_P(zendlval) = yytext; /* no copying - intentional */
        Z_STRLEN_P(zendlval) = yyleng;
@@ -1940,63 +1940,74 @@ yyc_ST_BACKQUOTE:
                YYFILL(2);
                yych = *YYCURSOR;
                if (yybm[0+yych] & 16) {
-                       goto yy64;
+                       goto yy65;
                }
                if (yych <= '[') goto yy62;
-               if (yych <= '\\') goto yy67;
-               if (yych <= 'z') goto yy68;
+               if (yych <= '\\') goto yy68;
+               if (yych <= 'z') goto yy69;
                goto yy63;
 yy62:
                YYDEBUG(62, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yybm[0+yych] & 32) {
-                       goto yy74;
+                       goto yy75;
                }
                if (yych <= '^') {
                        if (yych <= 'Z') {
-                               if (yych <= '@') goto yy64;
-                               goto yy82;
+                               if (yych <= '@') goto yy65;
+                               goto yy81;
                        } else {
-                               if (yych == '\\') goto yy73;
-                               goto yy64;
+                               if (yych == '\\') goto yy74;
+                               goto yy65;
                        }
                } else {
                        if (yych <= 'z') {
-                               if (yych == '`') goto yy77;
-                               goto yy82;
+                               if (yych == '`') goto yy78;
+                               goto yy81;
                        } else {
-                               if (yych <= '{') goto yy85;
-                               if (yych <= '~') goto yy64;
-                               goto yy82;
+                               if (yych <= '{') goto yy84;
+                               if (yych <= '~') goto yy65;
+                               goto yy81;
                        }
                }
 yy63:
                YYDEBUG(63, *YYCURSOR);
-               yych = *++YYCURSOR;
+               yyaccept = 0;
+               yych = *(YYMARKER = ++YYCURSOR);
                if (yybm[0+yych] & 64) {
-                       goto yy78;
+                       goto yy79;
                }
-               if (yych == '$') goto yy80;
-               if (yych == '`') goto yy77;
-               goto yy65;
+               if (yych == '$') goto yy64;
+               if (yych == '`') goto yy78;
+               goto yy66;
 yy64:
                YYDEBUG(64, *YYCURSOR);
-               yyaccept = 0;
+               yyleng = YYCURSOR - SCNG(yy_text);
+#line 2573 "Zend/zend_language_scanner.l"
+               {
+       Z_LVAL_P(zendlval) = (long) '{';
+       yy_push_state(ST_IN_SCRIPTING TSRMLS_CC);
+       return T_CURLY_OPEN;
+}
+#line 1993 "Zend/zend_language_scanner.c"
+yy65:
+               YYDEBUG(65, *YYCURSOR);
+               yyaccept = 1;
                YYMARKER = ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-yy65:
-               YYDEBUG(65, *YYCURSOR);
-               if (yybm[0+yych] & 16) {
-                       goto yy64;
-               }
-               if (yych <= '[') goto yy72;
-               if (yych <= '\\') goto yy67;
-               if (yych >= '{') goto yy70;
 yy66:
                YYDEBUG(66, *YYCURSOR);
+               if (yybm[0+yych] & 16) {
+                       goto yy65;
+               }
+               if (yych <= '[') goto yy73;
+               if (yych <= '\\') goto yy68;
+               if (yych >= '{') goto yy71;
+yy67:
+               YYDEBUG(67, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2598 "Zend/zend_language_scanner.l"
+#line 2608 "Zend/zend_language_scanner.l"
                {
        if (CG(literal_type) == IS_UNICODE) {
                return zend_scan_unicode_escape_string(zendlval, yytext, yyleng, 0x60 /*'`'*/, T_ENCAPSED_AND_WHITESPACE TSRMLS_CC);
@@ -2005,110 +2016,115 @@ yy66:
                return T_ENCAPSED_AND_WHITESPACE;
        }
 }
-#line 2009 "Zend/zend_language_scanner.c"
-yy67:
-               YYDEBUG(67, *YYCURSOR);
-               ++YYCURSOR;
-               YYFILL(1);
-               yych = *YYCURSOR;
-               goto yy64;
+#line 2020 "Zend/zend_language_scanner.c"
 yy68:
                YYDEBUG(68, *YYCURSOR);
                ++YYCURSOR;
+               YYFILL(1);
+               yych = *YYCURSOR;
+               goto yy65;
+yy69:
                YYDEBUG(69, *YYCURSOR);
+               ++YYCURSOR;
+               YYDEBUG(70, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2755 "Zend/zend_language_scanner.l"
+#line 2771 "Zend/zend_language_scanner.l"
                {
        BEGIN(ST_IN_SCRIPTING);
        return '`';
 }
-#line 2026 "Zend/zend_language_scanner.c"
-yy70:
-               YYDEBUG(70, *YYCURSOR);
+#line 2037 "Zend/zend_language_scanner.c"
+yy71:
+               YYDEBUG(71, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
                if (yybm[0+yych] & 16) {
-                       goto yy64;
+                       goto yy65;
                }
-               if (yych <= '[') goto yy71;
-               if (yych <= '\\') goto yy67;
-               if (yych <= 'z') goto yy77;
-               goto yy78;
-yy71:
-               YYDEBUG(71, *YYCURSOR);
+               if (yych <= '[') goto yy72;
+               if (yych <= '\\') goto yy68;
+               if (yych <= 'z') goto yy78;
+               goto yy79;
+yy72:
+               YYDEBUG(72, *YYCURSOR);
                YYCURSOR = YYMARKER;
                if (yyaccept <= 1) {
                        if (yyaccept <= 0) {
-                               goto yy66;
+                               goto yy64;
                        } else {
-                               goto yy76;
+                               goto yy67;
                        }
                } else {
-                       goto yy84;
+                       if (yyaccept <= 2) {
+                               goto yy77;
+                       } else {
+                               goto yy83;
+                       }
                }
-yy72:
-               YYDEBUG(72, *YYCURSOR);
+yy73:
+               YYDEBUG(73, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
                if (yybm[0+yych] & 32) {
-                       goto yy74;
+                       goto yy75;
                }
                if (yych <= '^') {
                        if (yych <= 'Z') {
-                               if (yych <= '@') goto yy64;
-                               goto yy71;
+                               if (yych <= '@') goto yy65;
+                               goto yy72;
                        } else {
-                               if (yych != '\\') goto yy64;
+                               if (yych != '\\') goto yy65;
                        }
                } else {
                        if (yych <= '`') {
-                               if (yych <= '_') goto yy71;
-                               goto yy77;
+                               if (yych <= '_') goto yy72;
+                               goto yy78;
                        } else {
-                               if (yych <= '{') goto yy71;
-                               if (yych <= '~') goto yy64;
-                               goto yy71;
+                               if (yych <= '{') goto yy72;
+                               if (yych <= '~') goto yy65;
+                               goto yy72;
                        }
                }
-yy73:
-               YYDEBUG(73, *YYCURSOR);
+yy74:
+               YYDEBUG(74, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               goto yy64;
-yy74:
-               YYDEBUG(74, *YYCURSOR);
-               yyaccept = 1;
+               goto yy65;
+yy75:
+               YYDEBUG(75, *YYCURSOR);
+               yyaccept = 2;
                YYMARKER = ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(75, *YYCURSOR);
+               YYDEBUG(76, *YYCURSOR);
                if (yybm[0+yych] & 32) {
-                       goto yy74;
+                       goto yy75;
                }
                if (yych <= '^') {
                        if (yych <= 'Z') {
-                               if (yych <= '@') goto yy64;
+                               if (yych <= '@') goto yy65;
                        } else {
-                               if (yych == '\\') goto yy73;
-                               goto yy64;
+                               if (yych == '\\') goto yy74;
+                               goto yy65;
                        }
                } else {
                        if (yych <= '`') {
-                               if (yych >= '`') goto yy77;
+                               if (yych >= '`') goto yy78;
                        } else {
-                               if (yych <= '{') goto yy76;
-                               if (yych <= '~') goto yy64;
+                               if (yych <= '{') goto yy77;
+                               if (yych <= '~') goto yy65;
                        }
                }
-yy76:
-               YYDEBUG(76, *YYCURSOR);
+yy77:
+               YYDEBUG(77, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2607 "Zend/zend_language_scanner.l"
+#line 2617 "Zend/zend_language_scanner.l"
                {
-       yyless(yyleng - 1);
+       yyleng--;
+       yyless(yyleng);
 
        if (CG(literal_type) == IS_UNICODE) {
                return zend_scan_unicode_escape_string(zendlval, yytext, yyleng, 0x60 /*'`'*/, T_ENCAPSED_AND_WHITESPACE TSRMLS_CC);
@@ -2117,54 +2133,41 @@ yy76:
                return T_ENCAPSED_AND_WHITESPACE;
        }
 }
-#line 2121 "Zend/zend_language_scanner.c"
-yy77:
-               YYDEBUG(77, *YYCURSOR);
-               yych = *++YYCURSOR;
-               goto yy76;
+#line 2137 "Zend/zend_language_scanner.c"
 yy78:
                YYDEBUG(78, *YYCURSOR);
-               yyaccept = 1;
+               yych = *++YYCURSOR;
+               goto yy77;
+yy79:
+               YYDEBUG(79, *YYCURSOR);
+               yyaccept = 2;
                YYMARKER = ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(79, *YYCURSOR);
+               YYDEBUG(80, *YYCURSOR);
                if (yybm[0+yych] & 16) {
-                       goto yy64;
+                       goto yy65;
                }
-               if (yych <= '[') goto yy76;
-               if (yych <= '\\') goto yy67;
-               if (yych <= 'z') goto yy77;
-               goto yy78;
-yy80:
-               YYDEBUG(80, *YYCURSOR);
-               ++YYCURSOR;
+               if (yych <= '[') goto yy77;
+               if (yych <= '\\') goto yy68;
+               if (yych <= 'z') goto yy78;
+               goto yy79;
+yy81:
                YYDEBUG(81, *YYCURSOR);
-               yyleng = YYCURSOR - SCNG(yy_text);
-#line 2562 "Zend/zend_language_scanner.l"
-               {
-       Z_LVAL_P(zendlval) = (long) '{';
-       yy_push_state(ST_IN_SCRIPTING TSRMLS_CC);
-       yyless(1);
-       return T_CURLY_OPEN;
-}
-#line 2152 "Zend/zend_language_scanner.c"
-yy82:
-               YYDEBUG(82, *YYCURSOR);
-               yyaccept = 2;
+               yyaccept = 3;
                YYMARKER = ++YYCURSOR;
                YYFILL(3);
                yych = *YYCURSOR;
-               YYDEBUG(83, *YYCURSOR);
+               YYDEBUG(82, *YYCURSOR);
                if (yybm[0+yych] & 128) {
-                       goto yy82;
+                       goto yy81;
                }
-               if (yych == '-') goto yy87;
-               if (yych == '[') goto yy88;
-yy84:
-               YYDEBUG(84, *YYCURSOR);
+               if (yych == '-') goto yy86;
+               if (yych == '[') goto yy87;
+yy83:
+               YYDEBUG(83, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2226 "Zend/zend_language_scanner.l"
+#line 2230 "Zend/zend_language_scanner.l"
                {
        if (!zend_copy_scanner_string(zendlval, (yytext+1), (yyleng-1), UG(unicode)?IS_UNICODE:IS_STRING, SCNG(output_conv) TSRMLS_CC)) {
                return 0;
@@ -2174,34 +2177,35 @@ yy84:
        }
        return T_VARIABLE;
 }
-#line 2178 "Zend/zend_language_scanner.c"
-yy85:
-               YYDEBUG(85, *YYCURSOR);
+#line 2181 "Zend/zend_language_scanner.c"
+yy84:
+               YYDEBUG(84, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(86, *YYCURSOR);
+               YYDEBUG(85, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1836 "Zend/zend_language_scanner.l"
+#line 1839 "Zend/zend_language_scanner.l"
                {
        yy_push_state(ST_LOOKING_FOR_VARNAME TSRMLS_CC);
        return T_DOLLAR_OPEN_CURLY_BRACES;
 }
-#line 2189 "Zend/zend_language_scanner.c"
+#line 2192 "Zend/zend_language_scanner.c"
+yy86:
+               YYDEBUG(86, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == '>') goto yy89;
+               goto yy72;
 yy87:
                YYDEBUG(87, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == '>') goto yy90;
-               goto yy71;
-yy88:
-               YYDEBUG(88, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(89, *YYCURSOR);
+               YYDEBUG(88, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2213 "Zend/zend_language_scanner.l"
+#line 2216 "Zend/zend_language_scanner.l"
                {
-       yyless(yyleng - 1);
+       yyleng--;
+       yyless(yyleng);
        yy_push_state(ST_VAR_OFFSET TSRMLS_CC);
 
-       if (!zend_copy_scanner_string(zendlval, (yytext+1), (yyleng-2), UG(unicode)?IS_UNICODE:IS_STRING, SCNG(output_conv) TSRMLS_CC)) {
+       if (!zend_copy_scanner_string(zendlval, (yytext+1), (yyleng-1), UG(unicode)?IS_UNICODE:IS_STRING, SCNG(output_conv) TSRMLS_CC)) {
                return 0;
        }
        if (UG(unicode) && !zend_check_and_normalize_identifier(zendlval)) {
@@ -2209,30 +2213,31 @@ yy88:
        }
        return T_VARIABLE;
 }
-#line 2213 "Zend/zend_language_scanner.c"
-yy90:
-               YYDEBUG(90, *YYCURSOR);
+#line 2217 "Zend/zend_language_scanner.c"
+yy89:
+               YYDEBUG(89, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych <= '_') {
-                       if (yych <= '@') goto yy71;
-                       if (yych <= 'Z') goto yy91;
-                       if (yych <= '^') goto yy71;
+                       if (yych <= '@') goto yy72;
+                       if (yych <= 'Z') goto yy90;
+                       if (yych <= '^') goto yy72;
                } else {
-                       if (yych <= '`') goto yy71;
-                       if (yych <= 'z') goto yy91;
-                       if (yych <= '~') goto yy71;
+                       if (yych <= '`') goto yy72;
+                       if (yych <= 'z') goto yy90;
+                       if (yych <= '~') goto yy72;
                }
-yy91:
-               YYDEBUG(91, *YYCURSOR);
+yy90:
+               YYDEBUG(90, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(92, *YYCURSOR);
+               YYDEBUG(91, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2198 "Zend/zend_language_scanner.l"
+#line 2200 "Zend/zend_language_scanner.l"
                {
-       yyless(yyleng - 3);
+       yyleng -= 3;
+       yyless(yyleng);
        yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC);
 
-       if (!zend_copy_scanner_string(zendlval, (yytext+1), (yyleng-4), UG(unicode)?IS_UNICODE:IS_STRING, SCNG(output_conv) TSRMLS_CC)) {
+       if (!zend_copy_scanner_string(zendlval, (yytext+1), (yyleng-1), UG(unicode)?IS_UNICODE:IS_STRING, SCNG(output_conv) TSRMLS_CC)) {
                return 0;
        }
        if (UG(unicode) && !zend_check_and_normalize_identifier(zendlval)) {
@@ -2240,7 +2245,7 @@ yy91:
        }
        return T_VARIABLE;
 }
-#line 2244 "Zend/zend_language_scanner.c"
+#line 2249 "Zend/zend_language_scanner.c"
        }
 /* *********************************** */
 yyc_ST_COMMENT:
@@ -2279,52 +2284,52 @@ yyc_ST_COMMENT:
                        128, 128, 128, 128, 128, 128, 128, 128, 
                        128, 128, 128, 128, 128, 128, 128, 128, 
                };
-               YYDEBUG(93, *YYCURSOR);
+               YYDEBUG(92, *YYCURSOR);
                YYFILL(2);
                yych = *YYCURSOR;
                if (yybm[0+yych] & 128) {
-                       goto yy95;
+                       goto yy94;
                }
-               goto yy98;
-yy95:
-               YYDEBUG(95, *YYCURSOR);
+               goto yy97;
+yy94:
+               YYDEBUG(94, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(96, *YYCURSOR);
+               YYDEBUG(95, *YYCURSOR);
                if (yybm[0+yych] & 128) {
-                       goto yy95;
+                       goto yy94;
                }
-               YYDEBUG(97, *YYCURSOR);
+               YYDEBUG(96, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2345 "Zend/zend_language_scanner.l"
+#line 2339 "Zend/zend_language_scanner.l"
                {
        yymore();
 }
-#line 2305 "Zend/zend_language_scanner.c"
-yy98:
-               YYDEBUG(98, *YYCURSOR);
+#line 2310 "Zend/zend_language_scanner.c"
+yy97:
+               YYDEBUG(97, *YYCURSOR);
                ++YYCURSOR;
-               if ((yych = *YYCURSOR) == '/') goto yy100;
-               YYDEBUG(99, *YYCURSOR);
+               if ((yych = *YYCURSOR) == '/') goto yy99;
+               YYDEBUG(98, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2368 "Zend/zend_language_scanner.l"
+#line 2362 "Zend/zend_language_scanner.l"
                {
        yymore();
 }
-#line 2316 "Zend/zend_language_scanner.c"
-yy100:
-               YYDEBUG(100, *YYCURSOR);
+#line 2321 "Zend/zend_language_scanner.c"
+yy99:
+               YYDEBUG(99, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(101, *YYCURSOR);
+               YYDEBUG(100, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2362 "Zend/zend_language_scanner.l"
+#line 2356 "Zend/zend_language_scanner.l"
                {
        HANDLE_NEWLINES(yytext, yyleng);
        BEGIN(ST_IN_SCRIPTING);
        return T_COMMENT;
 }
-#line 2328 "Zend/zend_language_scanner.c"
+#line 2333 "Zend/zend_language_scanner.c"
        }
 /* *********************************** */
 yyc_ST_DOC_COMMENT:
@@ -2363,46 +2368,46 @@ yyc_ST_DOC_COMMENT:
                        128, 128, 128, 128, 128, 128, 128, 128, 
                        128, 128, 128, 128, 128, 128, 128, 128, 
                };
-               YYDEBUG(102, *YYCURSOR);
+               YYDEBUG(101, *YYCURSOR);
                YYFILL(2);
                yych = *YYCURSOR;
                if (yybm[0+yych] & 128) {
-                       goto yy104;
+                       goto yy103;
                }
-               goto yy107;
-yy104:
-               YYDEBUG(104, *YYCURSOR);
+               goto yy106;
+yy103:
+               YYDEBUG(103, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(105, *YYCURSOR);
+               YYDEBUG(104, *YYCURSOR);
                if (yybm[0+yych] & 128) {
-                       goto yy104;
+                       goto yy103;
                }
-               YYDEBUG(106, *YYCURSOR);
+               YYDEBUG(105, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2345 "Zend/zend_language_scanner.l"
+#line 2339 "Zend/zend_language_scanner.l"
                {
        yymore();
 }
-#line 2389 "Zend/zend_language_scanner.c"
-yy107:
-               YYDEBUG(107, *YYCURSOR);
+#line 2394 "Zend/zend_language_scanner.c"
+yy106:
+               YYDEBUG(106, *YYCURSOR);
                ++YYCURSOR;
-               if ((yych = *YYCURSOR) == '/') goto yy109;
-               YYDEBUG(108, *YYCURSOR);
+               if ((yych = *YYCURSOR) == '/') goto yy108;
+               YYDEBUG(107, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2368 "Zend/zend_language_scanner.l"
+#line 2362 "Zend/zend_language_scanner.l"
                {
        yymore();
 }
-#line 2400 "Zend/zend_language_scanner.c"
-yy109:
-               YYDEBUG(109, *YYCURSOR);
+#line 2405 "Zend/zend_language_scanner.c"
+yy108:
+               YYDEBUG(108, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(110, *YYCURSOR);
+               YYDEBUG(109, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2349 "Zend/zend_language_scanner.l"
+#line 2343 "Zend/zend_language_scanner.l"
                {
        zval temp;
 
@@ -2415,7 +2420,7 @@ yy109:
        BEGIN(ST_IN_SCRIPTING);
        return T_DOC_COMMENT;
 }
-#line 2419 "Zend/zend_language_scanner.c"
+#line 2424 "Zend/zend_language_scanner.c"
        }
 /* *********************************** */
 yyc_ST_DOUBLE_QUOTES:
@@ -2454,18 +2459,18 @@ yyc_ST_DOUBLE_QUOTES:
                        144, 144, 144, 144, 144, 144, 144, 144, 
                        144, 144, 144, 144, 144, 144, 144, 144, 
                };
-               YYDEBUG(111, *YYCURSOR);
+               YYDEBUG(110, *YYCURSOR);
                YYFILL(2);
                yych = *YYCURSOR;
                if (yybm[0+yych] & 16) {
                        goto yy115;
                }
                if (yych <= '#') goto yy119;
-               if (yych <= '$') goto yy113;
+               if (yych <= '$') goto yy112;
                if (yych <= 'z') goto yy118;
-               goto yy114;
-yy113:
-               YYDEBUG(113, *YYCURSOR);
+               goto yy113;
+yy112:
+               YYDEBUG(112, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yybm[0+yych] & 32) {
                        goto yy125;
@@ -2475,33 +2480,43 @@ yy113:
                                if (yych == '"') goto yy128;
                                goto yy115;
                        } else {
-                               if (yych <= 'Z') goto yy133;
+                               if (yych <= 'Z') goto yy131;
                                if (yych <= '[') goto yy115;
                                goto yy124;
                        }
                } else {
                        if (yych <= '`') {
-                               if (yych == '_') goto yy133;
+                               if (yych == '_') goto yy131;
                                goto yy115;
                        } else {
-                               if (yych <= 'z') goto yy133;
-                               if (yych <= '{') goto yy136;
+                               if (yych <= 'z') goto yy131;
+                               if (yych <= '{') goto yy134;
                                if (yych <= '~') goto yy115;
-                               goto yy133;
+                               goto yy131;
                        }
                }
-yy114:
-               YYDEBUG(114, *YYCURSOR);
-               yych = *++YYCURSOR;
+yy113:
+               YYDEBUG(113, *YYCURSOR);
+               yyaccept = 0;
+               yych = *(YYMARKER = ++YYCURSOR);
                if (yybm[0+yych] & 64) {
                        goto yy129;
                }
                if (yych == '"') goto yy128;
-               if (yych == '$') goto yy131;
-               goto yy116;
+               if (yych != '$') goto yy116;
+yy114:
+               YYDEBUG(114, *YYCURSOR);
+               yyleng = YYCURSOR - SCNG(yy_text);
+#line 2573 "Zend/zend_language_scanner.l"
+               {
+       Z_LVAL_P(zendlval) = (long) '{';
+       yy_push_state(ST_IN_SCRIPTING TSRMLS_CC);
+       return T_CURLY_OPEN;
+}
+#line 2517 "Zend/zend_language_scanner.c"
 yy115:
                YYDEBUG(115, *YYCURSOR);
-               yyaccept = 0;
+               yyaccept = 1;
                YYMARKER = ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
@@ -2517,7 +2532,7 @@ yy116:
 yy117:
                YYDEBUG(117, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2570 "Zend/zend_language_scanner.l"
+#line 2580 "Zend/zend_language_scanner.l"
                {
        if (CG(literal_type) == IS_UNICODE) {
                return zend_scan_unicode_escape_string(zendlval, yytext, yyleng, 0x22 /*'"'*/, T_ENCAPSED_AND_WHITESPACE TSRMLS_CC);
@@ -2526,7 +2541,7 @@ yy117:
                return T_ENCAPSED_AND_WHITESPACE;
        }
 }
-#line 2530 "Zend/zend_language_scanner.c"
+#line 2545 "Zend/zend_language_scanner.c"
 yy118:
                YYDEBUG(118, *YYCURSOR);
                ++YYCURSOR;
@@ -2538,12 +2553,12 @@ yy119:
                ++YYCURSOR;
                YYDEBUG(120, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2749 "Zend/zend_language_scanner.l"
+#line 2765 "Zend/zend_language_scanner.l"
                {
        BEGIN(ST_IN_SCRIPTING);
        return '"';
 }
-#line 2547 "Zend/zend_language_scanner.c"
+#line 2562 "Zend/zend_language_scanner.c"
 yy121:
                YYDEBUG(121, *YYCURSOR);
                ++YYCURSOR;
@@ -2561,12 +2576,16 @@ yy122:
                YYCURSOR = YYMARKER;
                if (yyaccept <= 1) {
                        if (yyaccept <= 0) {
-                               goto yy117;
+                               goto yy114;
                        } else {
-                               goto yy127;
+                               goto yy117;
                        }
                } else {
-                       goto yy135;
+                       if (yyaccept <= 2) {
+                               goto yy127;
+                       } else {
+                               goto yy133;
+                       }
                }
 yy123:
                YYDEBUG(123, *YYCURSOR);
@@ -2602,7 +2621,7 @@ yy124:
                goto yy115;
 yy125:
                YYDEBUG(125, *YYCURSOR);
-               yyaccept = 1;
+               yyaccept = 2;
                YYMARKER = ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
@@ -2630,10 +2649,10 @@ yy125:
 yy127:
                YYDEBUG(127, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2585 "Zend/zend_language_scanner.l"
+#line 2595 "Zend/zend_language_scanner.l"
                {
-       yyless(yyleng - 1);
-       if (yytext[yyleng-1] == '"') --yyleng;
+       yyleng--;
+       yyless(yyleng);
 
        if (CG(literal_type) == IS_UNICODE) {
                return zend_scan_unicode_escape_string(zendlval, yytext, yyleng, 0x22 /*'"'*/, T_ENCAPSED_AND_WHITESPACE TSRMLS_CC);
@@ -2642,14 +2661,14 @@ yy127:
                return T_ENCAPSED_AND_WHITESPACE;
        }
 }
-#line 2646 "Zend/zend_language_scanner.c"
+#line 2665 "Zend/zend_language_scanner.c"
 yy128:
                YYDEBUG(128, *YYCURSOR);
                yych = *++YYCURSOR;
                goto yy127;
 yy129:
                YYDEBUG(129, *YYCURSOR);
-               yyaccept = 1;
+               yyaccept = 2;
                YYMARKER = ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
@@ -2663,33 +2682,20 @@ yy129:
                goto yy129;
 yy131:
                YYDEBUG(131, *YYCURSOR);
-               ++YYCURSOR;
-               YYDEBUG(132, *YYCURSOR);
-               yyleng = YYCURSOR - SCNG(yy_text);
-#line 2562 "Zend/zend_language_scanner.l"
-               {
-       Z_LVAL_P(zendlval) = (long) '{';
-       yy_push_state(ST_IN_SCRIPTING TSRMLS_CC);
-       yyless(1);
-       return T_CURLY_OPEN;
-}
-#line 2677 "Zend/zend_language_scanner.c"
-yy133:
-               YYDEBUG(133, *YYCURSOR);
-               yyaccept = 2;
+               yyaccept = 3;
                YYMARKER = ++YYCURSOR;
                YYFILL(3);
                yych = *YYCURSOR;
-               YYDEBUG(134, *YYCURSOR);
+               YYDEBUG(132, *YYCURSOR);
                if (yybm[0+yych] & 128) {
-                       goto yy133;
+                       goto yy131;
                }
-               if (yych == '-') goto yy138;
-               if (yych == '[') goto yy139;
-yy135:
-               YYDEBUG(135, *YYCURSOR);
+               if (yych == '-') goto yy136;
+               if (yych == '[') goto yy137;
+yy133:
+               YYDEBUG(133, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2226 "Zend/zend_language_scanner.l"
+#line 2230 "Zend/zend_language_scanner.l"
                {
        if (!zend_copy_scanner_string(zendlval, (yytext+1), (yyleng-1), UG(unicode)?IS_UNICODE:IS_STRING, SCNG(output_conv) TSRMLS_CC)) {
                return 0;
@@ -2699,34 +2705,35 @@ yy135:
        }
        return T_VARIABLE;
 }
-#line 2703 "Zend/zend_language_scanner.c"
-yy136:
-               YYDEBUG(136, *YYCURSOR);
+#line 2709 "Zend/zend_language_scanner.c"
+yy134:
+               YYDEBUG(134, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(137, *YYCURSOR);
+               YYDEBUG(135, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1836 "Zend/zend_language_scanner.l"
+#line 1839 "Zend/zend_language_scanner.l"
                {
        yy_push_state(ST_LOOKING_FOR_VARNAME TSRMLS_CC);
        return T_DOLLAR_OPEN_CURLY_BRACES;
 }
-#line 2714 "Zend/zend_language_scanner.c"
-yy138:
-               YYDEBUG(138, *YYCURSOR);
+#line 2720 "Zend/zend_language_scanner.c"
+yy136:
+               YYDEBUG(136, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == '>') goto yy141;
+               if (yych == '>') goto yy139;
                goto yy122;
-yy139:
-               YYDEBUG(139, *YYCURSOR);
+yy137:
+               YYDEBUG(137, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(140, *YYCURSOR);
+               YYDEBUG(138, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2213 "Zend/zend_language_scanner.l"
+#line 2216 "Zend/zend_language_scanner.l"
                {
-       yyless(yyleng - 1);
+       yyleng--;
+       yyless(yyleng);
        yy_push_state(ST_VAR_OFFSET TSRMLS_CC);
 
-       if (!zend_copy_scanner_string(zendlval, (yytext+1), (yyleng-2), UG(unicode)?IS_UNICODE:IS_STRING, SCNG(output_conv) TSRMLS_CC)) {
+       if (!zend_copy_scanner_string(zendlval, (yytext+1), (yyleng-1), UG(unicode)?IS_UNICODE:IS_STRING, SCNG(output_conv) TSRMLS_CC)) {
                return 0;
        }
        if (UG(unicode) && !zend_check_and_normalize_identifier(zendlval)) {
@@ -2734,30 +2741,31 @@ yy139:
        }
        return T_VARIABLE;
 }
-#line 2738 "Zend/zend_language_scanner.c"
-yy141:
-               YYDEBUG(141, *YYCURSOR);
+#line 2745 "Zend/zend_language_scanner.c"
+yy139:
+               YYDEBUG(139, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych <= '_') {
                        if (yych <= '@') goto yy122;
-                       if (yych <= 'Z') goto yy142;
+                       if (yych <= 'Z') goto yy140;
                        if (yych <= '^') goto yy122;
                } else {
                        if (yych <= '`') goto yy122;
-                       if (yych <= 'z') goto yy142;
+                       if (yych <= 'z') goto yy140;
                        if (yych <= '~') goto yy122;
                }
-yy142:
-               YYDEBUG(142, *YYCURSOR);
+yy140:
+               YYDEBUG(140, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(143, *YYCURSOR);
+               YYDEBUG(141, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2198 "Zend/zend_language_scanner.l"
+#line 2200 "Zend/zend_language_scanner.l"
                {
-       yyless(yyleng - 3);
+       yyleng -= 3;
+       yyless(yyleng);
        yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC);
 
-       if (!zend_copy_scanner_string(zendlval, (yytext+1), (yyleng-4), UG(unicode)?IS_UNICODE:IS_STRING, SCNG(output_conv) TSRMLS_CC)) {
+       if (!zend_copy_scanner_string(zendlval, (yytext+1), (yyleng-1), UG(unicode)?IS_UNICODE:IS_STRING, SCNG(output_conv) TSRMLS_CC)) {
                return 0;
        }
        if (UG(unicode) && !zend_check_and_normalize_identifier(zendlval)) {
@@ -2765,50 +2773,46 @@ yy142:
        }
        return T_VARIABLE;
 }
-#line 2769 "Zend/zend_language_scanner.c"
+#line 2777 "Zend/zend_language_scanner.c"
        }
 /* *********************************** */
 yyc_ST_END_HEREDOC:
-       YYDEBUG(144, *YYCURSOR);
+       YYDEBUG(142, *YYCURSOR);
        YYFILL(1);
        yych = *YYCURSOR;
-       YYDEBUG(146, *YYCURSOR);
+       YYDEBUG(144, *YYCURSOR);
        ++YYCURSOR;
-       YYDEBUG(147, *YYCURSOR);
+       YYDEBUG(145, *YYCURSOR);
        yyleng = YYCURSOR - SCNG(yy_text);
-#line 2550 "Zend/zend_language_scanner.l"
+#line 2562 "Zend/zend_language_scanner.l"
        {
-       Z_STRVAL_P(zendlval) = CG(heredoc);
-       Z_STRLEN_P(zendlval) = CG(heredoc_len);
-       SCNG(yy_text) = Z_STRVAL_P(zendlval);
-       yyleng = Z_STRLEN_P(zendlval);
+       SCNG(yy_text) = Z_STRVAL_P(zendlval) = CG(heredoc);
+       SCNG(yy_leng) = Z_STRLEN_P(zendlval) = CG(heredoc_len);
        CG(heredoc) = NULL;
        CG(heredoc_len) = 0;
        BEGIN(ST_IN_SCRIPTING);
        return T_END_HEREDOC;
 }
-#line 2791 "Zend/zend_language_scanner.c"
+#line 2797 "Zend/zend_language_scanner.c"
 /* *********************************** */
 yyc_ST_END_NOWDOC:
-       YYDEBUG(148, *YYCURSOR);
+       YYDEBUG(146, *YYCURSOR);
        YYFILL(1);
        yych = *YYCURSOR;
-       YYDEBUG(150, *YYCURSOR);
+       YYDEBUG(148, *YYCURSOR);
        ++YYCURSOR;
-       YYDEBUG(151, *YYCURSOR);
+       YYDEBUG(149, *YYCURSOR);
        yyleng = YYCURSOR - SCNG(yy_text);
-#line 2736 "Zend/zend_language_scanner.l"
+#line 2754 "Zend/zend_language_scanner.l"
        {
-       Z_STRVAL_P(zendlval) = CG(heredoc);
-       Z_STRLEN_P(zendlval) = CG(heredoc_len);
-       SCNG(yy_text) = CG(heredoc);
-       yyleng = CG(heredoc_len);
+       SCNG(yy_text) = Z_STRVAL_P(zendlval) = CG(heredoc);
+       SCNG(yy_leng) = Z_STRLEN_P(zendlval) = CG(heredoc_len);
        CG(heredoc) = NULL;
        CG(heredoc_len) = 0;
        BEGIN(ST_IN_SCRIPTING);
        return T_END_NOWDOC;
 }
-#line 2812 "Zend/zend_language_scanner.c"
+#line 2816 "Zend/zend_language_scanner.c"
 /* *********************************** */
 yyc_ST_HEREDOC:
        {
@@ -2846,26 +2850,26 @@ yyc_ST_HEREDOC:
                          8,   8,   8,   8,   8,   8,   8,   8, 
                          8,   8,   8,   8,   8,   8,   8,   8, 
                };
-               YYDEBUG(152, *YYCURSOR);
+               YYDEBUG(150, *YYCURSOR);
                YYFILL(2);
                yych = *(YYMARKER = YYCURSOR);
                if (yybm[0+yych] & 4) {
-                       goto yy157;
+                       goto yy156;
                }
                if (yych <= '[') {
-                       if (yych <= '\f') goto yy162;
-                       if (yych <= '\r') goto yy164;
-                       if (yych <= '@') goto yy155;
-                       goto yy159;
+                       if (yych <= '\f') goto yy161;
+                       if (yych <= '\r') goto yy163;
+                       if (yych <= '@') goto yy153;
+                       goto yy158;
                } else {
-                       if (yych <= '\\') goto yy161;
-                       if (yych == '{') goto yy156;
-                       goto yy159;
+                       if (yych <= '\\') goto yy160;
+                       if (yych == '{') goto yy154;
+                       goto yy158;
                }
-yy154:
-               YYDEBUG(154, *YYCURSOR);
+yy152:
+               YYDEBUG(152, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2626 "Zend/zend_language_scanner.l"
+#line 2637 "Zend/zend_language_scanner.l"
                {
        if (CG(literal_type) == IS_UNICODE) {
                return zend_scan_unicode_escape_string(zendlval, yytext, yyleng, 0, T_ENCAPSED_AND_WHITESPACE TSRMLS_CC);
@@ -2874,295 +2878,313 @@ yy154:
                return T_ENCAPSED_AND_WHITESPACE;
        }
 }
-#line 2878 "Zend/zend_language_scanner.c"
-yy155:
-               YYDEBUG(155, *YYCURSOR);
+#line 2882 "Zend/zend_language_scanner.c"
+yy153:
+               YYDEBUG(153, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych <= '\\') {
                        if (yych <= '@') {
-                               if (yych == '$') goto yy199;
-                               goto yy158;
+                               if (yych == '$') goto yy198;
+                               goto yy157;
                        } else {
-                               if (yych <= 'Z') goto yy205;
-                               if (yych <= '[') goto yy158;
-                               goto yy192;
+                               if (yych <= 'Z') goto yy202;
+                               if (yych <= '[') goto yy157;
+                               goto yy191;
                        }
                } else {
                        if (yych <= '`') {
-                               if (yych == '_') goto yy205;
-                               goto yy158;
+                               if (yych == '_') goto yy202;
+                               goto yy157;
                        } else {
-                               if (yych <= 'z') goto yy205;
-                               if (yych <= '{') goto yy208;
-                               if (yych <= '~') goto yy158;
-                               goto yy205;
+                               if (yych <= 'z') goto yy202;
+                               if (yych <= '{') goto yy205;
+                               if (yych <= '~') goto yy157;
+                               goto yy202;
                        }
                }
-yy156:
-               YYDEBUG(156, *YYCURSOR);
-               yych = *++YYCURSOR;
+yy154:
+               YYDEBUG(154, *YYCURSOR);
+               yyaccept = 1;
+               yych = *(YYMARKER = ++YYCURSOR);
                if (yybm[0+yych] & 16) {
-                       goto yy162;
+                       goto yy161;
                }
                if (yych <= '$') {
-                       if (yych == '\r') goto yy164;
-                       if (yych >= '$') goto yy203;
+                       if (yych == '\r') goto yy163;
+                       if (yych <= '#') goto yy156;
                } else {
                        if (yych <= '\\') {
-                               if (yych >= '\\') goto yy161;
+                               if (yych <= '[') goto yy156;
+                               goto yy160;
                        } else {
-                               if (yych == '{') goto yy201;
+                               if (yych == '{') goto yy200;
+                               goto yy156;
                        }
                }
-yy157:
-               YYDEBUG(157, *YYCURSOR);
+yy155:
+               YYDEBUG(155, *YYCURSOR);
+               yyleng = YYCURSOR - SCNG(yy_text);
+#line 2573 "Zend/zend_language_scanner.l"
+               {
+       Z_LVAL_P(zendlval) = (long) '{';
+       yy_push_state(ST_IN_SCRIPTING TSRMLS_CC);
+       return T_CURLY_OPEN;
+}
+#line 2934 "Zend/zend_language_scanner.c"
+yy156:
+               YYDEBUG(156, *YYCURSOR);
                yyaccept = 0;
                YYMARKER = ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-yy158:
-               YYDEBUG(158, *YYCURSOR);
-               if (yybm[0+yych] & 4) {
-                       goto yy157;
+yy157:
+               YYDEBUG(157, *YYCURSOR);
+               if (yybm[0+yych] & 4) {
+                       goto yy156;
                }
                if (yych <= '[') {
-                       if (yych <= '\f') goto yy162;
-                       if (yych <= '\r') goto yy164;
-                       if (yych <= '@') goto yy198;
+                       if (yych <= '\f') goto yy161;
+                       if (yych <= '\r') goto yy163;
+                       if (yych <= '@') goto yy197;
                } else {
-                       if (yych <= '\\') goto yy161;
-                       if (yych == '{') goto yy197;
+                       if (yych <= '\\') goto yy160;
+                       if (yych == '{') goto yy196;
                }
-yy159:
-               YYDEBUG(159, *YYCURSOR);
+yy158:
+               YYDEBUG(158, *YYCURSOR);
                yyaccept = 0;
                YYMARKER = ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(160, *YYCURSOR);
+               YYDEBUG(159, *YYCURSOR);
                if (yybm[0+yych] & 16) {
-                       goto yy162;
+                       goto yy161;
                }
                if (yych <= '@') {
                        if (yych <= '$') {
-                               if (yych == '\r') goto yy164;
-                               if (yych <= '#') goto yy157;
-                               goto yy191;
+                               if (yych == '\r') goto yy163;
+                               if (yych <= '#') goto yy156;
+                               goto yy190;
                        } else {
                                if (yych <= '9') {
-                                       if (yych <= '/') goto yy157;
-                                       goto yy159;
+                                       if (yych <= '/') goto yy156;
+                                       goto yy158;
                                } else {
-                                       if (yych == ';') goto yy189;
-                                       goto yy157;
+                                       if (yych == ';') goto yy188;
+                                       goto yy156;
                                }
                        }
                } else {
                        if (yych <= '_') {
                                if (yych <= '[') {
-                                       if (yych <= 'Z') goto yy159;
-                                       goto yy157;
+                                       if (yych <= 'Z') goto yy158;
+                                       goto yy156;
                                } else {
-                                       if (yych <= '\\') goto yy161;
-                                       if (yych <= '^') goto yy157;
-                                       goto yy159;
+                                       if (yych <= '\\') goto yy160;
+                                       if (yych <= '^') goto yy156;
+                                       goto yy158;
                                }
                        } else {
                                if (yych <= 'z') {
-                                       if (yych <= '`') goto yy157;
-                                       goto yy159;
+                                       if (yych <= '`') goto yy156;
+                                       goto yy158;
                                } else {
-                                       if (yych <= '{') goto yy190;
-                                       if (yych <= '~') goto yy157;
-                                       goto yy159;
+                                       if (yych <= '{') goto yy189;
+                                       if (yych <= '~') goto yy156;
+                                       goto yy158;
                                }
                        }
                }
-yy161:
-               YYDEBUG(161, *YYCURSOR);
+yy160:
+               YYDEBUG(160, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
                if (yybm[0+yych] & 16) {
-                       goto yy162;
+                       goto yy161;
                }
-               if (yych == '\r') goto yy164;
-               goto yy157;
-yy162:
-               YYDEBUG(162, *YYCURSOR);
+               if (yych == '\r') goto yy163;
+               goto yy156;
+yy161:
+               YYDEBUG(161, *YYCURSOR);
                yyaccept = 0;
                YYMARKER = ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(163, *YYCURSOR);
+               YYDEBUG(162, *YYCURSOR);
                if (yybm[0+yych] & 4) {
-                       goto yy157;
+                       goto yy156;
                }
                if (yych <= '[') {
-                       if (yych <= '\f') goto yy162;
-                       if (yych <= '\r') goto yy164;
-                       if (yych <= '@') goto yy170;
-                       goto yy166;
+                       if (yych <= '\f') goto yy161;
+                       if (yych <= '\r') goto yy163;
+                       if (yych <= '@') goto yy169;
+                       goto yy165;
                } else {
-                       if (yych <= '\\') goto yy171;
-                       if (yych == '{') goto yy168;
-                       goto yy166;
+                       if (yych <= '\\') goto yy170;
+                       if (yych == '{') goto yy167;
+                       goto yy165;
                }
-yy164:
-               YYDEBUG(164, *YYCURSOR);
+yy163:
+               YYDEBUG(163, *YYCURSOR);
                yyaccept = 0;
                YYMARKER = ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(165, *YYCURSOR);
+               YYDEBUG(164, *YYCURSOR);
                if (yybm[0+yych] & 4) {
-                       goto yy157;
+                       goto yy156;
                }
                if (yych <= '[') {
-                       if (yych <= '\f') goto yy162;
-                       if (yych <= '\r') goto yy164;
-                       if (yych <= '@') goto yy170;
+                       if (yych <= '\f') goto yy161;
+                       if (yych <= '\r') goto yy163;
+                       if (yych <= '@') goto yy169;
                } else {
-                       if (yych <= '\\') goto yy171;
-                       if (yych == '{') goto yy168;
+                       if (yych <= '\\') goto yy170;
+                       if (yych == '{') goto yy167;
                }
-yy166:
-               YYDEBUG(166, *YYCURSOR);
+yy165:
+               YYDEBUG(165, *YYCURSOR);
                yyaccept = 0;
                YYMARKER = ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(167, *YYCURSOR);
+               YYDEBUG(166, *YYCURSOR);
                if (yych <= ';') {
                        if (yych <= '#') {
                                if (yych <= '\n') {
-                                       if (yych <= '\t') goto yy157;
-                                       goto yy182;
+                                       if (yych <= '\t') goto yy156;
+                                       goto yy181;
                                } else {
-                                       if (yych == '\r') goto yy182;
-                                       goto yy157;
+                                       if (yych == '\r') goto yy181;
+                                       goto yy156;
                                }
                        } else {
                                if (yych <= '/') {
-                                       if (yych <= '$') goto yy181;
-                                       goto yy157;
+                                       if (yych <= '$') goto yy180;
+                                       goto yy156;
                                } else {
-                                       if (yych <= '9') goto yy166;
-                                       if (yych <= ':') goto yy157;
-                                       goto yy178;
+                                       if (yych <= '9') goto yy165;
+                                       if (yych <= ':') goto yy156;
+                                       goto yy177;
                                }
                        }
                } else {
                        if (yych <= '^') {
                                if (yych <= 'Z') {
-                                       if (yych <= '@') goto yy157;
-                                       goto yy166;
+                                       if (yych <= '@') goto yy156;
+                                       goto yy165;
                                } else {
-                                       if (yych == '\\') goto yy179;
-                                       goto yy157;
+                                       if (yych == '\\') goto yy178;
+                                       goto yy156;
                                }
                        } else {
                                if (yych <= 'z') {
-                                       if (yych == '`') goto yy157;
-                                       goto yy166;
+                                       if (yych == '`') goto yy156;
+                                       goto yy165;
                                } else {
-                                       if (yych <= '{') goto yy180;
-                                       if (yych <= '~') goto yy157;
-                                       goto yy166;
+                                       if (yych <= '{') goto yy179;
+                                       if (yych <= '~') goto yy156;
+                                       goto yy165;
                                }
                        }
                }
-yy168:
-               YYDEBUG(168, *YYCURSOR);
+yy167:
+               YYDEBUG(167, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
                if (yybm[0+yych] & 16) {
-                       goto yy162;
+                       goto yy161;
                }
                if (yych <= '$') {
-                       if (yych == '\r') goto yy164;
-                       if (yych <= '#') goto yy157;
+                       if (yych == '\r') goto yy163;
+                       if (yych <= '#') goto yy156;
                } else {
                        if (yych <= '\\') {
-                               if (yych <= '[') goto yy157;
-                               goto yy171;
+                               if (yych <= '[') goto yy156;
+                               goto yy170;
                        } else {
-                               if (yych == '{') goto yy176;
-                               goto yy157;
+                               if (yych == '{') goto yy175;
+                               goto yy156;
                        }
                }
-yy169:
-               YYDEBUG(169, *YYCURSOR);
+yy168:
+               YYDEBUG(168, *YYCURSOR);
                YYCURSOR = YYMARKER;
                if (yyaccept <= 1) {
                        if (yyaccept <= 0) {
-                               goto yy154;
+                               goto yy152;
                        } else {
-                               goto yy175;
+                               goto yy155;
                        }
                } else {
-                       goto yy207;
+                       if (yyaccept <= 2) {
+                               goto yy174;
+                       } else {
+                               goto yy204;
+                       }
                }
-yy170:
-               YYDEBUG(170, *YYCURSOR);
+yy169:
+               YYDEBUG(169, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
                if (yybm[0+yych] & 4) {
-                       goto yy157;
+                       goto yy156;
                }
                if (yych <= '@') {
-                       if (yych <= '\f') goto yy162;
-                       if (yych <= '\r') goto yy164;
-                       goto yy173;
+                       if (yych <= '\f') goto yy161;
+                       if (yych <= '\r') goto yy163;
+                       goto yy172;
                } else {
-                       if (yych == '\\') goto yy172;
-                       goto yy169;
+                       if (yych == '\\') goto yy171;
+                       goto yy168;
                }
-yy171:
-               YYDEBUG(171, *YYCURSOR);
+yy170:
+               YYDEBUG(170, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
                if (yybm[0+yych] & 16) {
-                       goto yy162;
+                       goto yy161;
                }
-               if (yych == '\r') goto yy164;
-               goto yy157;
-yy172:
-               YYDEBUG(172, *YYCURSOR);
+               if (yych == '\r') goto yy163;
+               goto yy156;
+yy171:
+               YYDEBUG(171, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
                if (yybm[0+yych] & 16) {
-                       goto yy162;
+                       goto yy161;
                }
-               if (yych == '\r') goto yy164;
-               goto yy157;
-yy173:
-               YYDEBUG(173, *YYCURSOR);
-               yyaccept = 1;
+               if (yych == '\r') goto yy163;
+               goto yy156;
+yy172:
+               YYDEBUG(172, *YYCURSOR);
+               yyaccept = 2;
                YYMARKER = ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(174, *YYCURSOR);
+               YYDEBUG(173, *YYCURSOR);
                if (yybm[0+yych] & 4) {
-                       goto yy157;
+                       goto yy156;
                }
                if (yych <= '@') {
-                       if (yych <= '\f') goto yy162;
-                       if (yych <= '\r') goto yy164;
-                       goto yy173;
+                       if (yych <= '\f') goto yy161;
+                       if (yych <= '\r') goto yy163;
+                       goto yy172;
                } else {
-                       if (yych == '\\') goto yy172;
+                       if (yych == '\\') goto yy171;
                }
-yy175:
-               YYDEBUG(175, *YYCURSOR);
+yy174:
+               YYDEBUG(174, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2635 "Zend/zend_language_scanner.l"
+#line 2646 "Zend/zend_language_scanner.l"
                {
-       yyless(yyleng - 1);
+       yyleng--;
+       yyless(yyleng);
 
        if (CG(literal_type) == IS_UNICODE) {
                return zend_scan_unicode_escape_string(zendlval, yytext, yyleng, 0, T_ENCAPSED_AND_WHITESPACE TSRMLS_CC);
@@ -3171,106 +3193,106 @@ yy175:
                return T_ENCAPSED_AND_WHITESPACE;
        }
 }
-#line 3175 "Zend/zend_language_scanner.c"
-yy176:
-               YYDEBUG(176, *YYCURSOR);
-               yyaccept = 1;
+#line 3197 "Zend/zend_language_scanner.c"
+yy175:
+               YYDEBUG(175, *YYCURSOR);
+               yyaccept = 2;
                YYMARKER = ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(177, *YYCURSOR);
+               YYDEBUG(176, *YYCURSOR);
                if (yybm[0+yych] & 16) {
-                       goto yy162;
+                       goto yy161;
                }
                if (yych <= '$') {
-                       if (yych == '\r') goto yy164;
-                       if (yych <= '#') goto yy157;
-                       goto yy175;
+                       if (yych == '\r') goto yy163;
+                       if (yych <= '#') goto yy156;
+                       goto yy174;
                } else {
                        if (yych <= '\\') {
-                               if (yych <= '[') goto yy157;
-                               goto yy171;
+                               if (yych <= '[') goto yy156;
+                               goto yy170;
                        } else {
-                               if (yych == '{') goto yy176;
-                               goto yy157;
+                               if (yych == '{') goto yy175;
+                               goto yy156;
                        }
                }
-yy178:
-               YYDEBUG(178, *YYCURSOR);
+yy177:
+               YYDEBUG(177, *YYCURSOR);
                yyaccept = 0;
                YYMARKER = ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
                if (yych <= '#') {
                        if (yych <= '\n') {
-                               if (yych <= '\t') goto yy157;
-                               goto yy182;
+                               if (yych <= '\t') goto yy156;
+                               goto yy181;
                        } else {
-                               if (yych == '\r') goto yy182;
-                               goto yy157;
+                               if (yych == '\r') goto yy181;
+                               goto yy156;
                        }
                } else {
                        if (yych <= '\\') {
-                               if (yych <= '$') goto yy181;
-                               if (yych <= '[') goto yy157;
+                               if (yych <= '$') goto yy180;
+                               if (yych <= '[') goto yy156;
                        } else {
-                               if (yych == '{') goto yy180;
-                               goto yy157;
+                               if (yych == '{') goto yy179;
+                               goto yy156;
                        }
                }
-yy179:
-               YYDEBUG(179, *YYCURSOR);
+yy178:
+               YYDEBUG(178, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
                if (yybm[0+yych] & 16) {
-                       goto yy162;
+                       goto yy161;
                }
-               if (yych == '\r') goto yy164;
-               goto yy157;
-yy180:
-               YYDEBUG(180, *YYCURSOR);
+               if (yych == '\r') goto yy163;
+               goto yy156;
+yy179:
+               YYDEBUG(179, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
                if (yybm[0+yych] & 16) {
-                       goto yy162;
+                       goto yy161;
                }
                if (yych <= '$') {
-                       if (yych == '\r') goto yy164;
-                       if (yych <= '#') goto yy157;
-                       goto yy169;
+                       if (yych == '\r') goto yy163;
+                       if (yych <= '#') goto yy156;
+                       goto yy168;
                } else {
                        if (yych <= '\\') {
-                               if (yych <= '[') goto yy157;
-                               goto yy179;
+                               if (yych <= '[') goto yy156;
+                               goto yy178;
                        } else {
-                               if (yych == '{') goto yy187;
-                               goto yy157;
+                               if (yych == '{') goto yy186;
+                               goto yy156;
                        }
                }
-yy181:
-               YYDEBUG(181, *YYCURSOR);
+yy180:
+               YYDEBUG(180, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
                if (yybm[0+yych] & 4) {
-                       goto yy157;
+                       goto yy156;
                }
                if (yych <= '@') {
-                       if (yych <= '\f') goto yy162;
-                       if (yych <= '\r') goto yy164;
-                       goto yy184;
+                       if (yych <= '\f') goto yy161;
+                       if (yych <= '\r') goto yy163;
+                       goto yy183;
                } else {
-                       if (yych == '\\') goto yy186;
-                       goto yy169;
+                       if (yych == '\\') goto yy185;
+                       goto yy168;
                }
-yy182:
-               YYDEBUG(182, *YYCURSOR);
+yy181:
+               YYDEBUG(181, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(183, *YYCURSOR);
+               YYDEBUG(182, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2511 "Zend/zend_language_scanner.l"
+#line 2517 "Zend/zend_language_scanner.l"
                {
        char *end = yytext + yyleng - 1;
 
@@ -3282,16 +3304,22 @@ yy182:
        if (yyleng > CG(heredoc_len) && !memcmp(end - CG(heredoc_len), CG(heredoc), CG(heredoc_len))) {
                int len = yyleng - CG(heredoc_len) - 2; /* 2 for newline before and after label */
 
-               if (len > 0 && yytext[len - 1] == '\r' && yytext[len] == '\n') {
-                       len--;
+               /* May have matched fooLABEL; make sure there's a newline before it */
+               if (yytext[len] != '\n') {
+                       if (yytext[len] != '\r') {
+                               yyless(yyleng - 1);
+                               yymore();
+                       }
+               } else if (len > 0 && yytext[len - 1] == '\r') {
+                       len--; /* Windows newline */
                }
 
                /* Go back before last label char, to match in ST_END_HEREDOC state */
                yyless(yyleng - 2);
 
-               /* Subtract the remaining label length. yyleng must include newline
+               /* Subtract the label/newline length. yyleng must include newline
                 * before label, for zend_highlight/strip, tokenizer, etc. */
-               yyleng = yyleng - CG(heredoc_len) - 1;
+               yyleng -= CG(heredoc_len) + 1;
 
                CG(increment_lineno) = 1; /* For newline before label */
                BEGIN(ST_END_HEREDOC);
@@ -3309,280 +3337,267 @@ yy182:
                yymore();
        }
 }
-#line 3313 "Zend/zend_language_scanner.c"
-yy184:
-               YYDEBUG(184, *YYCURSOR);
-               yyaccept = 1;
+#line 3341 "Zend/zend_language_scanner.c"
+yy183:
+               YYDEBUG(183, *YYCURSOR);
+               yyaccept = 2;
                YYMARKER = ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(185, *YYCURSOR);
+               YYDEBUG(184, *YYCURSOR);
                if (yybm[0+yych] & 4) {
-                       goto yy157;
+                       goto yy156;
                }
                if (yych <= '@') {
-                       if (yych <= '\f') goto yy162;
-                       if (yych <= '\r') goto yy164;
-                       goto yy184;
+                       if (yych <= '\f') goto yy161;
+                       if (yych <= '\r') goto yy163;
+                       goto yy183;
                } else {
-                       if (yych != '\\') goto yy175;
+                       if (yych != '\\') goto yy174;
                }
-yy186:
-               YYDEBUG(186, *YYCURSOR);
+yy185:
+               YYDEBUG(185, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
                if (yybm[0+yych] & 16) {
-                       goto yy162;
+                       goto yy161;
                }
-               if (yych == '\r') goto yy164;
-               goto yy157;
-yy187:
-               YYDEBUG(187, *YYCURSOR);
-               yyaccept = 1;
+               if (yych == '\r') goto yy163;
+               goto yy156;
+yy186:
+               YYDEBUG(186, *YYCURSOR);
+               yyaccept = 2;
                YYMARKER = ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(188, *YYCURSOR);
+               YYDEBUG(187, *YYCURSOR);
                if (yybm[0+yych] & 16) {
-                       goto yy162;
+                       goto yy161;
                }
                if (yych <= '$') {
-                       if (yych == '\r') goto yy164;
-                       if (yych <= '#') goto yy157;
-                       goto yy175;
+                       if (yych == '\r') goto yy163;
+                       if (yych <= '#') goto yy156;
+                       goto yy174;
                } else {
                        if (yych <= '\\') {
-                               if (yych <= '[') goto yy157;
-                               goto yy179;
+                               if (yych <= '[') goto yy156;
+                               goto yy178;
                        } else {
-                               if (yych == '{') goto yy187;
-                               goto yy157;
+                               if (yych == '{') goto yy186;
+                               goto yy156;
                        }
                }
-yy189:
-               YYDEBUG(189, *YYCURSOR);
+yy188:
+               YYDEBUG(188, *YYCURSOR);
                yyaccept = 0;
                YYMARKER = ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
                if (yybm[0+yych] & 4) {
-                       goto yy157;
+                       goto yy156;
                }
                if (yych <= '[') {
-                       if (yych <= '\f') goto yy162;
-                       if (yych <= '\r') goto yy164;
-                       if (yych <= '@') goto yy191;
-                       goto yy159;
+                       if (yych <= '\f') goto yy161;
+                       if (yych <= '\r') goto yy163;
+                       if (yych <= '@') goto yy190;
+                       goto yy158;
                } else {
-                       if (yych <= '\\') goto yy161;
-                       if (yych != '{') goto yy159;
+                       if (yych <= '\\') goto yy160;
+                       if (yych != '{') goto yy158;
                }
-yy190:
-               YYDEBUG(190, *YYCURSOR);
+yy189:
+               YYDEBUG(189, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
                if (yybm[0+yych] & 16) {
-                       goto yy162;
+                       goto yy161;
                }
                if (yych <= '$') {
-                       if (yych == '\r') goto yy164;
-                       if (yych <= '#') goto yy157;
-                       goto yy169;
+                       if (yych == '\r') goto yy163;
+                       if (yych <= '#') goto yy156;
+                       goto yy168;
                } else {
                        if (yych <= '\\') {
-                               if (yych <= '[') goto yy157;
-                               goto yy161;
+                               if (yych <= '[') goto yy156;
+                               goto yy160;
                        } else {
-                               if (yych == '{') goto yy195;
-                               goto yy157;
+                               if (yych == '{') goto yy194;
+                               goto yy156;
                        }
                }
-yy191:
-               YYDEBUG(191, *YYCURSOR);
+yy190:
+               YYDEBUG(190, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
                if (yybm[0+yych] & 4) {
-                       goto yy157;
+                       goto yy156;
                }
                if (yych <= '@') {
-                       if (yych <= '\f') goto yy162;
-                       if (yych <= '\r') goto yy164;
-                       goto yy193;
+                       if (yych <= '\f') goto yy161;
+                       if (yych <= '\r') goto yy163;
+                       goto yy192;
                } else {
-                       if (yych != '\\') goto yy169;
+                       if (yych != '\\') goto yy168;
                }
-yy192:
-               YYDEBUG(192, *YYCURSOR);
+yy191:
+               YYDEBUG(191, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
                if (yybm[0+yych] & 16) {
-                       goto yy162;
+                       goto yy161;
                }
-               if (yych == '\r') goto yy164;
-               goto yy157;
-yy193:
-               YYDEBUG(193, *YYCURSOR);
-               yyaccept = 1;
+               if (yych == '\r') goto yy163;
+               goto yy156;
+yy192:
+               YYDEBUG(192, *YYCURSOR);
+               yyaccept = 2;
                YYMARKER = ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(194, *YYCURSOR);
+               YYDEBUG(193, *YYCURSOR);
                if (yybm[0+yych] & 4) {
-                       goto yy157;
+                       goto yy156;
                }
                if (yych <= '@') {
-                       if (yych <= '\f') goto yy162;
-                       if (yych <= '\r') goto yy164;
-                       goto yy193;
+                       if (yych <= '\f') goto yy161;
+                       if (yych <= '\r') goto yy163;
+                       goto yy192;
                } else {
-                       if (yych == '\\') goto yy192;
-                       goto yy175;
+                       if (yych == '\\') goto yy191;
+                       goto yy174;
                }
-yy195:
-               YYDEBUG(195, *YYCURSOR);
-               yyaccept = 1;
+yy194:
+               YYDEBUG(194, *YYCURSOR);
+               yyaccept = 2;
                YYMARKER = ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(196, *YYCURSOR);
+               YYDEBUG(195, *YYCURSOR);
                if (yybm[0+yych] & 16) {
-                       goto yy162;
+                       goto yy161;
                }
                if (yych <= '$') {
-                       if (yych == '\r') goto yy164;
-                       if (yych <= '#') goto yy157;
-                       goto yy175;
+                       if (yych == '\r') goto yy163;
+                       if (yych <= '#') goto yy156;
+                       goto yy174;
                } else {
                        if (yych <= '\\') {
-                               if (yych <= '[') goto yy157;
-                               goto yy161;
+                               if (yych <= '[') goto yy156;
+                               goto yy160;
                        } else {
-                               if (yych == '{') goto yy195;
-                               goto yy157;
+                               if (yych == '{') goto yy194;
+                               goto yy156;
                        }
                }
-yy197:
-               YYDEBUG(197, *YYCURSOR);
+yy196:
+               YYDEBUG(196, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
                if (yybm[0+yych] & 16) {
-                       goto yy162;
+                       goto yy161;
                }
                if (yych <= '$') {
-                       if (yych == '\r') goto yy164;
-                       if (yych <= '#') goto yy157;
-                       goto yy169;
+                       if (yych == '\r') goto yy163;
+                       if (yych <= '#') goto yy156;
+                       goto yy168;
                } else {
                        if (yych <= '\\') {
-                               if (yych <= '[') goto yy157;
-                               goto yy161;
+                               if (yych <= '[') goto yy156;
+                               goto yy160;
                        } else {
-                               if (yych == '{') goto yy201;
-                               goto yy157;
+                               if (yych == '{') goto yy200;
+                               goto yy156;
                        }
                }
-yy198:
-               YYDEBUG(198, *YYCURSOR);
+yy197:
+               YYDEBUG(197, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
                if (yybm[0+yych] & 4) {
-                       goto yy157;
+                       goto yy156;
                }
                if (yych <= '@') {
-                       if (yych <= '\f') goto yy162;
-                       if (yych <= '\r') goto yy164;
+                       if (yych <= '\f') goto yy161;
+                       if (yych <= '\r') goto yy163;
                } else {
-                       if (yych == '\\') goto yy192;
-                       goto yy169;
+                       if (yych == '\\') goto yy191;
+                       goto yy168;
                }
-yy199:
-               YYDEBUG(199, *YYCURSOR);
-               yyaccept = 1;
+yy198:
+               YYDEBUG(198, *YYCURSOR);
+               yyaccept = 2;
                YYMARKER = ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(200, *YYCURSOR);
+               YYDEBUG(199, *YYCURSOR);
                if (yybm[0+yych] & 4) {
-                       goto yy157;
+                       goto yy156;
                }
                if (yych <= '@') {
-                       if (yych <= '\f') goto yy162;
-                       if (yych <= '\r') goto yy164;
-                       goto yy199;
+                       if (yych <= '\f') goto yy161;
+                       if (yych <= '\r') goto yy163;
+                       goto yy198;
                } else {
-                       if (yych == '\\') goto yy192;
-                       goto yy175;
+                       if (yych == '\\') goto yy191;
+                       goto yy174;
                }
-yy201:
-               YYDEBUG(201, *YYCURSOR);
-               yyaccept = 1;
+yy200:
+               YYDEBUG(200, *YYCURSOR);
+               yyaccept = 2;
                YYMARKER = ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(202, *YYCURSOR);
+               YYDEBUG(201, *YYCURSOR);
                if (yybm[0+yych] & 16) {
-                       goto yy162;
+                       goto yy161;
                }
                if (yych <= '$') {
-                       if (yych == '\r') goto yy164;
-                       if (yych <= '#') goto yy157;
-                       goto yy175;
+                       if (yych == '\r') goto yy163;
+                       if (yych <= '#') goto yy156;
+                       goto yy174;
                } else {
                        if (yych <= '\\') {
-                               if (yych <= '[') goto yy157;
-                               goto yy161;
+                               if (yych <= '[') goto yy156;
+                               goto yy160;
                        } else {
-                               if (yych == '{') goto yy201;
-                               goto yy157;
+                               if (yych == '{') goto yy200;
+                               goto yy156;
                        }
                }
-yy203:
-               YYDEBUG(203, *YYCURSOR);
-               ++YYCURSOR;
-               YYDEBUG(204, *YYCURSOR);
-               yyleng = YYCURSOR - SCNG(yy_text);
-#line 2562 "Zend/zend_language_scanner.l"
-               {
-       Z_LVAL_P(zendlval) = (long) '{';
-       yy_push_state(ST_IN_SCRIPTING TSRMLS_CC);
-       yyless(1);
-       return T_CURLY_OPEN;
-}
-#line 3558 "Zend/zend_language_scanner.c"
-yy205:
-               YYDEBUG(205, *YYCURSOR);
-               yyaccept = 2;
+yy202:
+               YYDEBUG(202, *YYCURSOR);
+               yyaccept = 3;
                YYMARKER = ++YYCURSOR;
                YYFILL(3);
                yych = *YYCURSOR;
-               YYDEBUG(206, *YYCURSOR);
+               YYDEBUG(203, *YYCURSOR);
                if (yych <= 'Z') {
                        if (yych <= '/') {
-                               if (yych == '-') goto yy210;
+                               if (yych == '-') goto yy207;
                        } else {
-                               if (yych <= '9') goto yy205;
-                               if (yych >= 'A') goto yy205;
+                               if (yych <= '9') goto yy202;
+                               if (yych >= 'A') goto yy202;
                        }
                } else {
                        if (yych <= '_') {
-                               if (yych <= '[') goto yy211;
-                               if (yych >= '_') goto yy205;
+                               if (yych <= '[') goto yy208;
+                               if (yych >= '_') goto yy202;
                        } else {
-                               if (yych <= '`') goto yy207;
-                               if (yych <= 'z') goto yy205;
-                               if (yych >= 0x7F) goto yy205;
+                               if (yych <= '`') goto yy204;
+                               if (yych <= 'z') goto yy202;
+                               if (yych >= 0x7F) goto yy202;
                        }
                }
-yy207:
-               YYDEBUG(207, *YYCURSOR);
+yy204:
+               YYDEBUG(204, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2226 "Zend/zend_language_scanner.l"
+#line 2230 "Zend/zend_language_scanner.l"
                {
        if (!zend_copy_scanner_string(zendlval, (yytext+1), (yyleng-1), UG(unicode)?IS_UNICODE:IS_STRING, SCNG(output_conv) TSRMLS_CC)) {
                return 0;
@@ -3592,34 +3607,35 @@ yy207:
        }
        return T_VARIABLE;
 }
-#line 3596 "Zend/zend_language_scanner.c"
-yy208:
-               YYDEBUG(208, *YYCURSOR);
+#line 3611 "Zend/zend_language_scanner.c"
+yy205:
+               YYDEBUG(205, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(209, *YYCURSOR);
+               YYDEBUG(206, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1836 "Zend/zend_language_scanner.l"
+#line 1839 "Zend/zend_language_scanner.l"
                {
        yy_push_state(ST_LOOKING_FOR_VARNAME TSRMLS_CC);
        return T_DOLLAR_OPEN_CURLY_BRACES;
 }
-#line 3607 "Zend/zend_language_scanner.c"
-yy210:
-               YYDEBUG(210, *YYCURSOR);
+#line 3622 "Zend/zend_language_scanner.c"
+yy207:
+               YYDEBUG(207, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == '>') goto yy213;
-               goto yy169;
-yy211:
-               YYDEBUG(211, *YYCURSOR);
+               if (yych == '>') goto yy210;
+               goto yy168;
+yy208:
+               YYDEBUG(208, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(212, *YYCURSOR);
+               YYDEBUG(209, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2213 "Zend/zend_language_scanner.l"
+#line 2216 "Zend/zend_language_scanner.l"
                {
-       yyless(yyleng - 1);
+       yyleng--;
+       yyless(yyleng);
        yy_push_state(ST_VAR_OFFSET TSRMLS_CC);
 
-       if (!zend_copy_scanner_string(zendlval, (yytext+1), (yyleng-2), UG(unicode)?IS_UNICODE:IS_STRING, SCNG(output_conv) TSRMLS_CC)) {
+       if (!zend_copy_scanner_string(zendlval, (yytext+1), (yyleng-1), UG(unicode)?IS_UNICODE:IS_STRING, SCNG(output_conv) TSRMLS_CC)) {
                return 0;
        }
        if (UG(unicode) && !zend_check_and_normalize_identifier(zendlval)) {
@@ -3627,30 +3643,31 @@ yy211:
        }
        return T_VARIABLE;
 }
-#line 3631 "Zend/zend_language_scanner.c"
-yy213:
-               YYDEBUG(213, *YYCURSOR);
+#line 3647 "Zend/zend_language_scanner.c"
+yy210:
+               YYDEBUG(210, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych <= '_') {
-                       if (yych <= '@') goto yy169;
-                       if (yych <= 'Z') goto yy214;
-                       if (yych <= '^') goto yy169;
+                       if (yych <= '@') goto yy168;
+                       if (yych <= 'Z') goto yy211;
+                       if (yych <= '^') goto yy168;
                } else {
-                       if (yych <= '`') goto yy169;
-                       if (yych <= 'z') goto yy214;
-                       if (yych <= '~') goto yy169;
+                       if (yych <= '`') goto yy168;
+                       if (yych <= 'z') goto yy211;
+                       if (yych <= '~') goto yy168;
                }
-yy214:
-               YYDEBUG(214, *YYCURSOR);
+yy211:
+               YYDEBUG(211, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(215, *YYCURSOR);
+               YYDEBUG(212, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2198 "Zend/zend_language_scanner.l"
+#line 2200 "Zend/zend_language_scanner.l"
                {
-       yyless(yyleng - 3);
+       yyleng -= 3;
+       yyless(yyleng);
        yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC);
 
-       if (!zend_copy_scanner_string(zendlval, (yytext+1), (yyleng-4), UG(unicode)?IS_UNICODE:IS_STRING, SCNG(output_conv) TSRMLS_CC)) {
+       if (!zend_copy_scanner_string(zendlval, (yytext+1), (yyleng-1), UG(unicode)?IS_UNICODE:IS_STRING, SCNG(output_conv) TSRMLS_CC)) {
                return 0;
        }
        if (UG(unicode) && !zend_check_and_normalize_identifier(zendlval)) {
@@ -3658,7 +3675,7 @@ yy214:
        }
        return T_VARIABLE;
 }
-#line 3662 "Zend/zend_language_scanner.c"
+#line 3679 "Zend/zend_language_scanner.c"
        }
 /* *********************************** */
 yyc_ST_IN_SCRIPTING:
@@ -3666,37 +3683,37 @@ yyc_ST_IN_SCRIPTING:
                static const unsigned char yybm[] = {
                        /* table 1 .. 8: 0 */
                          2,   2,   2,   2,   2,   2,   2,   2, 
-                         2, 138,  10,   2,   2,  10,   2,   2, 
+                         2, 194,  66,   2,   2,  66,   2,   2, 
                          2,   2,   2,   2,   2,   2,   2,   2, 
                          2,   2,   2,   2,   2,   2,   2,   2, 
-                       138,   2,   0,   2,   4,   2,   2,   2, 
+                       194,   2,   0,   2,   4,   2,   2,   2, 
                          2,   2,   2,   2,   2,   2,   2,   2, 
-                       114, 114, 114, 114, 114, 114, 114, 114
-                       114, 114,   2,   2,   2,   2,   2,   2, 
-                         2,  82,  82,  82,  82,  82,  82,  18
-                        18,  18,  18,  18,  18,  18,  18,  18
-                        18,  18,  18,  18,  18,  18,  18,  18
-                        18,  18,  18,   2,   0,   2,   2,  18
-                         2,  82,  82,  82,  82,  82,  82,  18
-                        18,  18,  18,  18,  18,  18,  18,  18
-                        18,  18,  18,  18,  18,  18,  18,  18
-                        18,  18,  18,   1,   2,   2,   2,  18
-                        18,  18,  18,  18,  18,  18,  18,  18
-                        18,  18,  18,  18,  18,  18,  18,  18
-                        18,  18,  18,  18,  18,  18,  18,  18
-                        18,  18,  18,  18,  18,  18,  18,  18
-                        18,  18,  18,  18,  18,  18,  18,  18
-                        18,  18,  18,  18,  18,  18,  18,  18
-                        18,  18,  18,  18,  18,  18,  18,  18
-                        18,  18,  18,  18,  18,  18,  18,  18
-                        18,  18,  18,  18,  18,  18,  18,  18
-                        18,  18,  18,  18,  18,  18,  18,  18
-                        18,  18,  18,  18,  18,  18,  18,  18
-                        18,  18,  18,  18,  18,  18,  18,  18
-                        18,  18,  18,  18,  18,  18,  18,  18
-                        18,  18,  18,  18,  18,  18,  18,  18
-                        18,  18,  18,  18,  18,  18,  18,  18
-                        18,  18,  18,  18,  18,  18,  18,  18
+                        58,  58,  58,  58,  58,  58,  58,  58
+                        58,  58,   2,   2,   2,   2,   2,   2, 
+                         2,  42,  42,  42,  42,  42,  42,  10
+                        10,  10,  10,  10,  10,  10,  10,  10
+                        10,  10,  10,  10,  10,  10,  10,  10
+                        10,  10,  10,   2,   0,   2,   2,  10
+                         2,  42,  42,  42,  42,  42,  42,  10
+                        10,  10,  10,  10,  10,  10,  10,  10
+                        10,  10,  10,  10,  10,  10,  10,  10
+                        10,  10,  10,   1,   2,   2,   2,  10
+                        10,  10,  10,  10,  10,  10,  10,  10
+                        10,  10,  10,  10,  10,  10,  10,  10
+                        10,  10,  10,  10,  10,  10,  10,  10
+                        10,  10,  10,  10,  10,  10,  10,  10
+                        10,  10,  10,  10,  10,  10,  10,  10
+                        10,  10,  10,  10,  10,  10,  10,  10
+                        10,  10,  10,  10,  10,  10,  10,  10
+                        10,  10,  10,  10,  10,  10,  10,  10
+                        10,  10,  10,  10,  10,  10,  10,  10
+                        10,  10,  10,  10,  10,  10,  10,  10
+                        10,  10,  10,  10,  10,  10,  10,  10
+                        10,  10,  10,  10,  10,  10,  10,  10
+                        10,  10,  10,  10,  10,  10,  10,  10
+                        10,  10,  10,  10,  10,  10,  10,  10
+                        10,  10,  10,  10,  10,  10,  10,  10
+                        10,  10,  10,  10,  10,  10,  10,  10
                        /* table 9 .. 9: 256 */
                        128, 128, 128, 128, 128, 128, 128, 128, 
                        128, 128, 128, 128, 128, 128, 128, 128, 
@@ -3731,7 +3748,7 @@ yyc_ST_IN_SCRIPTING:
                        128, 128, 128, 128, 128, 128, 128, 128, 
                        128, 128, 128, 128, 128, 128, 128, 128, 
                };
-               YYDEBUG(216, *YYCURSOR);
+               YYDEBUG(213, *YYCURSOR);
                YYFILL(16);
                yych = *YYCURSOR;
                YYDEBUG(-1, yych);
@@ -3765,32 +3782,32 @@ yyc_ST_IN_SCRIPTING:
                case 0x1D:
                case 0x1E:
                case 0x1F:
-               case '\\':      goto yy276;
+               case '\\':      goto yy273;
                case '\t':
                case '\n':
                case '\r':
-               case ' ':       goto yy266;
-               case '!':       goto yy243;
-               case '"':       goto yy270;
-               case '#':       goto yy268;
-               case '$':       goto yy255;
-               case '%':       goto yy249;
-               case '&':       goto yy250;
-               case '\'':      goto yy272;
-               case '(':       goto yy237;
+               case ' ':       goto yy231;
+               case '!':       goto yy242;
+               case '"':       goto yy267;
+               case '#':       goto yy265;
+               case '$':       goto yy254;
+               case '%':       goto yy248;
+               case '&':       goto yy249;
+               case '\'':      goto yy269;
+               case '(':       goto yy236;
                case ')':
                case ',':
                case ';':
                case '@':
                case '[':
                case ']':
-               case '~':       goto yy256;
-               case '*':       goto yy246;
-               case '+':       goto yy242;
-               case '-':       goto yy232;
-               case '.':       goto yy248;
-               case '/':       goto yy247;
-               case '0':       goto yy262;
+               case '~':       goto yy255;
+               case '*':       goto yy245;
+               case '+':       goto yy241;
+               case '-':       goto yy229;
+               case '.':       goto yy247;
+               case '/':       goto yy246;
+               case '0':       goto yy261;
                case '1':
                case '2':
                case '3':
@@ -3799,81 +3816,81 @@ yyc_ST_IN_SCRIPTING:
                case '6':
                case '7':
                case '8':
-               case '9':       goto yy264;
-               case ':':       goto yy234;
-               case '<':       goto yy244;
-               case '=':       goto yy240;
-               case '>':       goto yy245;
-               case '?':       goto yy257;
+               case '9':       goto yy263;
+               case ':':       goto yy233;
+               case '<':       goto yy243;
+               case '=':       goto yy239;
+               case '>':       goto yy244;
+               case '?':       goto yy256;
                case 'A':
-               case 'a':       goto yy227;
+               case 'a':       goto yy224;
                case 'B':
-               case 'b':       goto yy229;
+               case 'b':       goto yy226;
                case 'C':
-               case 'c':       goto yy222;
+               case 'c':       goto yy219;
                case 'D':
-               case 'd':       goto yy220;
+               case 'd':       goto yy217;
                case 'E':
-               case 'e':       goto yy218;
+               case 'e':       goto yy215;
                case 'F':
-               case 'f':       goto yy221;
+               case 'f':       goto yy218;
                case 'G':
-               case 'g':       goto yy230;
+               case 'g':       goto yy227;
                case 'I':
-               case 'i':       goto yy225;
+               case 'i':       goto yy222;
                case 'L':
-               case 'l':       goto yy241;
+               case 'l':       goto yy240;
                case 'N':
-               case 'n':       goto yy235;
+               case 'n':       goto yy234;
                case 'O':
-               case 'o':       goto yy253;
+               case 'o':       goto yy252;
                case 'P':
-               case 'p':       goto yy231;
+               case 'p':       goto yy228;
                case 'R':
-               case 'r':       goto yy223;
+               case 'r':       goto yy220;
                case 'S':
-               case 's':       goto yy228;
+               case 's':       goto yy225;
                case 'T':
-               case 't':       goto yy224;
+               case 't':       goto yy221;
                case 'U':
-               case 'u':       goto yy238;
+               case 'u':       goto yy237;
                case 'V':
-               case 'v':       goto yy236;
+               case 'v':       goto yy235;
                case 'W':
-               case 'w':       goto yy226;
+               case 'w':       goto yy223;
                case 'X':
-               case 'x':       goto yy254;
-               case '^':       goto yy252;
-               case '_':       goto yy239;
-               case '`':       goto yy274;
-               case '{':       goto yy258;
-               case '|':       goto yy251;
-               case '}':       goto yy260;
-               default:        goto yy265;
-               }
-yy218:
-               YYDEBUG(218, *YYCURSOR);
+               case 'x':       goto yy253;
+               case '^':       goto yy251;
+               case '_':       goto yy238;
+               case '`':       goto yy271;
+               case '{':       goto yy257;
+               case '|':       goto yy250;
+               case '}':       goto yy259;
+               default:        goto yy264;
+               }
+yy215:
+               YYDEBUG(215, *YYCURSOR);
                ++YYCURSOR;
                YYDEBUG(-1, yych);
                switch ((yych = *YYCURSOR)) {
                case 'C':
-               case 'c':       goto yy847;
+               case 'c':       goto yy844;
                case 'L':
-               case 'l':       goto yy848;
+               case 'l':       goto yy845;
                case 'M':
-               case 'm':       goto yy849;
+               case 'm':       goto yy846;
                case 'N':
-               case 'n':       goto yy850;
+               case 'n':       goto yy847;
                case 'V':
-               case 'v':       goto yy851;
+               case 'v':       goto yy848;
                case 'X':
-               case 'x':       goto yy852;
-               default:        goto yy296;
+               case 'x':       goto yy849;
+               default:        goto yy291;
                }
-yy219:
-               YYDEBUG(219, *YYCURSOR);
+yy216:
+               YYDEBUG(216, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2254 "Zend/zend_language_scanner.l"
+#line 2259 "Zend/zend_language_scanner.l"
                {
        if (!zend_copy_scanner_string(zendlval, yytext, yyleng, UG(unicode)?IS_UNICODE:IS_STRING, SCNG(output_conv) TSRMLS_CC)) {
                return 0;
@@ -3883,670 +3900,669 @@ yy219:
        }
        return T_STRING;
 }
-#line 3887 "Zend/zend_language_scanner.c"
-yy220:
-               YYDEBUG(220, *YYCURSOR);
+#line 3904 "Zend/zend_language_scanner.c"
+yy217:
+               YYDEBUG(217, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych <= 'O') {
                        if (yych <= 'H') {
-                               if (yych == 'E') goto yy829;
-                               goto yy296;
+                               if (yych == 'E') goto yy826;
+                               goto yy291;
                        } else {
-                               if (yych <= 'I') goto yy830;
-                               if (yych <= 'N') goto yy296;
-                               goto yy831;
+                               if (yych <= 'I') goto yy827;
+                               if (yych <= 'N') goto yy291;
+                               goto yy828;
                        }
                } else {
                        if (yych <= 'h') {
-                               if (yych == 'e') goto yy829;
-                               goto yy296;
+                               if (yych == 'e') goto yy826;
+                               goto yy291;
                        } else {
-                               if (yych <= 'i') goto yy830;
-                               if (yych == 'o') goto yy831;
-                               goto yy296;
+                               if (yych <= 'i') goto yy827;
+                               if (yych == 'o') goto yy828;
+                               goto yy291;
                        }
                }
-yy221:
-               YYDEBUG(221, *YYCURSOR);
+yy218:
+               YYDEBUG(218, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych <= 'U') {
                        if (yych <= 'N') {
-                               if (yych == 'I') goto yy808;
-                               goto yy296;
+                               if (yych == 'I') goto yy805;
+                               goto yy291;
                        } else {
-                               if (yych <= 'O') goto yy809;
-                               if (yych <= 'T') goto yy296;
-                               goto yy810;
+                               if (yych <= 'O') goto yy806;
+                               if (yych <= 'T') goto yy291;
+                               goto yy807;
                        }
                } else {
                        if (yych <= 'n') {
-                               if (yych == 'i') goto yy808;
-                               goto yy296;
+                               if (yych == 'i') goto yy805;
+                               goto yy291;
                        } else {
-                               if (yych <= 'o') goto yy809;
-                               if (yych == 'u') goto yy810;
-                               goto yy296;
+                               if (yych <= 'o') goto yy806;
+                               if (yych == 'u') goto yy807;
+                               goto yy291;
                        }
                }
-yy222:
-               YYDEBUG(222, *YYCURSOR);
+yy219:
+               YYDEBUG(219, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych <= 'O') {
                        if (yych <= 'K') {
-                               if (yych == 'A') goto yy780;
-                               goto yy296;
+                               if (yych == 'A') goto yy777;
+                               goto yy291;
                        } else {
-                               if (yych <= 'L') goto yy781;
-                               if (yych <= 'N') goto yy296;
-                               goto yy782;
+                               if (yych <= 'L') goto yy778;
+                               if (yych <= 'N') goto yy291;
+                               goto yy779;
                        }
                } else {
                        if (yych <= 'k') {
-                               if (yych == 'a') goto yy780;
-                               goto yy296;
+                               if (yych == 'a') goto yy777;
+                               goto yy291;
                        } else {
-                               if (yych <= 'l') goto yy781;
-                               if (yych == 'o') goto yy782;
-                               goto yy296;
+                               if (yych <= 'l') goto yy778;
+                               if (yych == 'o') goto yy779;
+                               goto yy291;
                        }
                }
-yy223:
-               YYDEBUG(223, *YYCURSOR);
+yy220:
+               YYDEBUG(220, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'E') goto yy762;
-               if (yych == 'e') goto yy762;
-               goto yy296;
-yy224:
-               YYDEBUG(224, *YYCURSOR);
+               if (yych == 'E') goto yy759;
+               if (yych == 'e') goto yy759;
+               goto yy291;
+yy221:
+               YYDEBUG(221, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych <= 'R') {
-                       if (yych == 'H') goto yy754;
-                       if (yych <= 'Q') goto yy296;
-                       goto yy755;
+                       if (yych == 'H') goto yy751;
+                       if (yych <= 'Q') goto yy291;
+                       goto yy752;
                } else {
                        if (yych <= 'h') {
-                               if (yych <= 'g') goto yy296;
-                               goto yy754;
+                               if (yych <= 'g') goto yy291;
+                               goto yy751;
                        } else {
-                               if (yych == 'r') goto yy755;
-                               goto yy296;
+                               if (yych == 'r') goto yy752;
+                               goto yy291;
                        }
                }
-yy225:
-               YYDEBUG(225, *YYCURSOR);
+yy222:
+               YYDEBUG(222, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych <= 'S') {
                        if (yych <= 'L') {
-                               if (yych == 'F') goto yy707;
-                               goto yy296;
+                               if (yych == 'F') goto yy704;
+                               goto yy291;
                        } else {
-                               if (yych <= 'M') goto yy709;
-                               if (yych <= 'N') goto yy710;
-                               if (yych <= 'R') goto yy296;
-                               goto yy711;
+                               if (yych <= 'M') goto yy706;
+                               if (yych <= 'N') goto yy707;
+                               if (yych <= 'R') goto yy291;
+                               goto yy708;
                        }
                } else {
                        if (yych <= 'm') {
-                               if (yych == 'f') goto yy707;
-                               if (yych <= 'l') goto yy296;
-                               goto yy709;
+                               if (yych == 'f') goto yy704;
+                               if (yych <= 'l') goto yy291;
+                               goto yy706;
                        } else {
-                               if (yych <= 'n') goto yy710;
-                               if (yych == 's') goto yy711;
-                               goto yy296;
+                               if (yych <= 'n') goto yy707;
+                               if (yych == 's') goto yy708;
+                               goto yy291;
                        }
                }
-yy226:
-               YYDEBUG(226, *YYCURSOR);
+yy223:
+               YYDEBUG(223, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'H') goto yy702;
-               if (yych == 'h') goto yy702;
-               goto yy296;
-yy227:
-               YYDEBUG(227, *YYCURSOR);
+               if (yych == 'H') goto yy699;
+               if (yych == 'h') goto yy699;
+               goto yy291;
+yy224:
+               YYDEBUG(224, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych <= 'S') {
                        if (yych <= 'M') {
-                               if (yych == 'B') goto yy684;
-                               goto yy296;
+                               if (yych == 'B') goto yy681;
+                               goto yy291;
                        } else {
-                               if (yych <= 'N') goto yy685;
-                               if (yych <= 'Q') goto yy296;
-                               if (yych <= 'R') goto yy686;
-                               goto yy687;
+                               if (yych <= 'N') goto yy682;
+                               if (yych <= 'Q') goto yy291;
+                               if (yych <= 'R') goto yy683;
+                               goto yy684;
                        }
                } else {
                        if (yych <= 'n') {
-                               if (yych == 'b') goto yy684;
-                               if (yych <= 'm') goto yy296;
-                               goto yy685;
+                               if (yych == 'b') goto yy681;
+                               if (yych <= 'm') goto yy291;
+                               goto yy682;
                        } else {
-                               if (yych <= 'q') goto yy296;
-                               if (yych <= 'r') goto yy686;
-                               if (yych <= 's') goto yy687;
-                               goto yy296;
+                               if (yych <= 'q') goto yy291;
+                               if (yych <= 'r') goto yy683;
+                               if (yych <= 's') goto yy684;
+                               goto yy291;
                        }
                }
-yy228:
-               YYDEBUG(228, *YYCURSOR);
+yy225:
+               YYDEBUG(225, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych <= 'W') {
-                       if (yych == 'T') goto yy672;
-                       if (yych <= 'V') goto yy296;
-                       goto yy673;
+                       if (yych == 'T') goto yy669;
+                       if (yych <= 'V') goto yy291;
+                       goto yy670;
                } else {
                        if (yych <= 't') {
-                               if (yych <= 's') goto yy296;
-                               goto yy672;
+                               if (yych <= 's') goto yy291;
+                               goto yy669;
                        } else {
-                               if (yych == 'w') goto yy673;
-                               goto yy296;
+                               if (yych == 'w') goto yy670;
+                               goto yy291;
                        }
                }
-yy229:
-               YYDEBUG(229, *YYCURSOR);
+yy226:
+               YYDEBUG(226, *YYCURSOR);
                yyaccept = 0;
                yych = *(YYMARKER = ++YYCURSOR);
                if (yych <= 'Q') {
                        if (yych <= '/') {
                                if (yych <= '"') {
-                                       if (yych <= '!') goto yy219;
-                                       goto yy638;
+                                       if (yych <= '!') goto yy216;
+                                       goto yy635;
                                } else {
-                                       if (yych == '\'') goto yy640;
-                                       goto yy219;
+                                       if (yych == '\'') goto yy637;
+                                       goto yy216;
                                }
                        } else {
                                if (yych <= ';') {
-                                       if (yych <= '9') goto yy295;
-                                       goto yy219;
+                                       if (yych <= '9') goto yy290;
+                                       goto yy216;
                                } else {
-                                       if (yych <= '<') goto yy637;
-                                       if (yych <= '@') goto yy219;
-                                       goto yy295;
+                                       if (yych <= '<') goto yy634;
+                                       if (yych <= '@') goto yy216;
+                                       goto yy290;
                                }
                        }
                } else {
                        if (yych <= '`') {
                                if (yych <= 'Z') {
-                                       if (yych <= 'R') goto yy642;
-                                       goto yy295;
+                                       if (yych <= 'R') goto yy639;
+                                       goto yy290;
                                } else {
-                                       if (yych == '_') goto yy295;
-                                       goto yy219;
+                                       if (yych == '_') goto yy290;
+                                       goto yy216;
                                }
                        } else {
                                if (yych <= 'r') {
-                                       if (yych <= 'q') goto yy295;
-                                       goto yy642;
+                                       if (yych <= 'q') goto yy290;
+                                       goto yy639;
                                } else {
-                                       if (yych <= 'z') goto yy295;
-                                       if (yych <= '~') goto yy219;
-                                       goto yy295;
+                                       if (yych <= 'z') goto yy290;
+                                       if (yych <= '~') goto yy216;
+                                       goto yy290;
                                }
                        }
                }
-yy230:
-               YYDEBUG(230, *YYCURSOR);
+yy227:
+               YYDEBUG(227, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych <= 'O') {
-                       if (yych == 'L') goto yy627;
-                       if (yych <= 'N') goto yy296;
-                       goto yy628;
+                       if (yych == 'L') goto yy624;
+                       if (yych <= 'N') goto yy291;
+                       goto yy625;
                } else {
                        if (yych <= 'l') {
-                               if (yych <= 'k') goto yy296;
-                               goto yy627;
+                               if (yych <= 'k') goto yy291;
+                               goto yy624;
                        } else {
-                               if (yych == 'o') goto yy628;
-                               goto yy296;
+                               if (yych == 'o') goto yy625;
+                               goto yy291;
                        }
                }
-yy231:
-               YYDEBUG(231, *YYCURSOR);
+yy228:
+               YYDEBUG(228, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych <= 'U') {
-                       if (yych == 'R') goto yy603;
-                       if (yych <= 'T') goto yy296;
-                       goto yy604;
+                       if (yych == 'R') goto yy600;
+                       if (yych <= 'T') goto yy291;
+                       goto yy601;
                } else {
                        if (yych <= 'r') {
-                               if (yych <= 'q') goto yy296;
-                               goto yy603;
+                               if (yych <= 'q') goto yy291;
+                               goto yy600;
                        } else {
-                               if (yych == 'u') goto yy604;
-                               goto yy296;
+                               if (yych == 'u') goto yy601;
+                               goto yy291;
                        }
                }
-yy232:
-               YYDEBUG(232, *YYCURSOR);
+yy229:
+               YYDEBUG(229, *YYCURSOR);
                ++YYCURSOR;
                if ((yych = *YYCURSOR) <= '<') {
-                       if (yych == '-') goto yy599;
+                       if (yych == '-') goto yy596;
                } else {
-                       if (yych <= '=') goto yy597;
-                       if (yych <= '>') goto yy601;
+                       if (yych <= '=') goto yy594;
+                       if (yych <= '>') goto yy598;
                }
-yy233:
-               YYDEBUG(233, *YYCURSOR);
+yy230:
+               YYDEBUG(230, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1825 "Zend/zend_language_scanner.l"
+#line 1828 "Zend/zend_language_scanner.l"
                {
        return yytext[0];
 }
-#line 4138 "Zend/zend_language_scanner.c"
+#line 4155 "Zend/zend_language_scanner.c"
+yy231:
+               YYDEBUG(231, *YYCURSOR);
+               ++YYCURSOR;
+               yych = *YYCURSOR;
+               goto yy593;
+yy232:
+               YYDEBUG(232, *YYCURSOR);
+               yyleng = YYCURSOR - SCNG(yy_text);
+#line 1559 "Zend/zend_language_scanner.l"
+               {
+       Z_STRVAL_P(zendlval) = yytext; /* no copying - intentional */
+       Z_STRLEN_P(zendlval) = yyleng;
+       Z_TYPE_P(zendlval) = IS_STRING;
+       HANDLE_NEWLINES(yytext, yyleng);
+       return T_WHITESPACE;
+}
+#line 4172 "Zend/zend_language_scanner.c"
+yy233:
+               YYDEBUG(233, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == ':') goto yy590;
+               goto yy230;
 yy234:
                YYDEBUG(234, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == ':') goto yy595;
-               goto yy233;
-yy235:
-               YYDEBUG(235, *YYCURSOR);
-               yych = *++YYCURSOR;
                if (yych <= 'E') {
-                       if (yych == 'A') goto yy583;
-                       if (yych <= 'D') goto yy296;
-                       goto yy584;
+                       if (yych == 'A') goto yy578;
+                       if (yych <= 'D') goto yy291;
+                       goto yy579;
                } else {
                        if (yych <= 'a') {
-                               if (yych <= '`') goto yy296;
-                               goto yy583;
+                               if (yych <= '`') goto yy291;
+                               goto yy578;
                        } else {
-                               if (yych == 'e') goto yy584;
-                               goto yy296;
+                               if (yych == 'e') goto yy579;
+                               goto yy291;
                        }
                }
+yy235:
+               YYDEBUG(235, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'A') goto yy575;
+               if (yych == 'a') goto yy575;
+               goto yy291;
 yy236:
                YYDEBUG(236, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'A') goto yy580;
-               if (yych == 'a') goto yy580;
-               goto yy296;
-yy237:
-               YYDEBUG(237, *YYCURSOR);
                yyaccept = 1;
                yych = *(YYMARKER = ++YYCURSOR);
                if (yych <= 'S') {
                        if (yych <= 'D') {
                                if (yych <= ' ') {
-                                       if (yych == '\t') goto yy493;
-                                       if (yych <= 0x1F) goto yy233;
-                                       goto yy493;
+                                       if (yych == '\t') goto yy488;
+                                       if (yych <= 0x1F) goto yy230;
+                                       goto yy488;
                                } else {
-                                       if (yych <= '@') goto yy233;
-                                       if (yych == 'C') goto yy233;
-                                       goto yy493;
+                                       if (yych <= '@') goto yy230;
+                                       if (yych == 'C') goto yy230;
+                                       goto yy488;
                                }
                        } else {
                                if (yych <= 'I') {
-                                       if (yych == 'F') goto yy493;
-                                       if (yych <= 'H') goto yy233;
-                                       goto yy493;
+                                       if (yych == 'F') goto yy488;
+                                       if (yych <= 'H') goto yy230;
+                                       goto yy488;
                                } else {
-                                       if (yych == 'O') goto yy493;
-                                       if (yych <= 'Q') goto yy233;
-                                       goto yy493;
+                                       if (yych == 'O') goto yy488;
+                                       if (yych <= 'Q') goto yy230;
+                                       goto yy488;
                                }
                        }
                } else {
                        if (yych <= 'f') {
                                if (yych <= 'b') {
-                                       if (yych == 'U') goto yy493;
-                                       if (yych <= '`') goto yy233;
-                                       goto yy493;
+                                       if (yych == 'U') goto yy488;
+                                       if (yych <= '`') goto yy230;
+                                       goto yy488;
                                } else {
-                                       if (yych == 'd') goto yy493;
-                                       if (yych <= 'e') goto yy233;
-                                       goto yy493;
+                                       if (yych == 'd') goto yy488;
+                                       if (yych <= 'e') goto yy230;
+                                       goto yy488;
                                }
                        } else {
                                if (yych <= 'o') {
-                                       if (yych == 'i') goto yy493;
-                                       if (yych <= 'n') goto yy233;
-                                       goto yy493;
+                                       if (yych == 'i') goto yy488;
+                                       if (yych <= 'n') goto yy230;
+                                       goto yy488;
                                } else {
                                        if (yych <= 's') {
-                                               if (yych <= 'q') goto yy233;
-                                               goto yy493;
+                                               if (yych <= 'q') goto yy230;
+                                               goto yy488;
                                        } else {
-                                               if (yych == 'u') goto yy493;
-                                               goto yy233;
+                                               if (yych == 'u') goto yy488;
+                                               goto yy230;
                                        }
                                }
                        }
                }
-yy238:
-               YYDEBUG(238, *YYCURSOR);
+yy237:
+               YYDEBUG(237, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych <= 'S') {
-                       if (yych == 'N') goto yy484;
-                       if (yych <= 'R') goto yy296;
-                       goto yy485;
+                       if (yych == 'N') goto yy479;
+                       if (yych <= 'R') goto yy291;
+                       goto yy480;
                } else {
                        if (yych <= 'n') {
-                               if (yych <= 'm') goto yy296;
-                               goto yy484;
+                               if (yych <= 'm') goto yy291;
+                               goto yy479;
                        } else {
-                               if (yych == 's') goto yy485;
-                               goto yy296;
+                               if (yych == 's') goto yy480;
+                               goto yy291;
                        }
                }
+yy238:
+               YYDEBUG(238, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == '_') goto yy405;
+               goto yy291;
 yy239:
                YYDEBUG(239, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == '_') goto yy410;
-               goto yy296;
+               if (yych <= '<') goto yy230;
+               if (yych <= '=') goto yy399;
+               if (yych <= '>') goto yy401;
+               goto yy230;
 yy240:
                YYDEBUG(240, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych <= '<') goto yy233;
-               if (yych <= '=') goto yy404;
-               if (yych <= '>') goto yy406;
-               goto yy233;
+               if (yych == 'I') goto yy395;
+               if (yych == 'i') goto yy395;
+               goto yy291;
 yy241:
                YYDEBUG(241, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'I') goto yy400;
-               if (yych == 'i') goto yy400;
-               goto yy296;
+               if (yych == '+') goto yy393;
+               if (yych == '=') goto yy391;
+               goto yy230;
 yy242:
                YYDEBUG(242, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == '+') goto yy398;
-               if (yych == '=') goto yy396;
-               goto yy233;
+               if (yych == '=') goto yy388;
+               goto yy230;
 yy243:
                YYDEBUG(243, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == '=') goto yy393;
-               goto yy233;
-yy244:
-               YYDEBUG(244, *YYCURSOR);
                yyaccept = 1;
                yych = *(YYMARKER = ++YYCURSOR);
                if (yych <= ';') {
-                       if (yych == '/') goto yy361;
-                       goto yy233;
+                       if (yych == '/') goto yy356;
+                       goto yy230;
                } else {
-                       if (yych <= '<') goto yy359;
-                       if (yych <= '=') goto yy362;
-                       if (yych <= '>') goto yy364;
-                       goto yy233;
+                       if (yych <= '<') goto yy354;
+                       if (yych <= '=') goto yy357;
+                       if (yych <= '>') goto yy359;
+                       goto yy230;
                }
+yy244:
+               YYDEBUG(244, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych <= '<') goto yy230;
+               if (yych <= '=') goto yy350;
+               if (yych <= '>') goto yy348;
+               goto yy230;
 yy245:
                YYDEBUG(245, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych <= '<') goto yy233;
-               if (yych <= '=') goto yy355;
-               if (yych <= '>') goto yy353;
-               goto yy233;
+               if (yych == '=') goto yy346;
+               goto yy230;
 yy246:
                YYDEBUG(246, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == '=') goto yy351;
-               goto yy233;
-yy247:
-               YYDEBUG(247, *YYCURSOR);
-               yych = *++YYCURSOR;
                if (yych <= '.') {
-                       if (yych == '*') goto yy342;
-                       goto yy233;
+                       if (yych == '*') goto yy337;
+                       goto yy230;
                } else {
-                       if (yych <= '/') goto yy344;
-                       if (yych == '=') goto yy345;
-                       goto yy233;
+                       if (yych <= '/') goto yy339;
+                       if (yych == '=') goto yy340;
+                       goto yy230;
                }
+yy247:
+               YYDEBUG(247, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych <= '/') goto yy230;
+               if (yych <= '9') goto yy333;
+               if (yych == '=') goto yy335;
+               goto yy230;
 yy248:
                YYDEBUG(248, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych <= '/') goto yy233;
-               if (yych <= '9') goto yy338;
-               if (yych == '=') goto yy340;
-               goto yy233;
+               if (yych <= '<') goto yy230;
+               if (yych <= '=') goto yy329;
+               if (yych <= '>') goto yy327;
+               goto yy230;
 yy249:
                YYDEBUG(249, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych <= '<') goto yy233;
-               if (yych <= '=') goto yy334;
-               if (yych <= '>') goto yy332;
-               goto yy233;
+               if (yych == '&') goto yy323;
+               if (yych == '=') goto yy325;
+               goto yy230;
 yy250:
                YYDEBUG(250, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == '&') goto yy328;
-               if (yych == '=') goto yy330;
-               goto yy233;
+               if (yych == '=') goto yy321;
+               if (yych == '|') goto yy319;
+               goto yy230;
 yy251:
                YYDEBUG(251, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == '=') goto yy326;
-               if (yych == '|') goto yy324;
-               goto yy233;
+               if (yych == '=') goto yy317;
+               goto yy230;
 yy252:
                YYDEBUG(252, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == '=') goto yy322;
-               goto yy233;
+               if (yych == 'R') goto yy315;
+               if (yych == 'r') goto yy315;
+               goto yy291;
 yy253:
                YYDEBUG(253, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'R') goto yy320;
-               if (yych == 'r') goto yy320;
-               goto yy296;
+               if (yych == 'O') goto yy312;
+               if (yych == 'o') goto yy312;
+               goto yy291;
 yy254:
                YYDEBUG(254, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'O') goto yy317;
-               if (yych == 'o') goto yy317;
-               goto yy296;
-yy255:
-               YYDEBUG(255, *YYCURSOR);
-               yych = *++YYCURSOR;
                if (yych <= '_') {
-                       if (yych <= '@') goto yy233;
-                       if (yych <= 'Z') goto yy314;
-                       if (yych <= '^') goto yy233;
-                       goto yy314;
+                       if (yych <= '@') goto yy230;
+                       if (yych <= 'Z') goto yy309;
+                       if (yych <= '^') goto yy230;
+                       goto yy309;
                } else {
-                       if (yych <= '`') goto yy233;
-                       if (yych <= 'z') goto yy314;
-                       if (yych <= '~') goto yy233;
-                       goto yy314;
+                       if (yych <= '`') goto yy230;
+                       if (yych <= 'z') goto yy309;
+                       if (yych <= '~') goto yy230;
+                       goto yy309;
                }
+yy255:
+               YYDEBUG(255, *YYCURSOR);
+               yych = *++YYCURSOR;
+               goto yy230;
 yy256:
                YYDEBUG(256, *YYCURSOR);
                yych = *++YYCURSOR;
-               goto yy233;
+               if (yych == '>') goto yy305;
+               goto yy230;
 yy257:
                YYDEBUG(257, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == '>') goto yy310;
-               goto yy233;
-yy258:
-               YYDEBUG(258, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(259, *YYCURSOR);
+               YYDEBUG(258, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1830 "Zend/zend_language_scanner.l"
+#line 1833 "Zend/zend_language_scanner.l"
                {
        yy_push_state(ST_IN_SCRIPTING TSRMLS_CC);
        return '{';
 }
-#line 4376 "Zend/zend_language_scanner.c"
-yy260:
-               YYDEBUG(260, *YYCURSOR);
+#line 4410 "Zend/zend_language_scanner.c"
+yy259:
+               YYDEBUG(259, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(261, *YYCURSOR);
+               YYDEBUG(260, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1842 "Zend/zend_language_scanner.l"
+#line 1845 "Zend/zend_language_scanner.l"
                {
        RESET_DOC_COMMENT();
-       /* This is a temporary fix which is dependant on flex and it's implementation */
        if (!zend_stack_is_empty(&SCNG(state_stack))) {
                yy_pop_state(TSRMLS_C);
        }
        return '}';
 }
-#line 4391 "Zend/zend_language_scanner.c"
-yy262:
-               YYDEBUG(262, *YYCURSOR);
+#line 4424 "Zend/zend_language_scanner.c"
+yy261:
+               YYDEBUG(261, *YYCURSOR);
                yyaccept = 2;
                yych = *(YYMARKER = ++YYCURSOR);
                if (yych <= 'E') {
                        if (yych <= '/') {
-                               if (yych == '.') goto yy297;
+                               if (yych == '.') goto yy292;
                        } else {
-                               if (yych <= '9') goto yy300;
-                               if (yych >= 'E') goto yy302;
+                               if (yych <= '9') goto yy295;
+                               if (yych >= 'E') goto yy297;
                        }
                } else {
                        if (yych <= 'd') {
-                               if (yych == 'X') goto yy306;
+                               if (yych == 'X') goto yy301;
                        } else {
-                               if (yych <= 'e') goto yy302;
-                               if (yych == 'x') goto yy306;
+                               if (yych <= 'e') goto yy297;
+                               if (yych == 'x') goto yy301;
                        }
                }
-yy263:
-               YYDEBUG(263, *YYCURSOR);
+yy262:
+               YYDEBUG(262, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1873 "Zend/zend_language_scanner.l"
-               {
-    if (yyleng < MAX_LENGTH_OF_LONG - 1) { /* Won't overflow */
-        zendlval->value.lval = strtol(yytext, NULL, 0);
-    } else {
-        errno = 0;
-        zendlval->value.lval = strtol(yytext, NULL, 0);
-        if (errno == ERANGE) { /* Overflow */
-            if (yytext[0] == '0') { /* octal overflow */
-                zendlval->value.dval = zend_oct_strtod(yytext, NULL);
-            } else {
-                zendlval->value.dval = zend_strtod(yytext, NULL);
-            }
-            zendlval->type = IS_DOUBLE;
-            return T_DNUMBER;
-        }
-    }
+#line 1875 "Zend/zend_language_scanner.l"
+               {
+       if (yyleng < MAX_LENGTH_OF_LONG - 1) { /* Won't overflow */
+               Z_LVAL_P(zendlval) = strtol(yytext, NULL, 0);
+       } else {
+               errno = 0;
+               Z_LVAL_P(zendlval) = strtol(yytext, NULL, 0);
+               if (errno == ERANGE) { /* Overflow */
+                       if (yytext[0] == '0') { /* octal overflow */
+                               Z_DVAL_P(zendlval) = zend_oct_strtod(yytext, NULL);
+                       } else {
+                               Z_DVAL_P(zendlval) = zend_strtod(yytext, NULL);
+                       }
+                       Z_TYPE_P(zendlval) = IS_DOUBLE;
+                       return T_DNUMBER;
+               }
+       }
 
-    zendlval->type = IS_LONG;
-    return T_LNUMBER;
+       Z_TYPE_P(zendlval) = IS_LONG;
+       return T_LNUMBER;
 }
-#line 4435 "Zend/zend_language_scanner.c"
-yy264:
-               YYDEBUG(264, *YYCURSOR);
+#line 4468 "Zend/zend_language_scanner.c"
+yy263:
+               YYDEBUG(263, *YYCURSOR);
                yyaccept = 2;
                yych = *(YYMARKER = ++YYCURSOR);
                if (yych <= '9') {
-                       if (yych == '.') goto yy297;
-                       if (yych <= '/') goto yy263;
-                       goto yy300;
+                       if (yych == '.') goto yy292;
+                       if (yych <= '/') goto yy262;
+                       goto yy295;
                } else {
                        if (yych <= 'E') {
-                               if (yych <= 'D') goto yy263;
-                               goto yy302;
+                               if (yych <= 'D') goto yy262;
+                               goto yy297;
                        } else {
-                               if (yych == 'e') goto yy302;
-                               goto yy263;
+                               if (yych == 'e') goto yy297;
+                               goto yy262;
                        }
                }
+yy264:
+               YYDEBUG(264, *YYCURSOR);
+               yych = *++YYCURSOR;
+               goto yy291;
 yy265:
                YYDEBUG(265, *YYCURSOR);
-               yych = *++YYCURSOR;
-               goto yy296;
+               ++YYCURSOR;
 yy266:
                YYDEBUG(266, *YYCURSOR);
-               ++YYCURSOR;
-               yych = *YYCURSOR;
-               goto yy294;
-yy267:
-               YYDEBUG(267, *YYCURSOR);
-               yyleng = YYCURSOR - SCNG(yy_text);
-#line 2272 "Zend/zend_language_scanner.l"
-               {
-       Z_STRVAL_P(zendlval) = yytext; /* no copying - intentional */
-       Z_STRLEN_P(zendlval) = yyleng;
-       Z_TYPE_P(zendlval) = IS_STRING;
-       HANDLE_NEWLINES(yytext, yyleng);
-       return T_WHITESPACE;
-}
-#line 4473 "Zend/zend_language_scanner.c"
-yy268:
-               YYDEBUG(268, *YYCURSOR);
-               ++YYCURSOR;
-yy269:
-               YYDEBUG(269, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2281 "Zend/zend_language_scanner.l"
+#line 2277 "Zend/zend_language_scanner.l"
                {
        BEGIN(ST_ONE_LINE_COMMENT);
        yymore();
 }
-#line 4485 "Zend/zend_language_scanner.c"
-yy270:
-               YYDEBUG(270, *YYCURSOR);
+#line 4501 "Zend/zend_language_scanner.c"
+yy267:
+               YYDEBUG(267, *YYCURSOR);
                yyaccept = 3;
                yych = *(YYMARKER = ++YYCURSOR);
-               goto yy286;
-yy271:
-               YYDEBUG(271, *YYCURSOR);
+               goto yy283;
+yy268:
+               YYDEBUG(268, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2429 "Zend/zend_language_scanner.l"
+#line 2424 "Zend/zend_language_scanner.l"
                {
        BEGIN(ST_DOUBLE_QUOTES);
        return '"';
 }
-#line 4499 "Zend/zend_language_scanner.c"
-yy272:
-               YYDEBUG(272, *YYCURSOR);
+#line 4515 "Zend/zend_language_scanner.c"
+yy269:
+               YYDEBUG(269, *YYCURSOR);
                yyaccept = 4;
                yych = *(YYMARKER = ++YYCURSOR);
-               goto yy278;
-yy273:
-               YYDEBUG(273, *YYCURSOR);
+               goto yy275;
+yy270:
+               YYDEBUG(270, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2761 "Zend/zend_language_scanner.l"
+#line 2777 "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 4513 "Zend/zend_language_scanner.c"
-yy274:
-               YYDEBUG(274, *YYCURSOR);
+#line 4529 "Zend/zend_language_scanner.c"
+yy271:
+               YYDEBUG(271, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(275, *YYCURSOR);
+               YYDEBUG(272, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2471 "Zend/zend_language_scanner.l"
+#line 2476 "Zend/zend_language_scanner.l"
                {
        BEGIN(ST_BACKQUOTE);
        return '`';
 }
-#line 4524 "Zend/zend_language_scanner.c"
-yy276:
-               YYDEBUG(276, *YYCURSOR);
+#line 4540 "Zend/zend_language_scanner.c"
+yy273:
+               YYDEBUG(273, *YYCURSOR);
                yych = *++YYCURSOR;
-               goto yy273;
-yy277:
-               YYDEBUG(277, *YYCURSOR);
+               goto yy270;
+yy274:
+               YYDEBUG(274, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-yy278:
-               YYDEBUG(278, *YYCURSOR);
+yy275:
+               YYDEBUG(275, *YYCURSOR);
                if (yybm[256+yych] & 128) {
-                       goto yy277;
+                       goto yy274;
                }
-               if (yych <= '[') goto yy280;
-               YYDEBUG(279, *YYCURSOR);
+               if (yych <= '[') goto yy277;
+               YYDEBUG(276, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               goto yy277;
-yy280:
-               YYDEBUG(280, *YYCURSOR);
+               goto yy274;
+yy277:
+               YYDEBUG(277, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(281, *YYCURSOR);
+               YYDEBUG(278, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2413 "Zend/zend_language_scanner.l"
+#line 2408 "Zend/zend_language_scanner.l"
                {
        if (UG(unicode)) {
                return zend_scan_unicode_single_string(zendlval TSRMLS_CC);
@@ -4555,108 +4571,108 @@ yy280:
                return T_CONSTANT_ENCAPSED_STRING;
        }
 }
-#line 4559 "Zend/zend_language_scanner.c"
-yy282:
-               YYDEBUG(282, *YYCURSOR);
+#line 4575 "Zend/zend_language_scanner.c"
+yy279:
+               YYDEBUG(279, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(283, *YYCURSOR);
+               YYDEBUG(280, *YYCURSOR);
                if (yybm[0+yych] & 2) {
-                       goto yy285;
+                       goto yy282;
                }
-               if (yych <= '#') goto yy290;
-               if (yych <= '$') goto yy284;
-               if (yych <= 'z') goto yy287;
-               goto yy282;
-yy284:
-               YYDEBUG(284, *YYCURSOR);
+               if (yych <= '#') goto yy287;
+               if (yych <= '$') goto yy281;
+               if (yych <= 'z') goto yy284;
+               goto yy279;
+yy281:
+               YYDEBUG(281, *YYCURSOR);
                YYCURSOR = YYMARKER;
                if (yyaccept <= 4) {
                        if (yyaccept <= 2) {
                                if (yyaccept <= 1) {
                                        if (yyaccept <= 0) {
-                                               goto yy219;
+                                               goto yy216;
                                        } else {
-                                               goto yy233;
+                                               goto yy230;
                                        }
                                } else {
-                                       goto yy263;
+                                       goto yy262;
                                }
                        } else {
                                if (yyaccept <= 3) {
-                                       goto yy271;
+                                       goto yy268;
                                } else {
-                                       goto yy273;
+                                       goto yy270;
                                }
                        }
                } else {
                        if (yyaccept <= 6) {
                                if (yyaccept <= 5) {
-                                       goto yy299;
+                                       goto yy294;
                                } else {
-                                       goto yy343;
+                                       goto yy338;
                                }
                        } else {
                                if (yyaccept <= 7) {
-                                       goto yy360;
+                                       goto yy355;
                                } else {
-                                       goto yy639;
+                                       goto yy636;
                                }
                        }
                }
-yy285:
-               YYDEBUG(285, *YYCURSOR);
+yy282:
+               YYDEBUG(282, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-yy286:
-               YYDEBUG(286, *YYCURSOR);
+yy283:
+               YYDEBUG(283, *YYCURSOR);
                if (yybm[0+yych] & 2) {
-                       goto yy285;
+                       goto yy282;
                }
-               if (yych <= '#') goto yy290;
-               if (yych <= '$') goto yy288;
-               if (yych >= '{') goto yy282;
-yy287:
-               YYDEBUG(287, *YYCURSOR);
+               if (yych <= '#') goto yy287;
+               if (yych <= '$') goto yy285;
+               if (yych >= '{') goto yy279;
+yy284:
+               YYDEBUG(284, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               goto yy285;
-yy288:
-               YYDEBUG(288, *YYCURSOR);
+               goto yy282;
+yy285:
+               YYDEBUG(285, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(289, *YYCURSOR);
+               YYDEBUG(286, *YYCURSOR);
                if (yybm[0+yych] & 4) {
-                       goto yy288;
+                       goto yy285;
                }
                if (yych <= '\\') {
                        if (yych <= '@') {
-                               if (yych != '"') goto yy285;
+                               if (yych != '"') goto yy282;
                        } else {
-                               if (yych <= 'Z') goto yy284;
-                               if (yych <= '[') goto yy285;
-                               goto yy292;
+                               if (yych <= 'Z') goto yy281;
+                               if (yych <= '[') goto yy282;
+                               goto yy289;
                        }
                } else {
                        if (yych <= '`') {
-                               if (yych == '_') goto yy284;
-                               goto yy285;
+                               if (yych == '_') goto yy281;
+                               goto yy282;
                        } else {
-                               if (yych <= '{') goto yy284;
-                               if (yych <= '~') goto yy285;
-                               goto yy284;
+                               if (yych <= '{') goto yy281;
+                               if (yych <= '~') goto yy282;
+                               goto yy281;
                        }
                }
-yy290:
-               YYDEBUG(290, *YYCURSOR);
+yy287:
+               YYDEBUG(287, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(291, *YYCURSOR);
+               YYDEBUG(288, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2397 "Zend/zend_language_scanner.l"
+#line 2392 "Zend/zend_language_scanner.l"
                {
        if (UG(unicode)) {
                return zend_scan_unicode_escape_string(zendlval, yytext+1, yyleng-2, 0x22 /*'"'*/, T_CONSTANT_ENCAPSED_STRING TSRMLS_CC);
@@ -4665,149 +4681,138 @@ yy290:
                return T_CONSTANT_ENCAPSED_STRING;
        }
 }
-#line 4669 "Zend/zend_language_scanner.c"
-yy292:
-               YYDEBUG(292, *YYCURSOR);
+#line 4685 "Zend/zend_language_scanner.c"
+yy289:
+               YYDEBUG(289, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               goto yy285;
-yy293:
-               YYDEBUG(293, *YYCURSOR);
+               goto yy282;
+yy290:
+               YYDEBUG(290, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-yy294:
-               YYDEBUG(294, *YYCURSOR);
+yy291:
+               YYDEBUG(291, *YYCURSOR);
                if (yybm[0+yych] & 8) {
-                       goto yy293;
-               }
-               goto yy267;
-yy295:
-               YYDEBUG(295, *YYCURSOR);
-               ++YYCURSOR;
-               YYFILL(1);
-               yych = *YYCURSOR;
-yy296:
-               YYDEBUG(296, *YYCURSOR);
-               if (yybm[0+yych] & 16) {
-                       goto yy295;
+                       goto yy290;
                }
-               goto yy219;
-yy297:
-               YYDEBUG(297, *YYCURSOR);
+               goto yy216;
+yy292:
+               YYDEBUG(292, *YYCURSOR);
                yyaccept = 5;
                YYMARKER = ++YYCURSOR;
                YYFILL(3);
                yych = *YYCURSOR;
-               YYDEBUG(298, *YYCURSOR);
-               if (yybm[0+yych] & 32) {
-                       goto yy297;
+               YYDEBUG(293, *YYCURSOR);
+               if (yybm[0+yych] & 16) {
+                       goto yy292;
                }
-               if (yych == 'E') goto yy302;
-               if (yych == 'e') goto yy302;
-yy299:
-               YYDEBUG(299, *YYCURSOR);
+               if (yych == 'E') goto yy297;
+               if (yych == 'e') goto yy297;
+yy294:
+               YYDEBUG(294, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1934 "Zend/zend_language_scanner.l"
+#line 1936 "Zend/zend_language_scanner.l"
                {
        Z_DVAL_P(zendlval) = zend_strtod(yytext, NULL);
        Z_TYPE_P(zendlval) = IS_DOUBLE;
        return T_DNUMBER;
 }
-#line 4719 "Zend/zend_language_scanner.c"
-yy300:
-               YYDEBUG(300, *YYCURSOR);
+#line 4724 "Zend/zend_language_scanner.c"
+yy295:
+               YYDEBUG(295, *YYCURSOR);
                yyaccept = 2;
                YYMARKER = ++YYCURSOR;
                YYFILL(3);
                yych = *YYCURSOR;
-               YYDEBUG(301, *YYCURSOR);
+               YYDEBUG(296, *YYCURSOR);
                if (yych <= '9') {
-                       if (yych == '.') goto yy297;
-                       if (yych <= '/') goto yy263;
-                       goto yy300;
+                       if (yych == '.') goto yy292;
+                       if (yych <= '/') goto yy262;
+                       goto yy295;
                } else {
                        if (yych <= 'E') {
-                               if (yych <= 'D') goto yy263;
+                               if (yych <= 'D') goto yy262;
                        } else {
-                               if (yych != 'e') goto yy263;
+                               if (yych != 'e') goto yy262;
                        }
                }
-yy302:
-               YYDEBUG(302, *YYCURSOR);
+yy297:
+               YYDEBUG(297, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych <= ',') {
-                       if (yych != '+') goto yy284;
+                       if (yych != '+') goto yy281;
                } else {
-                       if (yych <= '-') goto yy303;
-                       if (yych <= '/') goto yy284;
-                       if (yych <= '9') goto yy304;
-                       goto yy284;
+                       if (yych <= '-') goto yy298;
+                       if (yych <= '/') goto yy281;
+                       if (yych <= '9') goto yy299;
+                       goto yy281;
                }
-yy303:
-               YYDEBUG(303, *YYCURSOR);
+yy298:
+               YYDEBUG(298, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych <= '/') goto yy284;
-               if (yych >= ':') goto yy284;
-yy304:
-               YYDEBUG(304, *YYCURSOR);
+               if (yych <= '/') goto yy281;
+               if (yych >= ':') goto yy281;
+yy299:
+               YYDEBUG(299, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(305, *YYCURSOR);
-               if (yych <= '/') goto yy299;
-               if (yych <= '9') goto yy304;
-               goto yy299;
-yy306:
-               YYDEBUG(306, *YYCURSOR);
+               YYDEBUG(300, *YYCURSOR);
+               if (yych <= '/') goto yy294;
+               if (yych <= '9') goto yy299;
+               goto yy294;
+yy301:
+               YYDEBUG(301, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yybm[0+yych] & 64) {
-                       goto yy307;
+               if (yybm[0+yych] & 32) {
+                       goto yy302;
                }
-               goto yy284;
-yy307:
-               YYDEBUG(307, *YYCURSOR);
+               goto yy281;
+yy302:
+               YYDEBUG(302, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(308, *YYCURSOR);
-               if (yybm[0+yych] & 64) {
-                       goto yy307;
+               YYDEBUG(303, *YYCURSOR);
+               if (yybm[0+yych] & 32) {
+                       goto yy302;
                }
-               YYDEBUG(309, *YYCURSOR);
+               YYDEBUG(304, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1894 "Zend/zend_language_scanner.l"
+#line 1896 "Zend/zend_language_scanner.l"
                {
-    char *hex = yytext + 2; /* Skip "0x" */
-    int len = yyleng - 2;
+       char *hex = yytext + 2; /* Skip "0x" */
+       int len = yyleng - 2;
 
-    /* Skip any leading 0s */
-    while (*hex == '0') {
-        hex++;
-        len--;
-    }
+       /* Skip any leading 0s */
+       while (*hex == '0') {
+               hex++;
+               len--;
+       }
 
-    if (len < SIZEOF_LONG * 2 || (len == SIZEOF_LONG * 2 && *hex <= '7')) {
-        zendlval->value.lval = strtol(hex, NULL, 16);
-        zendlval->type = IS_LONG;
-        return T_LNUMBER;
-    } else {
-        zendlval->value.dval = zend_hex_strtod(hex, NULL);
-        zendlval->type = IS_DOUBLE;
-        return T_DNUMBER;
-    }
+       if (len < SIZEOF_LONG * 2 || (len == SIZEOF_LONG * 2 && *hex <= '7')) {
+               Z_LVAL_P(zendlval) = strtol(hex, NULL, 16);
+               Z_TYPE_P(zendlval) = IS_LONG;
+               return T_LNUMBER;
+       } else {
+               Z_DVAL_P(zendlval) = zend_hex_strtod(hex, NULL);
+               Z_TYPE_P(zendlval) = IS_DOUBLE;
+               return T_DNUMBER;
+       }
 }
-#line 4802 "Zend/zend_language_scanner.c"
-yy310:
-               YYDEBUG(310, *YYCURSOR);
+#line 4807 "Zend/zend_language_scanner.c"
+yy305:
+               YYDEBUG(305, *YYCURSOR);
                ++YYCURSOR;
-               if ((yych = *YYCURSOR) == '\n') goto yy312;
-               if (yych == '\r') goto yy313;
-yy311:
-               YYDEBUG(311, *YYCURSOR);
+               if ((yych = *YYCURSOR) == '\n') goto yy307;
+               if (yych == '\r') goto yy308;
+yy306:
+               YYDEBUG(306, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2372 "Zend/zend_language_scanner.l"
+#line 2366 "Zend/zend_language_scanner.l"
                {
        Z_STRVAL_P(zendlval) = yytext; /* no copying - intentional */
        Z_STRLEN_P(zendlval) = yyleng;
@@ -4815,41 +4820,41 @@ yy311:
        BEGIN(INITIAL);
        return T_CLOSE_TAG;  /* implicit ';' at php-end tag */
 }
-#line 4819 "Zend/zend_language_scanner.c"
-yy312:
-               YYDEBUG(312, *YYCURSOR);
+#line 4824 "Zend/zend_language_scanner.c"
+yy307:
+               YYDEBUG(307, *YYCURSOR);
                yych = *++YYCURSOR;
-               goto yy311;
-yy313:
-               YYDEBUG(313, *YYCURSOR);
+               goto yy306;
+yy308:
+               YYDEBUG(308, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == '\n') goto yy312;
-               goto yy311;
-yy314:
-               YYDEBUG(314, *YYCURSOR);
+               if (yych == '\n') goto yy307;
+               goto yy306;
+yy309:
+               YYDEBUG(309, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(315, *YYCURSOR);
+               YYDEBUG(310, *YYCURSOR);
                if (yych <= '^') {
                        if (yych <= '9') {
-                               if (yych >= '0') goto yy314;
+                               if (yych >= '0') goto yy309;
                        } else {
-                               if (yych <= '@') goto yy316;
-                               if (yych <= 'Z') goto yy314;
+                               if (yych <= '@') goto yy311;
+                               if (yych <= 'Z') goto yy309;
                        }
                } else {
                        if (yych <= '`') {
-                               if (yych <= '_') goto yy314;
+                               if (yych <= '_') goto yy309;
                        } else {
-                               if (yych <= 'z') goto yy314;
-                               if (yych >= 0x7F) goto yy314;
+                               if (yych <= 'z') goto yy309;
+                               if (yych >= 0x7F) goto yy309;
                        }
                }
-yy316:
-               YYDEBUG(316, *YYCURSOR);
+yy311:
+               YYDEBUG(311, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2226 "Zend/zend_language_scanner.l"
+#line 2230 "Zend/zend_language_scanner.l"
                {
        if (!zend_copy_scanner_string(zendlval, (yytext+1), (yyleng-1), UG(unicode)?IS_UNICODE:IS_STRING, SCNG(output_conv) TSRMLS_CC)) {
                return 0;
@@ -4859,97 +4864,97 @@ yy316:
        }
        return T_VARIABLE;
 }
-#line 4863 "Zend/zend_language_scanner.c"
-yy317:
-               YYDEBUG(317, *YYCURSOR);
+#line 4868 "Zend/zend_language_scanner.c"
+yy312:
+               YYDEBUG(312, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'R') goto yy318;
-               if (yych != 'r') goto yy296;
-yy318:
-               YYDEBUG(318, *YYCURSOR);
+               if (yych == 'R') goto yy313;
+               if (yych != 'r') goto yy291;
+yy313:
+               YYDEBUG(313, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
-               YYDEBUG(319, *YYCURSOR);
+               YYDEBUG(314, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1813 "Zend/zend_language_scanner.l"
+#line 1816 "Zend/zend_language_scanner.l"
                {
        return T_LOGICAL_XOR;
 }
-#line 4881 "Zend/zend_language_scanner.c"
-yy320:
-               YYDEBUG(320, *YYCURSOR);
+#line 4886 "Zend/zend_language_scanner.c"
+yy315:
+               YYDEBUG(315, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
-               YYDEBUG(321, *YYCURSOR);
+               YYDEBUG(316, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1805 "Zend/zend_language_scanner.l"
+#line 1808 "Zend/zend_language_scanner.l"
                {
        return T_LOGICAL_OR;
 }
-#line 4894 "Zend/zend_language_scanner.c"
-yy322:
-               YYDEBUG(322, *YYCURSOR);
+#line 4899 "Zend/zend_language_scanner.c"
+yy317:
+               YYDEBUG(317, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(323, *YYCURSOR);
+               YYDEBUG(318, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1793 "Zend/zend_language_scanner.l"
+#line 1796 "Zend/zend_language_scanner.l"
                {
        return T_XOR_EQUAL;
 }
-#line 4904 "Zend/zend_language_scanner.c"
-yy324:
-               YYDEBUG(324, *YYCURSOR);
+#line 4909 "Zend/zend_language_scanner.c"
+yy319:
+               YYDEBUG(319, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(325, *YYCURSOR);
+               YYDEBUG(320, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1797 "Zend/zend_language_scanner.l"
+#line 1800 "Zend/zend_language_scanner.l"
                {
        return T_BOOLEAN_OR;
 }
-#line 4914 "Zend/zend_language_scanner.c"
-yy326:
-               YYDEBUG(326, *YYCURSOR);
+#line 4919 "Zend/zend_language_scanner.c"
+yy321:
+               YYDEBUG(321, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(327, *YYCURSOR);
+               YYDEBUG(322, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1789 "Zend/zend_language_scanner.l"
+#line 1792 "Zend/zend_language_scanner.l"
                {
        return T_OR_EQUAL;
 }
-#line 4924 "Zend/zend_language_scanner.c"
-yy328:
-               YYDEBUG(328, *YYCURSOR);
+#line 4929 "Zend/zend_language_scanner.c"
+yy323:
+               YYDEBUG(323, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(329, *YYCURSOR);
+               YYDEBUG(324, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1801 "Zend/zend_language_scanner.l"
+#line 1804 "Zend/zend_language_scanner.l"
                {
        return T_BOOLEAN_AND;
 }
-#line 4934 "Zend/zend_language_scanner.c"
-yy330:
-               YYDEBUG(330, *YYCURSOR);
+#line 4939 "Zend/zend_language_scanner.c"
+yy325:
+               YYDEBUG(325, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(331, *YYCURSOR);
+               YYDEBUG(326, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1785 "Zend/zend_language_scanner.l"
+#line 1788 "Zend/zend_language_scanner.l"
                {
        return T_AND_EQUAL;
 }
-#line 4944 "Zend/zend_language_scanner.c"
-yy332:
-               YYDEBUG(332, *YYCURSOR);
+#line 4949 "Zend/zend_language_scanner.c"
+yy327:
+               YYDEBUG(327, *YYCURSOR);
                ++YYCURSOR;
-               if ((yych = *YYCURSOR) == '\n') goto yy336;
-               if (yych == '\r') goto yy337;
-yy333:
-               YYDEBUG(333, *YYCURSOR);
+               if ((yych = *YYCURSOR) == '\n') goto yy331;
+               if (yych == '\r') goto yy332;
+yy328:
+               YYDEBUG(328, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2381 "Zend/zend_language_scanner.l"
+#line 2375 "Zend/zend_language_scanner.l"
                {
        if (CG(asp_tags)) {
                BEGIN(INITIAL);
@@ -4959,420 +4964,416 @@ yy333:
                return T_CLOSE_TAG;  /* implicit ';' at php-end tag */
        } else {
                yyless(1);
+               yyleng = 1;
                return yytext[0];
        }
 }
-#line 4966 "Zend/zend_language_scanner.c"
-yy334:
-               YYDEBUG(334, *YYCURSOR);
+#line 4972 "Zend/zend_language_scanner.c"
+yy329:
+               YYDEBUG(329, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(335, *YYCURSOR);
+               YYDEBUG(330, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1773 "Zend/zend_language_scanner.l"
+#line 1776 "Zend/zend_language_scanner.l"
                {
        return T_MOD_EQUAL;
 }
-#line 4976 "Zend/zend_language_scanner.c"
-yy336:
-               YYDEBUG(336, *YYCURSOR);
+#line 4982 "Zend/zend_language_scanner.c"
+yy331:
+               YYDEBUG(331, *YYCURSOR);
                yych = *++YYCURSOR;
-               goto yy333;
-yy337:
-               YYDEBUG(337, *YYCURSOR);
+               goto yy328;
+yy332:
+               YYDEBUG(332, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == '\n') goto yy336;
-               goto yy333;
-yy338:
-               YYDEBUG(338, *YYCURSOR);
+               if (yych == '\n') goto yy331;
+               goto yy328;
+yy333:
+               YYDEBUG(333, *YYCURSOR);
                yyaccept = 5;
                YYMARKER = ++YYCURSOR;
                YYFILL(3);
                yych = *YYCURSOR;
-               YYDEBUG(339, *YYCURSOR);
+               YYDEBUG(334, *YYCURSOR);
                if (yych <= 'D') {
-                       if (yych <= '/') goto yy299;
-                       if (yych <= '9') goto yy338;
-                       goto yy299;
+                       if (yych <= '/') goto yy294;
+                       if (yych <= '9') goto yy333;
+                       goto yy294;
                } else {
-                       if (yych <= 'E') goto yy302;
-                       if (yych == 'e') goto yy302;
-                       goto yy299;
+                       if (yych <= 'E') goto yy297;
+                       if (yych == 'e') goto yy297;
+                       goto yy294;
                }
-yy340:
-               YYDEBUG(340, *YYCURSOR);
+yy335:
+               YYDEBUG(335, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(341, *YYCURSOR);
+               YYDEBUG(336, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1769 "Zend/zend_language_scanner.l"
+#line 1772 "Zend/zend_language_scanner.l"
                {
        return T_CONCAT_EQUAL;
 }
-#line 5011 "Zend/zend_language_scanner.c"
-yy342:
-               YYDEBUG(342, *YYCURSOR);
+#line 5017 "Zend/zend_language_scanner.c"
+yy337:
+               YYDEBUG(337, *YYCURSOR);
                yyaccept = 6;
                yych = *(YYMARKER = ++YYCURSOR);
-               if (yych == '*') goto yy347;
-yy343:
-               YYDEBUG(343, *YYCURSOR);
+               if (yych == '*') goto yy342;
+yy338:
+               YYDEBUG(338, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2338 "Zend/zend_language_scanner.l"
+#line 2333 "Zend/zend_language_scanner.l"
                {
-       CG(comment_start_line) = CG(zend_lineno);
        BEGIN(ST_COMMENT);
        yymore();
 }
-#line 5026 "Zend/zend_language_scanner.c"
-yy344:
-               YYDEBUG(344, *YYCURSOR);
+#line 5031 "Zend/zend_language_scanner.c"
+yy339:
+               YYDEBUG(339, *YYCURSOR);
                yych = *++YYCURSOR;
-               goto yy269;
-yy345:
-               YYDEBUG(345, *YYCURSOR);
+               goto yy266;
+yy340:
+               YYDEBUG(340, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(346, *YYCURSOR);
+               YYDEBUG(341, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1765 "Zend/zend_language_scanner.l"
+#line 1768 "Zend/zend_language_scanner.l"
                {
        return T_DIV_EQUAL;
 }
-#line 5040 "Zend/zend_language_scanner.c"
-yy347:
-               YYDEBUG(347, *YYCURSOR);
+#line 5045 "Zend/zend_language_scanner.c"
+yy342:
+               YYDEBUG(342, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych <= '\f') {
-                       if (yych <= 0x08) goto yy284;
-                       if (yych >= '\v') goto yy284;
-               } else {
-                       if (yych <= '\r') goto yy348;
-                       if (yych != ' ') goto yy284;
+               if (yybm[0+yych] & 64) {
+                       goto yy343;
                }
-yy348:
-               YYDEBUG(348, *YYCURSOR);
+               goto yy281;
+yy343:
+               YYDEBUG(343, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(349, *YYCURSOR);
-               if (yych <= '\f') {
-                       if (yych <= 0x08) goto yy350;
-                       if (yych <= '\n') goto yy348;
-               } else {
-                       if (yych <= '\r') goto yy348;
-                       if (yych == ' ') goto yy348;
+               YYDEBUG(344, *YYCURSOR);
+               if (yybm[0+yych] & 64) {
+                       goto yy343;
                }
-yy350:
-               YYDEBUG(350, *YYCURSOR);
+               YYDEBUG(345, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2331 "Zend/zend_language_scanner.l"
+#line 2327 "Zend/zend_language_scanner.l"
                {
-       CG(comment_start_line) = CG(zend_lineno);
        RESET_DOC_COMMENT();
        BEGIN(ST_DOC_COMMENT);
        yymore();
 }
-#line 5074 "Zend/zend_language_scanner.c"
-yy351:
-               YYDEBUG(351, *YYCURSOR);
+#line 5070 "Zend/zend_language_scanner.c"
+yy346:
+               YYDEBUG(346, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(352, *YYCURSOR);
+               YYDEBUG(347, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1761 "Zend/zend_language_scanner.l"
+#line 1764 "Zend/zend_language_scanner.l"
                {
        return T_MUL_EQUAL;
 }
-#line 5084 "Zend/zend_language_scanner.c"
-yy353:
-               YYDEBUG(353, *YYCURSOR);
+#line 5080 "Zend/zend_language_scanner.c"
+yy348:
+               YYDEBUG(348, *YYCURSOR);
                ++YYCURSOR;
-               if ((yych = *YYCURSOR) == '=') goto yy357;
-               YYDEBUG(354, *YYCURSOR);
+               if ((yych = *YYCURSOR) == '=') goto yy352;
+               YYDEBUG(349, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1821 "Zend/zend_language_scanner.l"
+#line 1824 "Zend/zend_language_scanner.l"
                {
        return T_SR;
 }
-#line 5095 "Zend/zend_language_scanner.c"
-yy355:
-               YYDEBUG(355, *YYCURSOR);
+#line 5091 "Zend/zend_language_scanner.c"
+yy350:
+               YYDEBUG(350, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(356, *YYCURSOR);
+               YYDEBUG(351, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1749 "Zend/zend_language_scanner.l"
+#line 1752 "Zend/zend_language_scanner.l"
                {
        return T_IS_GREATER_OR_EQUAL;
 }
-#line 5105 "Zend/zend_language_scanner.c"
-yy357:
-               YYDEBUG(357, *YYCURSOR);
+#line 5101 "Zend/zend_language_scanner.c"
+yy352:
+               YYDEBUG(352, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(358, *YYCURSOR);
+               YYDEBUG(353, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1781 "Zend/zend_language_scanner.l"
+#line 1784 "Zend/zend_language_scanner.l"
                {
        return T_SR_EQUAL;
 }
-#line 5115 "Zend/zend_language_scanner.c"
-yy359:
-               YYDEBUG(359, *YYCURSOR);
+#line 5111 "Zend/zend_language_scanner.c"
+yy354:
+               YYDEBUG(354, *YYCURSOR);
                yyaccept = 7;
                yych = *(YYMARKER = ++YYCURSOR);
-               if (yych <= ';') goto yy360;
-               if (yych <= '<') goto yy375;
-               if (yych <= '=') goto yy373;
-yy360:
-               YYDEBUG(360, *YYCURSOR);
+               if (yych <= ';') goto yy355;
+               if (yych <= '<') goto yy370;
+               if (yych <= '=') goto yy368;
+yy355:
+               YYDEBUG(355, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1817 "Zend/zend_language_scanner.l"
+#line 1820 "Zend/zend_language_scanner.l"
                {
        return T_SL;
 }
-#line 5130 "Zend/zend_language_scanner.c"
-yy361:
-               YYDEBUG(361, *YYCURSOR);
+#line 5126 "Zend/zend_language_scanner.c"
+yy356:
+               YYDEBUG(356, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'S') goto yy366;
-               if (yych == 's') goto yy366;
-               goto yy284;
-yy362:
-               YYDEBUG(362, *YYCURSOR);
+               if (yych == 'S') goto yy361;
+               if (yych == 's') goto yy361;
+               goto yy281;
+yy357:
+               YYDEBUG(357, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(363, *YYCURSOR);
+               YYDEBUG(358, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1745 "Zend/zend_language_scanner.l"
+#line 1748 "Zend/zend_language_scanner.l"
                {
        return T_IS_SMALLER_OR_EQUAL;
 }
-#line 5146 "Zend/zend_language_scanner.c"
-yy364:
-               YYDEBUG(364, *YYCURSOR);
+#line 5142 "Zend/zend_language_scanner.c"
+yy359:
+               YYDEBUG(359, *YYCURSOR);
                ++YYCURSOR;
-yy365:
-               YYDEBUG(365, *YYCURSOR);
+yy360:
+               YYDEBUG(360, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1741 "Zend/zend_language_scanner.l"
+#line 1744 "Zend/zend_language_scanner.l"
                {
        return T_IS_NOT_EQUAL;
 }
-#line 5157 "Zend/zend_language_scanner.c"
-yy366:
-               YYDEBUG(366, *YYCURSOR);
+#line 5153 "Zend/zend_language_scanner.c"
+yy361:
+               YYDEBUG(361, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'C') goto yy367;
-               if (yych != 'c') goto yy284;
-yy367:
-               YYDEBUG(367, *YYCURSOR);
+               if (yych == 'C') goto yy362;
+               if (yych != 'c') goto yy281;
+yy362:
+               YYDEBUG(362, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'R') goto yy368;
-               if (yych != 'r') goto yy284;
-yy368:
-               YYDEBUG(368, *YYCURSOR);
+               if (yych == 'R') goto yy363;
+               if (yych != 'r') goto yy281;
+yy363:
+               YYDEBUG(363, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'I') goto yy369;
-               if (yych != 'i') goto yy284;
-yy369:
-               YYDEBUG(369, *YYCURSOR);
+               if (yych == 'I') goto yy364;
+               if (yych != 'i') goto yy281;
+yy364:
+               YYDEBUG(364, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'P') goto yy370;
-               if (yych != 'p') goto yy284;
-yy370:
-               YYDEBUG(370, *YYCURSOR);
+               if (yych == 'P') goto yy365;
+               if (yych != 'p') goto yy281;
+yy365:
+               YYDEBUG(365, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'T') goto yy371;
-               if (yych != 't') goto yy284;
-yy371:
-               YYDEBUG(371, *YYCURSOR);
+               if (yych == 'T') goto yy366;
+               if (yych != 't') goto yy281;
+yy366:
+               YYDEBUG(366, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(3);
                yych = *YYCURSOR;
-               YYDEBUG(372, *YYCURSOR);
+               YYDEBUG(367, *YYCURSOR);
                if (yych <= '\r') {
-                       if (yych <= 0x08) goto yy284;
-                       if (yych <= '\n') goto yy371;
-                       if (yych <= '\f') goto yy284;
-                       goto yy371;
+                       if (yych <= 0x08) goto yy281;
+                       if (yych <= '\n') goto yy366;
+                       if (yych <= '\f') goto yy281;
+                       goto yy366;
                } else {
                        if (yych <= ' ') {
-                               if (yych <= 0x1F) goto yy284;
-                               goto yy371;
+                               if (yych <= 0x1F) goto yy281;
+                               goto yy366;
                        } else {
-                               if (yych == '>') goto yy310;
-                               goto yy284;
+                               if (yych == '>') goto yy305;
+                               goto yy281;
                        }
                }
-yy373:
-               YYDEBUG(373, *YYCURSOR);
+yy368:
+               YYDEBUG(368, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(374, *YYCURSOR);
+               YYDEBUG(369, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1777 "Zend/zend_language_scanner.l"
+#line 1780 "Zend/zend_language_scanner.l"
                {
        return T_SL_EQUAL;
 }
-#line 5212 "Zend/zend_language_scanner.c"
-yy375:
-               YYDEBUG(375, *YYCURSOR);
+#line 5208 "Zend/zend_language_scanner.c"
+yy370:
+               YYDEBUG(370, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(2);
                yych = *YYCURSOR;
-               YYDEBUG(376, *YYCURSOR);
+               YYDEBUG(371, *YYCURSOR);
                if (yybm[0+yych] & 128) {
-                       goto yy375;
+                       goto yy370;
                }
                if (yych <= 'Z') {
                        if (yych <= '&') {
-                               if (yych == '"') goto yy380;
-                               goto yy284;
+                               if (yych == '"') goto yy375;
+                               goto yy281;
                        } else {
-                               if (yych <= '\'') goto yy377;
-                               if (yych <= '@') goto yy284;
-                               goto yy378;
+                               if (yych <= '\'') goto yy372;
+                               if (yych <= '@') goto yy281;
+                               goto yy373;
                        }
                } else {
                        if (yych <= '`') {
-                               if (yych == '_') goto yy378;
-                               goto yy284;
+                               if (yych == '_') goto yy373;
+                               goto yy281;
                        } else {
-                               if (yych <= 'z') goto yy378;
-                               if (yych <= '~') goto yy284;
-                               goto yy378;
+                               if (yych <= 'z') goto yy373;
+                               if (yych <= '~') goto yy281;
+                               goto yy373;
                        }
                }
-yy377:
-               YYDEBUG(377, *YYCURSOR);
+yy372:
+               YYDEBUG(372, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == '\'') goto yy284;
-               if (yych <= '/') goto yy388;
-               if (yych <= '9') goto yy284;
-               goto yy388;
-yy378:
-               YYDEBUG(378, *YYCURSOR);
+               if (yych == '\'') goto yy281;
+               if (yych <= '/') goto yy383;
+               if (yych <= '9') goto yy281;
+               goto yy383;
+yy373:
+               YYDEBUG(373, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(2);
                yych = *YYCURSOR;
-               YYDEBUG(379, *YYCURSOR);
+               YYDEBUG(374, *YYCURSOR);
                if (yych <= '@') {
                        if (yych <= '\f') {
-                               if (yych == '\n') goto yy384;
-                               goto yy284;
+                               if (yych == '\n') goto yy379;
+                               goto yy281;
                        } else {
-                               if (yych <= '\r') goto yy386;
-                               if (yych <= '/') goto yy284;
-                               if (yych <= '9') goto yy378;
-                               goto yy284;
+                               if (yych <= '\r') goto yy381;
+                               if (yych <= '/') goto yy281;
+                               if (yych <= '9') goto yy373;
+                               goto yy281;
                        }
                } else {
                        if (yych <= '_') {
-                               if (yych <= 'Z') goto yy378;
-                               if (yych <= '^') goto yy284;
-                               goto yy378;
+                               if (yych <= 'Z') goto yy373;
+                               if (yych <= '^') goto yy281;
+                               goto yy373;
                        } else {
-                               if (yych <= '`') goto yy284;
-                               if (yych <= 'z') goto yy378;
-                               if (yych <= '~') goto yy284;
-                               goto yy378;
+                               if (yych <= '`') goto yy281;
+                               if (yych <= 'z') goto yy373;
+                               if (yych <= '~') goto yy281;
+                               goto yy373;
                        }
                }
-yy380:
-               YYDEBUG(380, *YYCURSOR);
+yy375:
+               YYDEBUG(375, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == '"') goto yy284;
-               if (yych <= '/') goto yy382;
-               if (yych <= '9') goto yy284;
-               goto yy382;
-yy381:
-               YYDEBUG(381, *YYCURSOR);
+               if (yych == '"') goto yy281;
+               if (yych <= '/') goto yy377;
+               if (yych <= '9') goto yy281;
+               goto yy377;
+yy376:
+               YYDEBUG(376, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(3);
                yych = *YYCURSOR;
-yy382:
-               YYDEBUG(382, *YYCURSOR);
+yy377:
+               YYDEBUG(377, *YYCURSOR);
                if (yych <= 'Z') {
                        if (yych <= '/') {
-                               if (yych != '"') goto yy284;
+                               if (yych != '"') goto yy281;
                        } else {
-                               if (yych <= '9') goto yy381;
-                               if (yych <= '@') goto yy284;
-                               goto yy381;
+                               if (yych <= '9') goto yy376;
+                               if (yych <= '@') goto yy281;
+                               goto yy376;
                        }
                } else {
                        if (yych <= '`') {
-                               if (yych == '_') goto yy381;
-                               goto yy284;
+                               if (yych == '_') goto yy376;
+                               goto yy281;
                        } else {
-                               if (yych <= 'z') goto yy381;
-                               if (yych <= '~') goto yy284;
-                               goto yy381;
+                               if (yych <= 'z') goto yy376;
+                               if (yych <= '~') goto yy281;
+                               goto yy376;
                        }
                }
-               YYDEBUG(383, *YYCURSOR);
+               YYDEBUG(378, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == '\n') goto yy384;
-               if (yych == '\r') goto yy386;
-               goto yy284;
-yy384:
-               YYDEBUG(384, *YYCURSOR);
+               if (yych == '\n') goto yy379;
+               if (yych == '\r') goto yy381;
+               goto yy281;
+yy379:
+               YYDEBUG(379, *YYCURSOR);
                ++YYCURSOR;
-yy385:
-               YYDEBUG(385, *YYCURSOR);
+yy380:
+               YYDEBUG(380, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 2455 "Zend/zend_language_scanner.l"
                {
        char *s;
-       int quotes  = (yytext[3] == '"') ? 2 : 0;
+
        CG(zend_lineno)++;
-       CG(heredoc_len) = yyleng-3-quotes-1-(yytext[yyleng-2]=='\r'?1:0);
-       s = yytext+3+(quotes ? 1 : 0);
+       CG(heredoc_len) = yyleng-3-1-(yytext[yyleng-2]=='\r'?1:0);
+       s = yytext+3;
        while ((*s == ' ') || (*s == '\t')) {
                s++;
                CG(heredoc_len)--;
        }
+
+       if (*s == '"') {
+               s++;
+               CG(heredoc_len) -= 2;
+       }
        CG(heredoc) = estrndup(s, CG(heredoc_len));
        BEGIN(ST_START_HEREDOC);
        return T_START_HEREDOC;
 }
-#line 5334 "Zend/zend_language_scanner.c"
-yy386:
-               YYDEBUG(386, *YYCURSOR);
+#line 5335 "Zend/zend_language_scanner.c"
+yy381:
+               YYDEBUG(381, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == '\n') goto yy384;
-               goto yy385;
-yy387:
-               YYDEBUG(387, *YYCURSOR);
+               if (yych == '\n') goto yy379;
+               goto yy380;
+yy382:
+               YYDEBUG(382, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(3);
                yych = *YYCURSOR;
-yy388:
-               YYDEBUG(388, *YYCURSOR);
+yy383:
+               YYDEBUG(383, *YYCURSOR);
                if (yych <= 'Z') {
                        if (yych <= '/') {
-                               if (yych != '\'') goto yy284;
+                               if (yych != '\'') goto yy281;
                        } else {
-                               if (yych <= '9') goto yy387;
-                               if (yych <= '@') goto yy284;
-                               goto yy387;
+                               if (yych <= '9') goto yy382;
+                               if (yych <= '@') goto yy281;
+                               goto yy382;
                        }
                } else {
                        if (yych <= '`') {
-                               if (yych == '_') goto yy387;
-                               goto yy284;
+                               if (yych == '_') goto yy382;
+                               goto yy281;
                        } else {
-                               if (yych <= 'z') goto yy387;
-                               if (yych <= '~') goto yy284;
-                               goto yy387;
+                               if (yych <= 'z') goto yy382;
+                               if (yych <= '~') goto yy281;
+                               goto yy382;
                        }
                }
-               YYDEBUG(389, *YYCURSOR);
+               YYDEBUG(384, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == '\n') goto yy390;
-               if (yych == '\r') goto yy392;
-               goto yy284;
-yy390:
-               YYDEBUG(390, *YYCURSOR);
+               if (yych == '\n') goto yy385;
+               if (yych == '\r') goto yy387;
+               goto yy281;
+yy385:
+               YYDEBUG(385, *YYCURSOR);
                ++YYCURSOR;
-yy391:
-               YYDEBUG(391, *YYCURSOR);
+yy386:
+               YYDEBUG(386, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2649 "Zend/zend_language_scanner.l"
+#line 2661 "Zend/zend_language_scanner.l"
                {
        int bprefix = (yytext[0] != '<') ? 1 : 0;
        char *s;
@@ -5391,191 +5392,191 @@ yy391:
        BEGIN(ST_START_NOWDOC);
        return T_START_NOWDOC;
 }
-#line 5395 "Zend/zend_language_scanner.c"
-yy392:
-               YYDEBUG(392, *YYCURSOR);
+#line 5396 "Zend/zend_language_scanner.c"
+yy387:
+               YYDEBUG(387, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == '\n') goto yy390;
-               goto yy391;
-yy393:
-               YYDEBUG(393, *YYCURSOR);
+               if (yych == '\n') goto yy385;
+               goto yy386;
+yy388:
+               YYDEBUG(388, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != '=') goto yy365;
-               YYDEBUG(394, *YYCURSOR);
+               if (yych != '=') goto yy360;
+               YYDEBUG(389, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(395, *YYCURSOR);
+               YYDEBUG(390, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1733 "Zend/zend_language_scanner.l"
+#line 1736 "Zend/zend_language_scanner.l"
                {
        return T_IS_NOT_IDENTICAL;
 }
-#line 5413 "Zend/zend_language_scanner.c"
-yy396:
-               YYDEBUG(396, *YYCURSOR);
+#line 5414 "Zend/zend_language_scanner.c"
+yy391:
+               YYDEBUG(391, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(397, *YYCURSOR);
+               YYDEBUG(392, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1753 "Zend/zend_language_scanner.l"
+#line 1756 "Zend/zend_language_scanner.l"
                {
        return T_PLUS_EQUAL;
 }
-#line 5423 "Zend/zend_language_scanner.c"
-yy398:
-               YYDEBUG(398, *YYCURSOR);
+#line 5424 "Zend/zend_language_scanner.c"
+yy393:
+               YYDEBUG(393, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(399, *YYCURSOR);
+               YYDEBUG(394, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1721 "Zend/zend_language_scanner.l"
+#line 1724 "Zend/zend_language_scanner.l"
                {
        return T_INC;
 }
-#line 5433 "Zend/zend_language_scanner.c"
-yy400:
-               YYDEBUG(400, *YYCURSOR);
+#line 5434 "Zend/zend_language_scanner.c"
+yy395:
+               YYDEBUG(395, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'S') goto yy401;
-               if (yych != 's') goto yy296;
-yy401:
-               YYDEBUG(401, *YYCURSOR);
+               if (yych == 'S') goto yy396;
+               if (yych != 's') goto yy291;
+yy396:
+               YYDEBUG(396, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'T') goto yy402;
-               if (yych != 't') goto yy296;
-yy402:
-               YYDEBUG(402, *YYCURSOR);
+               if (yych == 'T') goto yy397;
+               if (yych != 't') goto yy291;
+yy397:
+               YYDEBUG(397, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
-               YYDEBUG(403, *YYCURSOR);
+               YYDEBUG(398, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1713 "Zend/zend_language_scanner.l"
+#line 1716 "Zend/zend_language_scanner.l"
                {
        return T_LIST;
 }
-#line 5456 "Zend/zend_language_scanner.c"
-yy404:
-               YYDEBUG(404, *YYCURSOR);
+#line 5457 "Zend/zend_language_scanner.c"
+yy399:
+               YYDEBUG(399, *YYCURSOR);
                ++YYCURSOR;
-               if ((yych = *YYCURSOR) == '=') goto yy408;
-               YYDEBUG(405, *YYCURSOR);
+               if ((yych = *YYCURSOR) == '=') goto yy403;
+               YYDEBUG(400, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1737 "Zend/zend_language_scanner.l"
+#line 1740 "Zend/zend_language_scanner.l"
                {
        return T_IS_EQUAL;
 }
-#line 5467 "Zend/zend_language_scanner.c"
-yy406:
-               YYDEBUG(406, *YYCURSOR);
+#line 5468 "Zend/zend_language_scanner.c"
+yy401:
+               YYDEBUG(401, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(407, *YYCURSOR);
+               YYDEBUG(402, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1709 "Zend/zend_language_scanner.l"
+#line 1712 "Zend/zend_language_scanner.l"
                {
        return T_DOUBLE_ARROW;
 }
-#line 5477 "Zend/zend_language_scanner.c"
-yy408:
-               YYDEBUG(408, *YYCURSOR);
+#line 5478 "Zend/zend_language_scanner.c"
+yy403:
+               YYDEBUG(403, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(409, *YYCURSOR);
+               YYDEBUG(404, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1729 "Zend/zend_language_scanner.l"
+#line 1732 "Zend/zend_language_scanner.l"
                {
        return T_IS_IDENTICAL;
 }
-#line 5487 "Zend/zend_language_scanner.c"
-yy410:
-               YYDEBUG(410, *YYCURSOR);
+#line 5488 "Zend/zend_language_scanner.c"
+yy405:
+               YYDEBUG(405, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych <= 'H') {
                        if (yych <= 'D') {
-                               if (yych <= 'B') goto yy296;
-                               if (yych <= 'C') goto yy412;
-                               goto yy416;
+                               if (yych <= 'B') goto yy291;
+                               if (yych <= 'C') goto yy407;
+                               goto yy411;
                        } else {
-                               if (yych == 'F') goto yy413;
-                               if (yych <= 'G') goto yy296;
+                               if (yych == 'F') goto yy408;
+                               if (yych <= 'G') goto yy291;
                        }
                } else {
                        if (yych <= 'M') {
-                               if (yych <= 'K') goto yy296;
-                               if (yych <= 'L') goto yy415;
-                               goto yy414;
+                               if (yych <= 'K') goto yy291;
+                               if (yych <= 'L') goto yy410;
+                               goto yy409;
                        } else {
-                               if (yych <= 'N') goto yy417;
-                               if (yych != 'h') goto yy296;
+                               if (yych <= 'N') goto yy412;
+                               if (yych != 'h') goto yy291;
                        }
                }
+               YYDEBUG(406, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'A') goto yy466;
+               if (yych == 'a') goto yy466;
+               goto yy291;
+yy407:
+               YYDEBUG(407, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'L') goto yy459;
+               goto yy291;
+yy408:
+               YYDEBUG(408, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'I') goto yy443;
+               if (yych == 'U') goto yy444;
+               goto yy291;
+yy409:
+               YYDEBUG(409, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'E') goto yy435;
+               goto yy291;
+yy410:
+               YYDEBUG(410, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'I') goto yy429;
+               goto yy291;
+yy411:
                YYDEBUG(411, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'A') goto yy471;
-               if (yych == 'a') goto yy471;
-               goto yy296;
+               if (yych == 'I') goto yy424;
+               goto yy291;
 yy412:
                YYDEBUG(412, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'L') goto yy464;
-               goto yy296;
-yy413:
+               if (yych != 'A') goto yy291;
                YYDEBUG(413, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'I') goto yy448;
-               if (yych == 'U') goto yy449;
-               goto yy296;
-yy414:
+               if (yych != 'M') goto yy291;
                YYDEBUG(414, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'E') goto yy440;
-               goto yy296;
-yy415:
+               if (yych != 'E') goto yy291;
                YYDEBUG(415, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'I') goto yy434;
-               goto yy296;
-yy416:
+               if (yych != 'S') goto yy291;
                YYDEBUG(416, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'I') goto yy429;
-               goto yy296;
-yy417:
+               if (yych != 'P') goto yy291;
                YYDEBUG(417, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != 'A') goto yy296;
+               if (yych != 'A') goto yy291;
                YYDEBUG(418, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != 'M') goto yy296;
+               if (yych != 'C') goto yy291;
                YYDEBUG(419, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != 'E') goto yy296;
+               if (yych != 'E') goto yy291;
                YYDEBUG(420, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != 'S') goto yy296;
+               if (yych != '_') goto yy291;
                YYDEBUG(421, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != 'P') goto yy296;
+               if (yych != '_') goto yy291;
                YYDEBUG(422, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych != 'A') goto yy296;
-               YYDEBUG(423, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych != 'C') goto yy296;
-               YYDEBUG(424, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych != 'E') goto yy296;
-               YYDEBUG(425, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych != '_') goto yy296;
-               YYDEBUG(426, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych != '_') goto yy296;
-               YYDEBUG(427, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
-               YYDEBUG(428, *YYCURSOR);
+               YYDEBUG(423, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2062 "Zend/zend_language_scanner.l"
+#line 2064 "Zend/zend_language_scanner.l"
                {
        if (CG(current_namespace)) {
                *zendlval = *CG(current_namespace);
@@ -5585,25 +5586,25 @@ yy417:
        }
        return T_NS_C;
 }
-#line 5589 "Zend/zend_language_scanner.c"
-yy429:
-               YYDEBUG(429, *YYCURSOR);
+#line 5590 "Zend/zend_language_scanner.c"
+yy424:
+               YYDEBUG(424, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != 'R') goto yy296;
-               YYDEBUG(430, *YYCURSOR);
+               if (yych != 'R') goto yy291;
+               YYDEBUG(425, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != '_') goto yy296;
-               YYDEBUG(431, *YYCURSOR);
+               if (yych != '_') goto yy291;
+               YYDEBUG(426, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != '_') goto yy296;
-               YYDEBUG(432, *YYCURSOR);
+               if (yych != '_') goto yy291;
+               YYDEBUG(427, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
-               YYDEBUG(433, *YYCURSOR);
+               YYDEBUG(428, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2035 "Zend/zend_language_scanner.l"
+#line 2037 "Zend/zend_language_scanner.l"
                {
        char *filename = zend_get_compiled_filename(TSRMLS_C);
        const size_t filename_len = strlen(filename);
@@ -5630,61 +5631,61 @@ yy429:
        zendlval->type = IS_STRING;
        return T_DIR;
 }
-#line 5634 "Zend/zend_language_scanner.c"
-yy434:
-               YYDEBUG(434, *YYCURSOR);
+#line 5635 "Zend/zend_language_scanner.c"
+yy429:
+               YYDEBUG(429, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != 'N') goto yy296;
-               YYDEBUG(435, *YYCURSOR);
+               if (yych != 'N') goto yy291;
+               YYDEBUG(430, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != 'E') goto yy296;
-               YYDEBUG(436, *YYCURSOR);
+               if (yych != 'E') goto yy291;
+               YYDEBUG(431, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != '_') goto yy296;
-               YYDEBUG(437, *YYCURSOR);
+               if (yych != '_') goto yy291;
+               YYDEBUG(432, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != '_') goto yy296;
-               YYDEBUG(438, *YYCURSOR);
+               if (yych != '_') goto yy291;
+               YYDEBUG(433, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
-               YYDEBUG(439, *YYCURSOR);
+               YYDEBUG(434, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2019 "Zend/zend_language_scanner.l"
+#line 2021 "Zend/zend_language_scanner.l"
                {
        Z_LVAL_P(zendlval) = CG(zend_lineno);
        Z_TYPE_P(zendlval) = IS_LONG;
        return T_LINE;
 }
-#line 5661 "Zend/zend_language_scanner.c"
-yy440:
-               YYDEBUG(440, *YYCURSOR);
+#line 5662 "Zend/zend_language_scanner.c"
+yy435:
+               YYDEBUG(435, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != 'T') goto yy296;
-               YYDEBUG(441, *YYCURSOR);
+               if (yych != 'T') goto yy291;
+               YYDEBUG(436, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != 'H') goto yy296;
-               YYDEBUG(442, *YYCURSOR);
+               if (yych != 'H') goto yy291;
+               YYDEBUG(437, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != 'O') goto yy296;
-               YYDEBUG(443, *YYCURSOR);
+               if (yych != 'O') goto yy291;
+               YYDEBUG(438, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != 'D') goto yy296;
-               YYDEBUG(444, *YYCURSOR);
+               if (yych != 'D') goto yy291;
+               YYDEBUG(439, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != '_') goto yy296;
-               YYDEBUG(445, *YYCURSOR);
+               if (yych != '_') goto yy291;
+               YYDEBUG(440, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != '_') goto yy296;
-               YYDEBUG(446, *YYCURSOR);
+               if (yych != '_') goto yy291;
+               YYDEBUG(441, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
-               YYDEBUG(447, *YYCURSOR);
+               YYDEBUG(442, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1970 "Zend/zend_language_scanner.l"
+#line 1972 "Zend/zend_language_scanner.l"
                {
        zstr class_name = CG(active_class_entry) ? CG(active_class_entry)->name : NULL_ZSTR;
        zstr func_name = CG(active_op_array)? CG(active_op_array)->function_name : NULL_ZSTR;
@@ -5733,45 +5734,45 @@ yy440:
        }
        return T_METHOD_C;
 }
-#line 5737 "Zend/zend_language_scanner.c"
-yy448:
-               YYDEBUG(448, *YYCURSOR);
+#line 5738 "Zend/zend_language_scanner.c"
+yy443:
+               YYDEBUG(443, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'L') goto yy459;
-               goto yy296;
-yy449:
-               YYDEBUG(449, *YYCURSOR);
+               if (yych == 'L') goto yy454;
+               goto yy291;
+yy444:
+               YYDEBUG(444, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != 'N') goto yy296;
-               YYDEBUG(450, *YYCURSOR);
+               if (yych != 'N') goto yy291;
+               YYDEBUG(445, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != 'C') goto yy296;
-               YYDEBUG(451, *YYCURSOR);
+               if (yych != 'C') goto yy291;
+               YYDEBUG(446, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != 'T') goto yy296;
-               YYDEBUG(452, *YYCURSOR);
+               if (yych != 'T') goto yy291;
+               YYDEBUG(447, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != 'I') goto yy296;
-               YYDEBUG(453, *YYCURSOR);
+               if (yych != 'I') goto yy291;
+               YYDEBUG(448, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != 'O') goto yy296;
-               YYDEBUG(454, *YYCURSOR);
+               if (yych != 'O') goto yy291;
+               YYDEBUG(449, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != 'N') goto yy296;
-               YYDEBUG(455, *YYCURSOR);
+               if (yych != 'N') goto yy291;
+               YYDEBUG(450, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != '_') goto yy296;
-               YYDEBUG(456, *YYCURSOR);
+               if (yych != '_') goto yy291;
+               YYDEBUG(451, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != '_') goto yy296;
-               YYDEBUG(457, *YYCURSOR);
+               if (yych != '_') goto yy291;
+               YYDEBUG(452, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
-               YYDEBUG(458, *YYCURSOR);
+               YYDEBUG(453, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1955 "Zend/zend_language_scanner.l"
+#line 1957 "Zend/zend_language_scanner.l"
                {
        zstr func_name = NULL_ZSTR;
 
@@ -5786,25 +5787,25 @@ yy449:
        }
        return T_FUNC_C;
 }
-#line 5790 "Zend/zend_language_scanner.c"
-yy459:
-               YYDEBUG(459, *YYCURSOR);
+#line 5791 "Zend/zend_language_scanner.c"
+yy454:
+               YYDEBUG(454, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != 'E') goto yy296;
-               YYDEBUG(460, *YYCURSOR);
+               if (yych != 'E') goto yy291;
+               YYDEBUG(455, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != '_') goto yy296;
-               YYDEBUG(461, *YYCURSOR);
+               if (yych != '_') goto yy291;
+               YYDEBUG(456, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != '_') goto yy296;
-               YYDEBUG(462, *YYCURSOR);
+               if (yych != '_') goto yy291;
+               YYDEBUG(457, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
-               YYDEBUG(463, *YYCURSOR);
+               YYDEBUG(458, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2025 "Zend/zend_language_scanner.l"
+#line 2027 "Zend/zend_language_scanner.l"
                {
        char *filename = zend_get_compiled_filename(TSRMLS_C);
 
@@ -5814,31 +5815,31 @@ yy459:
        ZVAL_RT_STRING(zendlval, filename, 1);
        return T_FILE;
 }
-#line 5818 "Zend/zend_language_scanner.c"
-yy464:
-               YYDEBUG(464, *YYCURSOR);
+#line 5819 "Zend/zend_language_scanner.c"
+yy459:
+               YYDEBUG(459, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != 'A') goto yy296;
-               YYDEBUG(465, *YYCURSOR);
+               if (yych != 'A') goto yy291;
+               YYDEBUG(460, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != 'S') goto yy296;
-               YYDEBUG(466, *YYCURSOR);
+               if (yych != 'S') goto yy291;
+               YYDEBUG(461, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != 'S') goto yy296;
-               YYDEBUG(467, *YYCURSOR);
+               if (yych != 'S') goto yy291;
+               YYDEBUG(462, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != '_') goto yy296;
-               YYDEBUG(468, *YYCURSOR);
+               if (yych != '_') goto yy291;
+               YYDEBUG(463, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != '_') goto yy296;
-               YYDEBUG(469, *YYCURSOR);
+               if (yych != '_') goto yy291;
+               YYDEBUG(464, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
-               YYDEBUG(470, *YYCURSOR);
+               YYDEBUG(465, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1940 "Zend/zend_language_scanner.l"
+#line 1942 "Zend/zend_language_scanner.l"
                {
        zstr class_name = NULL_ZSTR;
 
@@ -5853,629 +5854,656 @@ yy464:
        }
        return T_CLASS_C;
 }
-#line 5857 "Zend/zend_language_scanner.c"
+#line 5858 "Zend/zend_language_scanner.c"
+yy466:
+               YYDEBUG(466, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'L') goto yy467;
+               if (yych != 'l') goto yy291;
+yy467:
+               YYDEBUG(467, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'T') goto yy468;
+               if (yych != 't') goto yy291;
+yy468:
+               YYDEBUG(468, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych != '_') goto yy291;
+               YYDEBUG(469, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'C') goto yy470;
+               if (yych != 'c') goto yy291;
+yy470:
+               YYDEBUG(470, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'O') goto yy471;
+               if (yych != 'o') goto yy291;
 yy471:
                YYDEBUG(471, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'L') goto yy472;
-               if (yych != 'l') goto yy296;
+               if (yych == 'M') goto yy472;
+               if (yych != 'm') goto yy291;
 yy472:
                YYDEBUG(472, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'T') goto yy473;
-               if (yych != 't') goto yy296;
+               if (yych == 'P') goto yy473;
+               if (yych != 'p') goto yy291;
 yy473:
                YYDEBUG(473, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != '_') goto yy296;
+               if (yych == 'I') goto yy474;
+               if (yych != 'i') goto yy291;
+yy474:
                YYDEBUG(474, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'C') goto yy475;
-               if (yych != 'c') goto yy296;
+               if (yych == 'L') goto yy475;
+               if (yych != 'l') goto yy291;
 yy475:
                YYDEBUG(475, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'O') goto yy476;
-               if (yych != 'o') goto yy296;
+               if (yych == 'E') goto yy476;
+               if (yych != 'e') goto yy291;
 yy476:
                YYDEBUG(476, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'M') goto yy477;
-               if (yych != 'm') goto yy296;
+               if (yych == 'R') goto yy477;
+               if (yych != 'r') goto yy291;
 yy477:
                YYDEBUG(477, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'P') goto yy478;
-               if (yych != 'p') goto yy296;
-yy478:
+               ++YYCURSOR;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
+               }
                YYDEBUG(478, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'I') goto yy479;
-               if (yych != 'i') goto yy296;
+               yyleng = YYCURSOR - SCNG(yy_text);
+#line 1680 "Zend/zend_language_scanner.l"
+               {
+       return T_HALT_COMPILER;
+}
+#line 5924 "Zend/zend_language_scanner.c"
 yy479:
                YYDEBUG(479, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'L') goto yy480;
-               if (yych != 'l') goto yy296;
+               if (yych == 'S') goto yy483;
+               if (yych == 's') goto yy483;
+               goto yy291;
 yy480:
                YYDEBUG(480, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych == 'E') goto yy481;
-               if (yych != 'e') goto yy296;
+               if (yych != 'e') goto yy291;
 yy481:
                YYDEBUG(481, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'R') goto yy482;
-               if (yych != 'r') goto yy296;
-yy482:
-               YYDEBUG(482, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
-               YYDEBUG(483, *YYCURSOR);
+               YYDEBUG(482, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1677 "Zend/zend_language_scanner.l"
+#line 1664 "Zend/zend_language_scanner.l"
                {
-       return T_HALT_COMPILER;
+       return T_USE;
 }
-#line 5923 "Zend/zend_language_scanner.c"
+#line 5948 "Zend/zend_language_scanner.c"
+yy483:
+               YYDEBUG(483, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'E') goto yy484;
+               if (yych != 'e') goto yy291;
 yy484:
                YYDEBUG(484, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'S') goto yy488;
-               if (yych == 's') goto yy488;
-               goto yy296;
+               if (yych == 'T') goto yy485;
+               if (yych != 't') goto yy291;
 yy485:
                YYDEBUG(485, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'E') goto yy486;
-               if (yych != 'e') goto yy296;
-yy486:
-               YYDEBUG(486, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
-               }
-               YYDEBUG(487, *YYCURSOR);
-               yyleng = YYCURSOR - SCNG(yy_text);
-#line 1661 "Zend/zend_language_scanner.l"
-               {
-       return T_USE;
-}
-#line 5947 "Zend/zend_language_scanner.c"
-yy488:
-               YYDEBUG(488, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'E') goto yy489;
-               if (yych != 'e') goto yy296;
-yy489:
-               YYDEBUG(489, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'T') goto yy490;
-               if (yych != 't') goto yy296;
-yy490:
-               YYDEBUG(490, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
-               YYDEBUG(491, *YYCURSOR);
+               YYDEBUG(486, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1705 "Zend/zend_language_scanner.l"
+#line 1708 "Zend/zend_language_scanner.l"
                {
        return T_UNSET;
 }
-#line 5970 "Zend/zend_language_scanner.c"
-yy492:
-               YYDEBUG(492, *YYCURSOR);
+#line 5971 "Zend/zend_language_scanner.c"
+yy487:
+               YYDEBUG(487, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(7);
                yych = *YYCURSOR;
-yy493:
-               YYDEBUG(493, *YYCURSOR);
+yy488:
+               YYDEBUG(488, *YYCURSOR);
                if (yych <= 'S') {
                        if (yych <= 'D') {
                                if (yych <= ' ') {
-                                       if (yych == '\t') goto yy492;
-                                       if (yych <= 0x1F) goto yy284;
-                                       goto yy492;
+                                       if (yych == '\t') goto yy487;
+                                       if (yych <= 0x1F) goto yy281;
+                                       goto yy487;
                                } else {
                                        if (yych <= 'A') {
-                                               if (yych <= '@') goto yy284;
-                                               goto yy497;
+                                               if (yych <= '@') goto yy281;
+                                               goto yy492;
                                        } else {
-                                               if (yych <= 'B') goto yy495;
-                                               if (yych <= 'C') goto yy284;
-                                               goto yy500;
+                                               if (yych <= 'B') goto yy490;
+                                               if (yych <= 'C') goto yy281;
+                                               goto yy495;
                                        }
                                }
                        } else {
                                if (yych <= 'I') {
-                                       if (yych == 'F') goto yy501;
-                                       if (yych <= 'H') goto yy284;
-                                       goto yy502;
+                                       if (yych == 'F') goto yy496;
+                                       if (yych <= 'H') goto yy281;
+                                       goto yy497;
                                } else {
                                        if (yych <= 'O') {
-                                               if (yych <= 'N') goto yy284;
-                                               goto yy496;
+                                               if (yych <= 'N') goto yy281;
+                                               goto yy491;
                                        } else {
-                                               if (yych <= 'Q') goto yy284;
-                                               if (yych <= 'R') goto yy499;
-                                               goto yy498;
+                                               if (yych <= 'Q') goto yy281;
+                                               if (yych <= 'R') goto yy494;
+                                               goto yy493;
                                        }
                                }
                        }
                } else {
                        if (yych <= 'f') {
                                if (yych <= 'a') {
-                                       if (yych == 'U') goto yy494;
-                                       if (yych <= '`') goto yy284;
-                                       goto yy497;
+                                       if (yych == 'U') goto yy489;
+                                       if (yych <= '`') goto yy281;
+                                       goto yy492;
                                } else {
                                        if (yych <= 'c') {
-                                               if (yych <= 'b') goto yy495;
-                                               goto yy284;
+                                               if (yych <= 'b') goto yy490;
+                                               goto yy281;
                                        } else {
-                                               if (yych <= 'd') goto yy500;
-                                               if (yych <= 'e') goto yy284;
-                                               goto yy501;
+                                               if (yych <= 'd') goto yy495;
+                                               if (yych <= 'e') goto yy281;
+                                               goto yy496;
                                        }
                                }
                        } else {
                                if (yych <= 'q') {
                                        if (yych <= 'i') {
-                                               if (yych <= 'h') goto yy284;
-                                               goto yy502;
+                                               if (yych <= 'h') goto yy281;
+                                               goto yy497;
                                        } else {
-                                               if (yych == 'o') goto yy496;
-                                               goto yy284;
+                                               if (yych == 'o') goto yy491;
+                                               goto yy281;
                                        }
                                } else {
                                        if (yych <= 's') {
-                                               if (yych <= 'r') goto yy499;
-                                               goto yy498;
+                                               if (yych <= 'r') goto yy494;
+                                               goto yy493;
                                        } else {
-                                               if (yych != 'u') goto yy284;
+                                               if (yych != 'u') goto yy281;
                                        }
                                }
                        }
                }
-yy494:
-               YYDEBUG(494, *YYCURSOR);
+yy489:
+               YYDEBUG(489, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'N') goto yy565;
-               if (yych == 'n') goto yy565;
-               goto yy284;
-yy495:
-               YYDEBUG(495, *YYCURSOR);
+               if (yych == 'N') goto yy560;
+               if (yych == 'n') goto yy560;
+               goto yy281;
+yy490:
+               YYDEBUG(490, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych <= 'O') {
-                       if (yych == 'I') goto yy548;
-                       if (yych <= 'N') goto yy284;
-                       goto yy549;
+                       if (yych == 'I') goto yy543;
+                       if (yych <= 'N') goto yy281;
+                       goto yy544;
                } else {
                        if (yych <= 'i') {
-                               if (yych <= 'h') goto yy284;
-                               goto yy548;
+                               if (yych <= 'h') goto yy281;
+                               goto yy543;
                        } else {
-                               if (yych == 'o') goto yy549;
-                               goto yy284;
+                               if (yych == 'o') goto yy544;
+                               goto yy281;
                        }
                }
-yy496:
-               YYDEBUG(496, *YYCURSOR);
+yy491:
+               YYDEBUG(491, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'B') goto yy540;
-               if (yych == 'b') goto yy540;
-               goto yy284;
+               if (yych == 'B') goto yy535;
+               if (yych == 'b') goto yy535;
+               goto yy281;
+yy492:
+               YYDEBUG(492, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'R') goto yy528;
+               if (yych == 'r') goto yy528;
+               goto yy281;
+yy493:
+               YYDEBUG(493, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'T') goto yy520;
+               if (yych == 't') goto yy520;
+               goto yy281;
+yy494:
+               YYDEBUG(494, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'E') goto yy518;
+               if (yych == 'e') goto yy518;
+               goto yy281;
+yy495:
+               YYDEBUG(495, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'O') goto yy514;
+               if (yych == 'o') goto yy514;
+               goto yy281;
+yy496:
+               YYDEBUG(496, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'L') goto yy507;
+               if (yych == 'l') goto yy507;
+               goto yy281;
 yy497:
                YYDEBUG(497, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'R') goto yy533;
-               if (yych == 'r') goto yy533;
-               goto yy284;
+               if (yych == 'N') goto yy498;
+               if (yych != 'n') goto yy281;
 yy498:
                YYDEBUG(498, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'T') goto yy525;
-               if (yych == 't') goto yy525;
-               goto yy284;
+               if (yych == 'T') goto yy499;
+               if (yych != 't') goto yy281;
 yy499:
                YYDEBUG(499, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'E') goto yy523;
-               if (yych == 'e') goto yy523;
-               goto yy284;
+               if (yych == 'E') goto yy500;
+               if (yych != 'e') goto yy502;
 yy500:
                YYDEBUG(500, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'O') goto yy519;
-               if (yych == 'o') goto yy519;
-               goto yy284;
+               if (yych == 'G') goto yy505;
+               if (yych == 'g') goto yy505;
+               goto yy281;
 yy501:
                YYDEBUG(501, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'L') goto yy512;
-               if (yych == 'l') goto yy512;
-               goto yy284;
-yy502:
-               YYDEBUG(502, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'N') goto yy503;
-               if (yych != 'n') goto yy284;
-yy503:
-               YYDEBUG(503, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'T') goto yy504;
-               if (yych != 't') goto yy284;
-yy504:
-               YYDEBUG(504, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'E') goto yy505;
-               if (yych != 'e') goto yy507;
-yy505:
-               YYDEBUG(505, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'G') goto yy510;
-               if (yych == 'g') goto yy510;
-               goto yy284;
-yy506:
-               YYDEBUG(506, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-yy507:
-               YYDEBUG(507, *YYCURSOR);
+yy502:
+               YYDEBUG(502, *YYCURSOR);
                if (yych <= 0x1F) {
-                       if (yych == '\t') goto yy506;
-                       goto yy284;
+                       if (yych == '\t') goto yy501;
+                       goto yy281;
                } else {
-                       if (yych <= ' ') goto yy506;
-                       if (yych != ')') goto yy284;
+                       if (yych <= ' ') goto yy501;
+                       if (yych != ')') goto yy281;
                }
-               YYDEBUG(508, *YYCURSOR);
+               YYDEBUG(503, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(509, *YYCURSOR);
+               YYDEBUG(504, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1601 "Zend/zend_language_scanner.l"
+#line 1604 "Zend/zend_language_scanner.l"
                {
        return T_INT_CAST;
 }
-#line 6146 "Zend/zend_language_scanner.c"
-yy510:
-               YYDEBUG(510, *YYCURSOR);
+#line 6147 "Zend/zend_language_scanner.c"
+yy505:
+               YYDEBUG(505, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'E') goto yy511;
-               if (yych != 'e') goto yy284;
-yy511:
-               YYDEBUG(511, *YYCURSOR);
+               if (yych == 'E') goto yy506;
+               if (yych != 'e') goto yy281;
+yy506:
+               YYDEBUG(506, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'R') goto yy506;
-               if (yych == 'r') goto yy506;
-               goto yy284;
-yy512:
-               YYDEBUG(512, *YYCURSOR);
+               if (yych == 'R') goto yy501;
+               if (yych == 'r') goto yy501;
+               goto yy281;
+yy507:
+               YYDEBUG(507, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'O') goto yy513;
-               if (yych != 'o') goto yy284;
-yy513:
-               YYDEBUG(513, *YYCURSOR);
+               if (yych == 'O') goto yy508;
+               if (yych != 'o') goto yy281;
+yy508:
+               YYDEBUG(508, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'A') goto yy514;
-               if (yych != 'a') goto yy284;
-yy514:
-               YYDEBUG(514, *YYCURSOR);
+               if (yych == 'A') goto yy509;
+               if (yych != 'a') goto yy281;
+yy509:
+               YYDEBUG(509, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'T') goto yy515;
-               if (yych != 't') goto yy284;
-yy515:
-               YYDEBUG(515, *YYCURSOR);
+               if (yych == 'T') goto yy510;
+               if (yych != 't') goto yy281;
+yy510:
+               YYDEBUG(510, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(516, *YYCURSOR);
+               YYDEBUG(511, *YYCURSOR);
                if (yych <= 0x1F) {
-                       if (yych == '\t') goto yy515;
-                       goto yy284;
+                       if (yych == '\t') goto yy510;
+                       goto yy281;
                } else {
-                       if (yych <= ' ') goto yy515;
-                       if (yych != ')') goto yy284;
+                       if (yych <= ' ') goto yy510;
+                       if (yych != ')') goto yy281;
                }
-               YYDEBUG(517, *YYCURSOR);
+               YYDEBUG(512, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(518, *YYCURSOR);
+               YYDEBUG(513, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1605 "Zend/zend_language_scanner.l"
+#line 1608 "Zend/zend_language_scanner.l"
                {
        return T_DOUBLE_CAST;
 }
-#line 6194 "Zend/zend_language_scanner.c"
+#line 6195 "Zend/zend_language_scanner.c"
+yy514:
+               YYDEBUG(514, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'U') goto yy515;
+               if (yych != 'u') goto yy281;
+yy515:
+               YYDEBUG(515, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'B') goto yy516;
+               if (yych != 'b') goto yy281;
+yy516:
+               YYDEBUG(516, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'L') goto yy517;
+               if (yych != 'l') goto yy281;
+yy517:
+               YYDEBUG(517, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'E') goto yy510;
+               if (yych == 'e') goto yy510;
+               goto yy281;
+yy518:
+               YYDEBUG(518, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'A') goto yy519;
+               if (yych != 'a') goto yy281;
 yy519:
                YYDEBUG(519, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'U') goto yy520;
-               if (yych != 'u') goto yy284;
+               if (yych == 'L') goto yy510;
+               if (yych == 'l') goto yy510;
+               goto yy281;
 yy520:
                YYDEBUG(520, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'B') goto yy521;
-               if (yych != 'b') goto yy284;
+               if (yych == 'R') goto yy521;
+               if (yych != 'r') goto yy281;
 yy521:
                YYDEBUG(521, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'L') goto yy522;
-               if (yych != 'l') goto yy284;
+               if (yych == 'I') goto yy522;
+               if (yych != 'i') goto yy281;
 yy522:
                YYDEBUG(522, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'E') goto yy515;
-               if (yych == 'e') goto yy515;
-               goto yy284;
+               if (yych == 'N') goto yy523;
+               if (yych != 'n') goto yy281;
 yy523:
                YYDEBUG(523, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'A') goto yy524;
-               if (yych != 'a') goto yy284;
+               if (yych == 'G') goto yy524;
+               if (yych != 'g') goto yy281;
 yy524:
                YYDEBUG(524, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'L') goto yy515;
-               if (yych == 'l') goto yy515;
-               goto yy284;
-yy525:
-               YYDEBUG(525, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'R') goto yy526;
-               if (yych != 'r') goto yy284;
-yy526:
-               YYDEBUG(526, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'I') goto yy527;
-               if (yych != 'i') goto yy284;
-yy527:
-               YYDEBUG(527, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'N') goto yy528;
-               if (yych != 'n') goto yy284;
-yy528:
-               YYDEBUG(528, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'G') goto yy529;
-               if (yych != 'g') goto yy284;
-yy529:
-               YYDEBUG(529, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(530, *YYCURSOR);
+               YYDEBUG(525, *YYCURSOR);
                if (yych <= 0x1F) {
-                       if (yych == '\t') goto yy529;
-                       goto yy284;
+                       if (yych == '\t') goto yy524;
+                       goto yy281;
                } else {
-                       if (yych <= ' ') goto yy529;
-                       if (yych != ')') goto yy284;
+                       if (yych <= ' ') goto yy524;
+                       if (yych != ')') goto yy281;
                }
-               YYDEBUG(531, *YYCURSOR);
+               YYDEBUG(526, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(532, *YYCURSOR);
+               YYDEBUG(527, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1609 "Zend/zend_language_scanner.l"
+#line 1612 "Zend/zend_language_scanner.l"
                {
        return T_STRING_CAST;
 }
-#line 6268 "Zend/zend_language_scanner.c"
-yy533:
-               YYDEBUG(533, *YYCURSOR);
+#line 6269 "Zend/zend_language_scanner.c"
+yy528:
+               YYDEBUG(528, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'R') goto yy534;
-               if (yych != 'r') goto yy284;
-yy534:
-               YYDEBUG(534, *YYCURSOR);
+               if (yych == 'R') goto yy529;
+               if (yych != 'r') goto yy281;
+yy529:
+               YYDEBUG(529, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'A') goto yy535;
-               if (yych != 'a') goto yy284;
-yy535:
-               YYDEBUG(535, *YYCURSOR);
+               if (yych == 'A') goto yy530;
+               if (yych != 'a') goto yy281;
+yy530:
+               YYDEBUG(530, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'Y') goto yy536;
-               if (yych != 'y') goto yy284;
-yy536:
-               YYDEBUG(536, *YYCURSOR);
+               if (yych == 'Y') goto yy531;
+               if (yych != 'y') goto yy281;
+yy531:
+               YYDEBUG(531, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(537, *YYCURSOR);
+               YYDEBUG(532, *YYCURSOR);
                if (yych <= 0x1F) {
-                       if (yych == '\t') goto yy536;
-                       goto yy284;
+                       if (yych == '\t') goto yy531;
+                       goto yy281;
                } else {
-                       if (yych <= ' ') goto yy536;
-                       if (yych != ')') goto yy284;
+                       if (yych <= ' ') goto yy531;
+                       if (yych != ')') goto yy281;
                }
-               YYDEBUG(538, *YYCURSOR);
+               YYDEBUG(533, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(539, *YYCURSOR);
+               YYDEBUG(534, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1621 "Zend/zend_language_scanner.l"
+#line 1624 "Zend/zend_language_scanner.l"
                {
        return T_ARRAY_CAST;
 }
-#line 6305 "Zend/zend_language_scanner.c"
-yy540:
-               YYDEBUG(540, *YYCURSOR);
+#line 6306 "Zend/zend_language_scanner.c"
+yy535:
+               YYDEBUG(535, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'J') goto yy541;
-               if (yych != 'j') goto yy284;
-yy541:
-               YYDEBUG(541, *YYCURSOR);
+               if (yych == 'J') goto yy536;
+               if (yych != 'j') goto yy281;
+yy536:
+               YYDEBUG(536, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'E') goto yy542;
-               if (yych != 'e') goto yy284;
-yy542:
-               YYDEBUG(542, *YYCURSOR);
+               if (yych == 'E') goto yy537;
+               if (yych != 'e') goto yy281;
+yy537:
+               YYDEBUG(537, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'C') goto yy543;
-               if (yych != 'c') goto yy284;
-yy543:
-               YYDEBUG(543, *YYCURSOR);
+               if (yych == 'C') goto yy538;
+               if (yych != 'c') goto yy281;
+yy538:
+               YYDEBUG(538, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'T') goto yy544;
-               if (yych != 't') goto yy284;
-yy544:
-               YYDEBUG(544, *YYCURSOR);
+               if (yych == 'T') goto yy539;
+               if (yych != 't') goto yy281;
+yy539:
+               YYDEBUG(539, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(545, *YYCURSOR);
+               YYDEBUG(540, *YYCURSOR);
                if (yych <= 0x1F) {
-                       if (yych == '\t') goto yy544;
-                       goto yy284;
+                       if (yych == '\t') goto yy539;
+                       goto yy281;
                } else {
-                       if (yych <= ' ') goto yy544;
-                       if (yych != ')') goto yy284;
+                       if (yych <= ' ') goto yy539;
+                       if (yych != ')') goto yy281;
                }
-               YYDEBUG(546, *YYCURSOR);
+               YYDEBUG(541, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(547, *YYCURSOR);
+               YYDEBUG(542, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1625 "Zend/zend_language_scanner.l"
+#line 1628 "Zend/zend_language_scanner.l"
                {
        return T_OBJECT_CAST;
 }
-#line 6347 "Zend/zend_language_scanner.c"
-yy548:
-               YYDEBUG(548, *YYCURSOR);
+#line 6348 "Zend/zend_language_scanner.c"
+yy543:
+               YYDEBUG(543, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'N') goto yy558;
-               if (yych == 'n') goto yy558;
-               goto yy284;
-yy549:
-               YYDEBUG(549, *YYCURSOR);
+               if (yych == 'N') goto yy553;
+               if (yych == 'n') goto yy553;
+               goto yy281;
+yy544:
+               YYDEBUG(544, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'O') goto yy550;
-               if (yych != 'o') goto yy284;
-yy550:
-               YYDEBUG(550, *YYCURSOR);
+               if (yych == 'O') goto yy545;
+               if (yych != 'o') goto yy281;
+yy545:
+               YYDEBUG(545, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'L') goto yy551;
-               if (yych != 'l') goto yy284;
-yy551:
-               YYDEBUG(551, *YYCURSOR);
+               if (yych == 'L') goto yy546;
+               if (yych != 'l') goto yy281;
+yy546:
+               YYDEBUG(546, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'E') goto yy556;
-               if (yych == 'e') goto yy556;
-               goto yy553;
-yy552:
-               YYDEBUG(552, *YYCURSOR);
+               if (yych == 'E') goto yy551;
+               if (yych == 'e') goto yy551;
+               goto yy548;
+yy547:
+               YYDEBUG(547, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-yy553:
-               YYDEBUG(553, *YYCURSOR);
+yy548:
+               YYDEBUG(548, *YYCURSOR);
                if (yych <= 0x1F) {
-                       if (yych == '\t') goto yy552;
-                       goto yy284;
+                       if (yych == '\t') goto yy547;
+                       goto yy281;
                } else {
-                       if (yych <= ' ') goto yy552;
-                       if (yych != ')') goto yy284;
+                       if (yych <= ' ') goto yy547;
+                       if (yych != ')') goto yy281;
                }
-               YYDEBUG(554, *YYCURSOR);
+               YYDEBUG(549, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(555, *YYCURSOR);
+               YYDEBUG(550, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1629 "Zend/zend_language_scanner.l"
+#line 1632 "Zend/zend_language_scanner.l"
                {
        return T_BOOL_CAST;
 }
-#line 6392 "Zend/zend_language_scanner.c"
-yy556:
-               YYDEBUG(556, *YYCURSOR);
+#line 6393 "Zend/zend_language_scanner.c"
+yy551:
+               YYDEBUG(551, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'A') goto yy557;
-               if (yych != 'a') goto yy284;
-yy557:
-               YYDEBUG(557, *YYCURSOR);
+               if (yych == 'A') goto yy552;
+               if (yych != 'a') goto yy281;
+yy552:
+               YYDEBUG(552, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'N') goto yy552;
-               if (yych == 'n') goto yy552;
-               goto yy284;
-yy558:
-               YYDEBUG(558, *YYCURSOR);
+               if (yych == 'N') goto yy547;
+               if (yych == 'n') goto yy547;
+               goto yy281;
+yy553:
+               YYDEBUG(553, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'A') goto yy559;
-               if (yych != 'a') goto yy284;
-yy559:
-               YYDEBUG(559, *YYCURSOR);
+               if (yych == 'A') goto yy554;
+               if (yych != 'a') goto yy281;
+yy554:
+               YYDEBUG(554, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'R') goto yy560;
-               if (yych != 'r') goto yy284;
-yy560:
-               YYDEBUG(560, *YYCURSOR);
+               if (yych == 'R') goto yy555;
+               if (yych != 'r') goto yy281;
+yy555:
+               YYDEBUG(555, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'Y') goto yy561;
-               if (yych != 'y') goto yy284;
-yy561:
-               YYDEBUG(561, *YYCURSOR);
+               if (yych == 'Y') goto yy556;
+               if (yych != 'y') goto yy281;
+yy556:
+               YYDEBUG(556, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(562, *YYCURSOR);
+               YYDEBUG(557, *YYCURSOR);
                if (yych <= 0x1F) {
-                       if (yych == '\t') goto yy561;
-                       goto yy284;
+                       if (yych == '\t') goto yy556;
+                       goto yy281;
                } else {
-                       if (yych <= ' ') goto yy561;
-                       if (yych != ')') goto yy284;
+                       if (yych <= ' ') goto yy556;
+                       if (yych != ')') goto yy281;
                }
-               YYDEBUG(563, *YYCURSOR);
+               YYDEBUG(558, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(564, *YYCURSOR);
+               YYDEBUG(559, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1617 "Zend/zend_language_scanner.l"
+#line 1620 "Zend/zend_language_scanner.l"
                {
        return T_BINARY_CAST;
 }
-#line 6440 "Zend/zend_language_scanner.c"
-yy565:
-               YYDEBUG(565, *YYCURSOR);
+#line 6441 "Zend/zend_language_scanner.c"
+yy560:
+               YYDEBUG(560, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych <= 'S') {
-                       if (yych == 'I') goto yy567;
-                       if (yych <= 'R') goto yy284;
+                       if (yych == 'I') goto yy562;
+                       if (yych <= 'R') goto yy281;
                } else {
                        if (yych <= 'i') {
-                               if (yych <= 'h') goto yy284;
-                               goto yy567;
+                               if (yych <= 'h') goto yy281;
+                               goto yy562;
                        } else {
-                               if (yych != 's') goto yy284;
+                               if (yych != 's') goto yy281;
                        }
                }
-               YYDEBUG(566, *YYCURSOR);
+               YYDEBUG(561, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'E') goto yy575;
-               if (yych == 'e') goto yy575;
-               goto yy284;
-yy567:
-               YYDEBUG(567, *YYCURSOR);
+               if (yych == 'E') goto yy570;
+               if (yych == 'e') goto yy570;
+               goto yy281;
+yy562:
+               YYDEBUG(562, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'C') goto yy568;
-               if (yych != 'c') goto yy284;
-yy568:
-               YYDEBUG(568, *YYCURSOR);
+               if (yych == 'C') goto yy563;
+               if (yych != 'c') goto yy281;
+yy563:
+               YYDEBUG(563, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'O') goto yy569;
-               if (yych != 'o') goto yy284;
-yy569:
-               YYDEBUG(569, *YYCURSOR);
+               if (yych == 'O') goto yy564;
+               if (yych != 'o') goto yy281;
+yy564:
+               YYDEBUG(564, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'D') goto yy565;
+               if (yych != 'd') goto yy281;
+yy565:
+               YYDEBUG(565, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'D') goto yy570;
-               if (yych != 'd') goto yy284;
+               if (yych == 'E') goto yy566;
+               if (yych != 'e') goto yy281;
+yy566:
+               YYDEBUG(566, *YYCURSOR);
+               ++YYCURSOR;
+               YYFILL(1);
+               yych = *YYCURSOR;
+               YYDEBUG(567, *YYCURSOR);
+               if (yych <= 0x1F) {
+                       if (yych == '\t') goto yy566;
+                       goto yy281;
+               } else {
+                       if (yych <= ' ') goto yy566;
+                       if (yych != ')') goto yy281;
+               }
+               YYDEBUG(568, *YYCURSOR);
+               ++YYCURSOR;
+               YYDEBUG(569, *YYCURSOR);
+               yyleng = YYCURSOR - SCNG(yy_text);
+#line 1616 "Zend/zend_language_scanner.l"
+               {
+       return T_UNICODE_CAST;
+}
+#line 6502 "Zend/zend_language_scanner.c"
 yy570:
                YYDEBUG(570, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'E') goto yy571;
-               if (yych != 'e') goto yy284;
+               if (yych == 'T') goto yy571;
+               if (yych != 't') goto yy281;
 yy571:
                YYDEBUG(571, *YYCURSOR);
                ++YYCURSOR;
@@ -6484,2185 +6512,2179 @@ yy571:
                YYDEBUG(572, *YYCURSOR);
                if (yych <= 0x1F) {
                        if (yych == '\t') goto yy571;
-                       goto yy284;
+                       goto yy281;
                } else {
                        if (yych <= ' ') goto yy571;
-                       if (yych != ')') goto yy284;
+                       if (yych != ')') goto yy281;
                }
                YYDEBUG(573, *YYCURSOR);
                ++YYCURSOR;
                YYDEBUG(574, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1613 "Zend/zend_language_scanner.l"
+#line 1636 "Zend/zend_language_scanner.l"
                {
-       return T_UNICODE_CAST;
+       return T_UNSET_CAST;
 }
-#line 6501 "Zend/zend_language_scanner.c"
+#line 6529 "Zend/zend_language_scanner.c"
 yy575:
                YYDEBUG(575, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'T') goto yy576;
-               if (yych != 't') goto yy284;
+               if (yych == 'R') goto yy576;
+               if (yych != 'r') goto yy291;
 yy576:
                YYDEBUG(576, *YYCURSOR);
                ++YYCURSOR;
-               YYFILL(1);
-               yych = *YYCURSOR;
-               YYDEBUG(577, *YYCURSOR);
-               if (yych <= 0x1F) {
-                       if (yych == '\t') goto yy576;
-                       goto yy284;
-               } else {
-                       if (yych <= ' ') goto yy576;
-                       if (yych != ')') goto yy284;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
-               YYDEBUG(578, *YYCURSOR);
-               ++YYCURSOR;
-               YYDEBUG(579, *YYCURSOR);
+               YYDEBUG(577, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1633 "Zend/zend_language_scanner.l"
+#line 1600 "Zend/zend_language_scanner.l"
                {
-       return T_UNSET_CAST;
+       return T_VAR;
 }
-#line 6528 "Zend/zend_language_scanner.c"
+#line 6547 "Zend/zend_language_scanner.c"
+yy578:
+               YYDEBUG(578, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'M') goto yy582;
+               if (yych == 'm') goto yy582;
+               goto yy291;
+yy579:
+               YYDEBUG(579, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'W') goto yy580;
+               if (yych != 'w') goto yy291;
 yy580:
                YYDEBUG(580, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'R') goto yy581;
-               if (yych != 'r') goto yy296;
-yy581:
-               YYDEBUG(581, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
-               YYDEBUG(582, *YYCURSOR);
+               YYDEBUG(581, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1597 "Zend/zend_language_scanner.l"
+#line 1592 "Zend/zend_language_scanner.l"
                {
-       return T_VAR;
+       return T_NEW;
 }
-#line 6546 "Zend/zend_language_scanner.c"
+#line 6571 "Zend/zend_language_scanner.c"
+yy582:
+               YYDEBUG(582, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'E') goto yy583;
+               if (yych != 'e') goto yy291;
 yy583:
                YYDEBUG(583, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'M') goto yy587;
-               if (yych == 'm') goto yy587;
-               goto yy296;
+               if (yych == 'S') goto yy584;
+               if (yych != 's') goto yy291;
 yy584:
                YYDEBUG(584, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'W') goto yy585;
-               if (yych != 'w') goto yy296;
+               if (yych == 'P') goto yy585;
+               if (yych != 'p') goto yy291;
 yy585:
                YYDEBUG(585, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
-               }
+               yych = *++YYCURSOR;
+               if (yych == 'A') goto yy586;
+               if (yych != 'a') goto yy291;
+yy586:
                YYDEBUG(586, *YYCURSOR);
-               yyleng = YYCURSOR - SCNG(yy_text);
-#line 1589 "Zend/zend_language_scanner.l"
-               {
-       return T_NEW;
-}
-#line 6570 "Zend/zend_language_scanner.c"
+               yych = *++YYCURSOR;
+               if (yych == 'C') goto yy587;
+               if (yych != 'c') goto yy291;
 yy587:
                YYDEBUG(587, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych == 'E') goto yy588;
-               if (yych != 'e') goto yy296;
+               if (yych != 'e') goto yy291;
 yy588:
                YYDEBUG(588, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'S') goto yy589;
-               if (yych != 's') goto yy296;
-yy589:
-               YYDEBUG(589, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'P') goto yy590;
-               if (yych != 'p') goto yy296;
-yy590:
-               YYDEBUG(590, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'A') goto yy591;
-               if (yych != 'a') goto yy296;
-yy591:
-               YYDEBUG(591, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'C') goto yy592;
-               if (yych != 'c') goto yy296;
-yy592:
-               YYDEBUG(592, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'E') goto yy593;
-               if (yych != 'e') goto yy296;
-yy593:
-               YYDEBUG(593, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
-               YYDEBUG(594, *YYCURSOR);
+               YYDEBUG(589, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1657 "Zend/zend_language_scanner.l"
+#line 1660 "Zend/zend_language_scanner.l"
                {
        return T_NAMESPACE;
 }
-#line 6613 "Zend/zend_language_scanner.c"
-yy595:
-               YYDEBUG(595, *YYCURSOR);
+#line 6614 "Zend/zend_language_scanner.c"
+yy590:
+               YYDEBUG(590, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(596, *YYCURSOR);
+               YYDEBUG(591, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1585 "Zend/zend_language_scanner.l"
+#line 1588 "Zend/zend_language_scanner.l"
                {
        return T_PAAMAYIM_NEKUDOTAYIM;
 }
-#line 6623 "Zend/zend_language_scanner.c"
-yy597:
-               YYDEBUG(597, *YYCURSOR);
+#line 6624 "Zend/zend_language_scanner.c"
+yy592:
+               YYDEBUG(592, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(598, *YYCURSOR);
+               YYFILL(1);
+               yych = *YYCURSOR;
+yy593:
+               YYDEBUG(593, *YYCURSOR);
+               if (yych <= '\f') {
+                       if (yych <= 0x08) goto yy232;
+                       if (yych <= '\n') goto yy592;
+                       goto yy232;
+               } else {
+                       if (yych <= '\r') goto yy592;
+                       if (yych == ' ') goto yy592;
+                       goto yy232;
+               }
+yy594:
+               YYDEBUG(594, *YYCURSOR);
+               ++YYCURSOR;
+               YYDEBUG(595, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1757 "Zend/zend_language_scanner.l"
+#line 1760 "Zend/zend_language_scanner.l"
                {
        return T_MINUS_EQUAL;
 }
-#line 6633 "Zend/zend_language_scanner.c"
-yy599:
-               YYDEBUG(599, *YYCURSOR);
+#line 6650 "Zend/zend_language_scanner.c"
+yy596:
+               YYDEBUG(596, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(600, *YYCURSOR);
+               YYDEBUG(597, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1725 "Zend/zend_language_scanner.l"
+#line 1728 "Zend/zend_language_scanner.l"
                {
        return T_DEC;
 }
-#line 6643 "Zend/zend_language_scanner.c"
-yy601:
-               YYDEBUG(601, *YYCURSOR);
+#line 6660 "Zend/zend_language_scanner.c"
+yy598:
+               YYDEBUG(598, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(602, *YYCURSOR);
+               YYDEBUG(599, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1554 "Zend/zend_language_scanner.l"
                {
        yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC);
        return T_OBJECT_OPERATOR;
 }
-#line 6654 "Zend/zend_language_scanner.c"
-yy603:
-               YYDEBUG(603, *YYCURSOR);
+#line 6671 "Zend/zend_language_scanner.c"
+yy600:
+               YYDEBUG(600, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych <= 'O') {
-                       if (yych == 'I') goto yy610;
-                       if (yych <= 'N') goto yy296;
-                       goto yy611;
+                       if (yych == 'I') goto yy607;
+                       if (yych <= 'N') goto yy291;
+                       goto yy608;
                } else {
                        if (yych <= 'i') {
-                               if (yych <= 'h') goto yy296;
-                               goto yy610;
+                               if (yych <= 'h') goto yy291;
+                               goto yy607;
                        } else {
-                               if (yych == 'o') goto yy611;
-                               goto yy296;
+                               if (yych == 'o') goto yy608;
+                               goto yy291;
                        }
                }
+yy601:
+               YYDEBUG(601, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'B') goto yy602;
+               if (yych != 'b') goto yy291;
+yy602:
+               YYDEBUG(602, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'L') goto yy603;
+               if (yych != 'l') goto yy291;
+yy603:
+               YYDEBUG(603, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'I') goto yy604;
+               if (yych != 'i') goto yy291;
 yy604:
                YYDEBUG(604, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'B') goto yy605;
-               if (yych != 'b') goto yy296;
+               if (yych == 'C') goto yy605;
+               if (yych != 'c') goto yy291;
 yy605:
                YYDEBUG(605, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'L') goto yy606;
-               if (yych != 'l') goto yy296;
-yy606:
-               YYDEBUG(606, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'I') goto yy607;
-               if (yych != 'i') goto yy296;
-yy607:
-               YYDEBUG(607, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'C') goto yy608;
-               if (yych != 'c') goto yy296;
-yy608:
-               YYDEBUG(608, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
-               YYDEBUG(609, *YYCURSOR);
+               YYDEBUG(606, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1701 "Zend/zend_language_scanner.l"
+#line 1704 "Zend/zend_language_scanner.l"
                {
        return T_PUBLIC;
 }
-#line 6703 "Zend/zend_language_scanner.c"
-yy610:
-               YYDEBUG(610, *YYCURSOR);
+#line 6720 "Zend/zend_language_scanner.c"
+yy607:
+               YYDEBUG(607, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych <= 'V') {
-                       if (yych == 'N') goto yy619;
-                       if (yych <= 'U') goto yy296;
-                       goto yy620;
+                       if (yych == 'N') goto yy616;
+                       if (yych <= 'U') goto yy291;
+                       goto yy617;
                } else {
                        if (yych <= 'n') {
-                               if (yych <= 'm') goto yy296;
-                               goto yy619;
+                               if (yych <= 'm') goto yy291;
+                               goto yy616;
                        } else {
-                               if (yych == 'v') goto yy620;
-                               goto yy296;
+                               if (yych == 'v') goto yy617;
+                               goto yy291;
                        }
                }
+yy608:
+               YYDEBUG(608, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'T') goto yy609;
+               if (yych != 't') goto yy291;
+yy609:
+               YYDEBUG(609, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'E') goto yy610;
+               if (yych != 'e') goto yy291;
+yy610:
+               YYDEBUG(610, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'C') goto yy611;
+               if (yych != 'c') goto yy291;
 yy611:
                YYDEBUG(611, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych == 'T') goto yy612;
-               if (yych != 't') goto yy296;
+               if (yych != 't') goto yy291;
 yy612:
                YYDEBUG(612, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych == 'E') goto yy613;
-               if (yych != 'e') goto yy296;
+               if (yych != 'e') goto yy291;
 yy613:
                YYDEBUG(613, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'C') goto yy614;
-               if (yych != 'c') goto yy296;
+               if (yych == 'D') goto yy614;
+               if (yych != 'd') goto yy291;
 yy614:
                YYDEBUG(614, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'T') goto yy615;
-               if (yych != 't') goto yy296;
-yy615:
+               ++YYCURSOR;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
+               }
                YYDEBUG(615, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'E') goto yy616;
-               if (yych != 'e') goto yy296;
+               yyleng = YYCURSOR - SCNG(yy_text);
+#line 1700 "Zend/zend_language_scanner.l"
+               {
+       return T_PROTECTED;
+}
+#line 6779 "Zend/zend_language_scanner.c"
 yy616:
                YYDEBUG(616, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'D') goto yy617;
-               if (yych != 'd') goto yy296;
+               if (yych == 'T') goto yy622;
+               if (yych == 't') goto yy622;
+               goto yy291;
 yy617:
                YYDEBUG(617, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
-               }
+               yych = *++YYCURSOR;
+               if (yych == 'A') goto yy618;
+               if (yych != 'a') goto yy291;
+yy618:
                YYDEBUG(618, *YYCURSOR);
-               yyleng = YYCURSOR - SCNG(yy_text);
-#line 1697 "Zend/zend_language_scanner.l"
-               {
-       return T_PROTECTED;
-}
-#line 6762 "Zend/zend_language_scanner.c"
+               yych = *++YYCURSOR;
+               if (yych == 'T') goto yy619;
+               if (yych != 't') goto yy291;
 yy619:
                YYDEBUG(619, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'T') goto yy625;
-               if (yych == 't') goto yy625;
-               goto yy296;
+               if (yych == 'E') goto yy620;
+               if (yych != 'e') goto yy291;
 yy620:
                YYDEBUG(620, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'A') goto yy621;
-               if (yych != 'a') goto yy296;
-yy621:
-               YYDEBUG(621, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'T') goto yy622;
-               if (yych != 't') goto yy296;
-yy622:
-               YYDEBUG(622, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'E') goto yy623;
-               if (yych != 'e') goto yy296;
-yy623:
-               YYDEBUG(623, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
-               YYDEBUG(624, *YYCURSOR);
+               YYDEBUG(621, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1693 "Zend/zend_language_scanner.l"
+#line 1696 "Zend/zend_language_scanner.l"
                {
        return T_PRIVATE;
 }
-#line 6796 "Zend/zend_language_scanner.c"
-yy625:
-               YYDEBUG(625, *YYCURSOR);
+#line 6813 "Zend/zend_language_scanner.c"
+yy622:
+               YYDEBUG(622, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
-               YYDEBUG(626, *YYCURSOR);
+               YYDEBUG(623, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1534 "Zend/zend_language_scanner.l"
                {
        return T_PRINT;
 }
-#line 6809 "Zend/zend_language_scanner.c"
-yy627:
-               YYDEBUG(627, *YYCURSOR);
+#line 6826 "Zend/zend_language_scanner.c"
+yy624:
+               YYDEBUG(624, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'O') goto yy632;
-               if (yych == 'o') goto yy632;
-               goto yy296;
-yy628:
-               YYDEBUG(628, *YYCURSOR);
+               if (yych == 'O') goto yy629;
+               if (yych == 'o') goto yy629;
+               goto yy291;
+yy625:
+               YYDEBUG(625, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'T') goto yy629;
-               if (yych != 't') goto yy296;
-yy629:
-               YYDEBUG(629, *YYCURSOR);
+               if (yych == 'T') goto yy626;
+               if (yych != 't') goto yy291;
+yy626:
+               YYDEBUG(626, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'O') goto yy630;
-               if (yych != 'o') goto yy296;
-yy630:
-               YYDEBUG(630, *YYCURSOR);
+               if (yych == 'O') goto yy627;
+               if (yych != 'o') goto yy291;
+yy627:
+               YYDEBUG(627, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
-               YYDEBUG(631, *YYCURSOR);
+               YYDEBUG(628, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1526 "Zend/zend_language_scanner.l"
                {
        return T_GOTO;
 }
-#line 6838 "Zend/zend_language_scanner.c"
-yy632:
-               YYDEBUG(632, *YYCURSOR);
+#line 6855 "Zend/zend_language_scanner.c"
+yy629:
+               YYDEBUG(629, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'B') goto yy633;
-               if (yych != 'b') goto yy296;
-yy633:
-               YYDEBUG(633, *YYCURSOR);
+               if (yych == 'B') goto yy630;
+               if (yych != 'b') goto yy291;
+yy630:
+               YYDEBUG(630, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'A') goto yy634;
-               if (yych != 'a') goto yy296;
-yy634:
-               YYDEBUG(634, *YYCURSOR);
+               if (yych == 'A') goto yy631;
+               if (yych != 'a') goto yy291;
+yy631:
+               YYDEBUG(631, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'L') goto yy635;
-               if (yych != 'l') goto yy296;
-yy635:
-               YYDEBUG(635, *YYCURSOR);
+               if (yych == 'L') goto yy632;
+               if (yych != 'l') goto yy291;
+yy632:
+               YYDEBUG(632, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
-               YYDEBUG(636, *YYCURSOR);
+               YYDEBUG(633, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1665 "Zend/zend_language_scanner.l"
+#line 1668 "Zend/zend_language_scanner.l"
                {
        return T_GLOBAL;
 }
-#line 6866 "Zend/zend_language_scanner.c"
-yy637:
-               YYDEBUG(637, *YYCURSOR);
+#line 6883 "Zend/zend_language_scanner.c"
+yy634:
+               YYDEBUG(634, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == '<') goto yy660;
-               goto yy284;
-yy638:
-               YYDEBUG(638, *YYCURSOR);
+               if (yych == '<') goto yy657;
+               goto yy281;
+yy635:
+               YYDEBUG(635, *YYCURSOR);
                yyaccept = 8;
                yych = *(YYMARKER = ++YYCURSOR);
-               goto yy653;
-yy639:
-               YYDEBUG(639, *YYCURSOR);
+               goto yy650;
+yy636:
+               YYDEBUG(636, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2434 "Zend/zend_language_scanner.l"
+#line 2429 "Zend/zend_language_scanner.l"
                {
        BEGIN(ST_DOUBLE_QUOTES);
        return T_BINARY_DOUBLE;
 }
-#line 6885 "Zend/zend_language_scanner.c"
-yy640:
-               YYDEBUG(640, *YYCURSOR);
+#line 6902 "Zend/zend_language_scanner.c"
+yy637:
+               YYDEBUG(637, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(641, *YYCURSOR);
-               if (yych == '\'') goto yy648;
-               if (yych == '\\') goto yy647;
-               goto yy640;
-yy642:
-               YYDEBUG(642, *YYCURSOR);
+               YYDEBUG(638, *YYCURSOR);
+               if (yych == '\'') goto yy645;
+               if (yych == '\\') goto yy644;
+               goto yy637;
+yy639:
+               YYDEBUG(639, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'E') goto yy643;
-               if (yych != 'e') goto yy296;
-yy643:
-               YYDEBUG(643, *YYCURSOR);
+               if (yych == 'E') goto yy640;
+               if (yych != 'e') goto yy291;
+yy640:
+               YYDEBUG(640, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'A') goto yy644;
-               if (yych != 'a') goto yy296;
-yy644:
-               YYDEBUG(644, *YYCURSOR);
+               if (yych == 'A') goto yy641;
+               if (yych != 'a') goto yy291;
+yy641:
+               YYDEBUG(641, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'K') goto yy645;
-               if (yych != 'k') goto yy296;
-yy645:
-               YYDEBUG(645, *YYCURSOR);
+               if (yych == 'K') goto yy642;
+               if (yych != 'k') goto yy291;
+yy642:
+               YYDEBUG(642, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
-               YYDEBUG(646, *YYCURSOR);
+               YYDEBUG(643, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1518 "Zend/zend_language_scanner.l"
                {
        return T_BREAK;
 }
-#line 6922 "Zend/zend_language_scanner.c"
-yy647:
-               YYDEBUG(647, *YYCURSOR);
+#line 6939 "Zend/zend_language_scanner.c"
+yy644:
+               YYDEBUG(644, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               goto yy640;
-yy648:
-               YYDEBUG(648, *YYCURSOR);
+               goto yy637;
+yy645:
+               YYDEBUG(645, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(649, *YYCURSOR);
+               YYDEBUG(646, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2423 "Zend/zend_language_scanner.l"
+#line 2418 "Zend/zend_language_scanner.l"
                {
        zend_scan_binary_single_string(zendlval, yytext+2, yyleng-3 TSRMLS_CC);
        return T_CONSTANT_ENCAPSED_STRING;
 }
-#line 6939 "Zend/zend_language_scanner.c"
-yy650:
-               YYDEBUG(650, *YYCURSOR);
+#line 6956 "Zend/zend_language_scanner.c"
+yy647:
+               YYDEBUG(647, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(651, *YYCURSOR);
+               YYDEBUG(648, *YYCURSOR);
                if (yych <= '$') {
-                       if (yych == '"') goto yy657;
-                       if (yych >= '$') goto yy284;
+                       if (yych == '"') goto yy654;
+                       if (yych >= '$') goto yy281;
                } else {
                        if (yych <= '\\') {
-                               if (yych >= '\\') goto yy654;
+                               if (yych >= '\\') goto yy651;
                        } else {
-                               if (yych == '{') goto yy650;
+                               if (yych == '{') goto yy647;
                        }
                }
-yy652:
-               YYDEBUG(652, *YYCURSOR);
+yy649:
+               YYDEBUG(649, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-yy653:
-               YYDEBUG(653, *YYCURSOR);
+yy650:
+               YYDEBUG(650, *YYCURSOR);
                if (yych <= '$') {
-                       if (yych == '"') goto yy657;
-                       if (yych <= '#') goto yy652;
-                       goto yy655;
+                       if (yych == '"') goto yy654;
+                       if (yych <= '#') goto yy649;
+                       goto yy652;
                } else {
                        if (yych <= '\\') {
-                               if (yych <= '[') goto yy652;
+                               if (yych <= '[') goto yy649;
                        } else {
-                               if (yych == '{') goto yy650;
-                               goto yy652;
+                               if (yych == '{') goto yy647;
+                               goto yy649;
                        }
                }
-yy654:
-               YYDEBUG(654, *YYCURSOR);
+yy651:
+               YYDEBUG(651, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               goto yy652;
-yy655:
-               YYDEBUG(655, *YYCURSOR);
+               goto yy649;
+yy652:
+               YYDEBUG(652, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(656, *YYCURSOR);
+               YYDEBUG(653, *YYCURSOR);
                if (yych <= '[') {
                        if (yych <= '#') {
-                               if (yych != '"') goto yy652;
+                               if (yych != '"') goto yy649;
                        } else {
-                               if (yych <= '$') goto yy655;
-                               if (yych <= '@') goto yy652;
-                               if (yych <= 'Z') goto yy284;
-                               goto yy652;
+                               if (yych <= '$') goto yy652;
+                               if (yych <= '@') goto yy649;
+                               if (yych <= 'Z') goto yy281;
+                               goto yy649;
                        }
                } else {
                        if (yych <= '_') {
-                               if (yych <= '\\') goto yy659;
-                               if (yych <= '^') goto yy652;
-                               goto yy284;
+                               if (yych <= '\\') goto yy656;
+                               if (yych <= '^') goto yy649;
+                               goto yy281;
                        } else {
-                               if (yych <= '`') goto yy652;
-                               if (yych <= '{') goto yy284;
-                               if (yych <= '~') goto yy652;
-                               goto yy284;
+                               if (yych <= '`') goto yy649;
+                               if (yych <= '{') goto yy281;
+                               if (yych <= '~') goto yy649;
+                               goto yy281;
                        }
                }
-yy657:
-               YYDEBUG(657, *YYCURSOR);
+yy654:
+               YYDEBUG(654, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(658, *YYCURSOR);
+               YYDEBUG(655, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2407 "Zend/zend_language_scanner.l"
+#line 2402 "Zend/zend_language_scanner.l"
                {
        zend_scan_binary_escape_string(zendlval, yytext+2, yyleng-3, '"' TSRMLS_CC);
        return T_CONSTANT_ENCAPSED_STRING;
 }
-#line 7018 "Zend/zend_language_scanner.c"
-yy659:
-               YYDEBUG(659, *YYCURSOR);
+#line 7035 "Zend/zend_language_scanner.c"
+yy656:
+               YYDEBUG(656, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               goto yy652;
-yy660:
-               YYDEBUG(660, *YYCURSOR);
+               goto yy649;
+yy657:
+               YYDEBUG(657, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != '<') goto yy284;
-yy661:
-               YYDEBUG(661, *YYCURSOR);
+               if (yych != '<') goto yy281;
+yy658:
+               YYDEBUG(658, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(2);
                yych = *YYCURSOR;
-               YYDEBUG(662, *YYCURSOR);
+               YYDEBUG(659, *YYCURSOR);
                if (yych <= '\'') {
                        if (yych <= ' ') {
-                               if (yych == '\t') goto yy661;
-                               if (yych <= 0x1F) goto yy284;
-                               goto yy661;
+                               if (yych == '\t') goto yy658;
+                               if (yych <= 0x1F) goto yy281;
+                               goto yy658;
                        } else {
-                               if (yych == '"') goto yy665;
-                               if (yych <= '&') goto yy284;
-                               goto yy377;
+                               if (yych == '"') goto yy662;
+                               if (yych <= '&') goto yy281;
+                               goto yy372;
                        }
                } else {
                        if (yych <= '_') {
-                               if (yych <= '@') goto yy284;
-                               if (yych <= 'Z') goto yy663;
-                               if (yych <= '^') goto yy284;
+                               if (yych <= '@') goto yy281;
+                               if (yych <= 'Z') goto yy660;
+                               if (yych <= '^') goto yy281;
                        } else {
-                               if (yych <= '`') goto yy284;
-                               if (yych <= 'z') goto yy663;
-                               if (yych <= '~') goto yy284;
+                               if (yych <= '`') goto yy281;
+                               if (yych <= 'z') goto yy660;
+                               if (yych <= '~') goto yy281;
                        }
                }
-yy663:
-               YYDEBUG(663, *YYCURSOR);
+yy660:
+               YYDEBUG(660, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(2);
                yych = *YYCURSOR;
-               YYDEBUG(664, *YYCURSOR);
+               YYDEBUG(661, *YYCURSOR);
                if (yych <= '@') {
                        if (yych <= '\f') {
-                               if (yych == '\n') goto yy669;
-                               goto yy284;
+                               if (yych == '\n') goto yy666;
+                               goto yy281;
                        } else {
-                               if (yych <= '\r') goto yy671;
-                               if (yych <= '/') goto yy284;
-                               if (yych <= '9') goto yy663;
-                               goto yy284;
+                               if (yych <= '\r') goto yy668;
+                               if (yych <= '/') goto yy281;
+                               if (yych <= '9') goto yy660;
+                               goto yy281;
                        }
                } else {
                        if (yych <= '_') {
-                               if (yych <= 'Z') goto yy663;
-                               if (yych <= '^') goto yy284;
-                               goto yy663;
+                               if (yych <= 'Z') goto yy660;
+                               if (yych <= '^') goto yy281;
+                               goto yy660;
                        } else {
-                               if (yych <= '`') goto yy284;
-                               if (yych <= 'z') goto yy663;
-                               if (yych <= '~') goto yy284;
-                               goto yy663;
+                               if (yych <= '`') goto yy281;
+                               if (yych <= 'z') goto yy660;
+                               if (yych <= '~') goto yy281;
+                               goto yy660;
                        }
                }
-yy665:
-               YYDEBUG(665, *YYCURSOR);
+yy662:
+               YYDEBUG(662, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == '"') goto yy284;
-               if (yych <= '/') goto yy667;
-               if (yych <= '9') goto yy284;
-               goto yy667;
-yy666:
-               YYDEBUG(666, *YYCURSOR);
+               if (yych == '"') goto yy281;
+               if (yych <= '/') goto yy664;
+               if (yych <= '9') goto yy281;
+               goto yy664;
+yy663:
+               YYDEBUG(663, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(3);
                yych = *YYCURSOR;
-yy667:
-               YYDEBUG(667, *YYCURSOR);
+yy664:
+               YYDEBUG(664, *YYCURSOR);
                if (yych <= 'Z') {
                        if (yych <= '/') {
-                               if (yych != '"') goto yy284;
+                               if (yych != '"') goto yy281;
                        } else {
-                               if (yych <= '9') goto yy666;
-                               if (yych <= '@') goto yy284;
-                               goto yy666;
+                               if (yych <= '9') goto yy663;
+                               if (yych <= '@') goto yy281;
+                               goto yy663;
                        }
                } else {
                        if (yych <= '`') {
-                               if (yych == '_') goto yy666;
-                               goto yy284;
+                               if (yych == '_') goto yy663;
+                               goto yy281;
                        } else {
-                               if (yych <= 'z') goto yy666;
-                               if (yych <= '~') goto yy284;
-                               goto yy666;
+                               if (yych <= 'z') goto yy663;
+                               if (yych <= '~') goto yy281;
+                               goto yy663;
                        }
                }
-               YYDEBUG(668, *YYCURSOR);
+               YYDEBUG(665, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == '\n') goto yy669;
-               if (yych == '\r') goto yy671;
-               goto yy284;
-yy669:
-               YYDEBUG(669, *YYCURSOR);
+               if (yych == '\n') goto yy666;
+               if (yych == '\r') goto yy668;
+               goto yy281;
+yy666:
+               YYDEBUG(666, *YYCURSOR);
                ++YYCURSOR;
-yy670:
-               YYDEBUG(670, *YYCURSOR);
+yy667:
+               YYDEBUG(667, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2439 "Zend/zend_language_scanner.l"
+#line 2434 "Zend/zend_language_scanner.l"
                {
        char *s;
-       int quotes  = (yytext[4] == '"') ? 2 : 0;
+
        CG(zend_lineno)++;
-       CG(heredoc_len) = yyleng-4-quotes-1-(yytext[yyleng-2]=='\r'?1:0);
-       s = yytext+4+(quotes ? 1 : 0);
+       CG(heredoc_len) = yyleng-4-1-(yytext[yyleng-2]=='\r'?1:0);
+       s = yytext+4;
        while ((*s == ' ') || (*s == '\t')) {
                s++;
                CG(heredoc_len)--;
        }
+
+       if (*s == '"') {
+               s++;
+               CG(heredoc_len) -= 2;
+       }
        CG(heredoc) = estrndup(s, CG(heredoc_len));
        BEGIN(ST_START_HEREDOC);
        return T_BINARY_HEREDOC;
 }
-#line 7142 "Zend/zend_language_scanner.c"
+#line 7164 "Zend/zend_language_scanner.c"
+yy668:
+               YYDEBUG(668, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == '\n') goto yy666;
+               goto yy667;
+yy669:
+               YYDEBUG(669, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'A') goto yy676;
+               if (yych == 'a') goto yy676;
+               goto yy291;
+yy670:
+               YYDEBUG(670, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'I') goto yy671;
+               if (yych != 'i') goto yy291;
 yy671:
                YYDEBUG(671, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == '\n') goto yy669;
-               goto yy670;
+               if (yych == 'T') goto yy672;
+               if (yych != 't') goto yy291;
 yy672:
                YYDEBUG(672, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'A') goto yy679;
-               if (yych == 'a') goto yy679;
-               goto yy296;
+               if (yych == 'C') goto yy673;
+               if (yych != 'c') goto yy291;
 yy673:
                YYDEBUG(673, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'I') goto yy674;
-               if (yych != 'i') goto yy296;
+               if (yych == 'H') goto yy674;
+               if (yych != 'h') goto yy291;
 yy674:
                YYDEBUG(674, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'T') goto yy675;
-               if (yych != 't') goto yy296;
-yy675:
+               ++YYCURSOR;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
+               }
                YYDEBUG(675, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'C') goto yy676;
-               if (yych != 'c') goto yy296;
+               yyleng = YYCURSOR - SCNG(yy_text);
+#line 1502 "Zend/zend_language_scanner.l"
+               {
+       return T_SWITCH;
+}
+#line 7208 "Zend/zend_language_scanner.c"
 yy676:
                YYDEBUG(676, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'H') goto yy677;
-               if (yych != 'h') goto yy296;
+               if (yych == 'T') goto yy677;
+               if (yych != 't') goto yy291;
 yy677:
                YYDEBUG(677, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'I') goto yy678;
+               if (yych != 'i') goto yy291;
+yy678:
+               YYDEBUG(678, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'C') goto yy679;
+               if (yych != 'c') goto yy291;
+yy679:
+               YYDEBUG(679, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
-               YYDEBUG(678, *YYCURSOR);
+               YYDEBUG(680, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1502 "Zend/zend_language_scanner.l"
+#line 1684 "Zend/zend_language_scanner.l"
                {
-       return T_SWITCH;
+       return T_STATIC;
 }
-#line 7186 "Zend/zend_language_scanner.c"
-yy679:
-               YYDEBUG(679, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'T') goto yy680;
-               if (yych != 't') goto yy296;
-yy680:
-               YYDEBUG(680, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'I') goto yy681;
-               if (yych != 'i') goto yy296;
+#line 7236 "Zend/zend_language_scanner.c"
 yy681:
                YYDEBUG(681, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'C') goto yy682;
-               if (yych != 'c') goto yy296;
+               if (yych == 'S') goto yy692;
+               if (yych == 's') goto yy692;
+               goto yy291;
 yy682:
                YYDEBUG(682, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'D') goto yy690;
+               if (yych == 'd') goto yy690;
+               goto yy291;
+yy683:
+               YYDEBUG(683, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'R') goto yy686;
+               if (yych == 'r') goto yy686;
+               goto yy291;
+yy684:
+               YYDEBUG(684, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
-               YYDEBUG(683, *YYCURSOR);
+               YYDEBUG(685, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1681 "Zend/zend_language_scanner.l"
+#line 1498 "Zend/zend_language_scanner.l"
                {
-       return T_STATIC;
+       return T_AS;
 }
-#line 7214 "Zend/zend_language_scanner.c"
-yy684:
-               YYDEBUG(684, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'S') goto yy695;
-               if (yych == 's') goto yy695;
-               goto yy296;
-yy685:
-               YYDEBUG(685, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'D') goto yy693;
-               if (yych == 'd') goto yy693;
-               goto yy296;
+#line 7267 "Zend/zend_language_scanner.c"
 yy686:
                YYDEBUG(686, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'R') goto yy689;
-               if (yych == 'r') goto yy689;
-               goto yy296;
+               if (yych == 'A') goto yy687;
+               if (yych != 'a') goto yy291;
 yy687:
                YYDEBUG(687, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'Y') goto yy688;
+               if (yych != 'y') goto yy291;
+yy688:
+               YYDEBUG(688, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
-               YYDEBUG(688, *YYCURSOR);
+               YYDEBUG(689, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1498 "Zend/zend_language_scanner.l"
+#line 1720 "Zend/zend_language_scanner.l"
                {
-       return T_AS;
+       return T_ARRAY;
 }
-#line 7245 "Zend/zend_language_scanner.c"
-yy689:
-               YYDEBUG(689, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'A') goto yy690;
-               if (yych != 'a') goto yy296;
+#line 7290 "Zend/zend_language_scanner.c"
 yy690:
                YYDEBUG(690, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'Y') goto yy691;
-               if (yych != 'y') goto yy296;
-yy691:
-               YYDEBUG(691, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
-               YYDEBUG(692, *YYCURSOR);
+               YYDEBUG(691, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1717 "Zend/zend_language_scanner.l"
+#line 1812 "Zend/zend_language_scanner.l"
                {
-       return T_ARRAY;
+       return T_LOGICAL_AND;
 }
-#line 7268 "Zend/zend_language_scanner.c"
+#line 7303 "Zend/zend_language_scanner.c"
+yy692:
+               YYDEBUG(692, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'T') goto yy693;
+               if (yych != 't') goto yy291;
 yy693:
                YYDEBUG(693, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
-               }
+               yych = *++YYCURSOR;
+               if (yych == 'R') goto yy694;
+               if (yych != 'r') goto yy291;
+yy694:
                YYDEBUG(694, *YYCURSOR);
-               yyleng = YYCURSOR - SCNG(yy_text);
-#line 1809 "Zend/zend_language_scanner.l"
-               {
-       return T_LOGICAL_AND;
-}
-#line 7281 "Zend/zend_language_scanner.c"
+               yych = *++YYCURSOR;
+               if (yych == 'A') goto yy695;
+               if (yych != 'a') goto yy291;
 yy695:
                YYDEBUG(695, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'T') goto yy696;
-               if (yych != 't') goto yy296;
+               if (yych == 'C') goto yy696;
+               if (yych != 'c') goto yy291;
 yy696:
                YYDEBUG(696, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'R') goto yy697;
-               if (yych != 'r') goto yy296;
+               if (yych == 'T') goto yy697;
+               if (yych != 't') goto yy291;
 yy697:
                YYDEBUG(697, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'A') goto yy698;
-               if (yych != 'a') goto yy296;
-yy698:
-               YYDEBUG(698, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'C') goto yy699;
-               if (yych != 'c') goto yy296;
-yy699:
-               YYDEBUG(699, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'T') goto yy700;
-               if (yych != 't') goto yy296;
-yy700:
-               YYDEBUG(700, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
-               YYDEBUG(701, *YYCURSOR);
+               YYDEBUG(698, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1685 "Zend/zend_language_scanner.l"
+#line 1688 "Zend/zend_language_scanner.l"
                {
        return T_ABSTRACT;
 }
-#line 7319 "Zend/zend_language_scanner.c"
-yy702:
-               YYDEBUG(702, *YYCURSOR);
+#line 7341 "Zend/zend_language_scanner.c"
+yy699:
+               YYDEBUG(699, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'I') goto yy703;
-               if (yych != 'i') goto yy296;
-yy703:
-               YYDEBUG(703, *YYCURSOR);
+               if (yych == 'I') goto yy700;
+               if (yych != 'i') goto yy291;
+yy700:
+               YYDEBUG(700, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'L') goto yy704;
-               if (yych != 'l') goto yy296;
-yy704:
-               YYDEBUG(704, *YYCURSOR);
+               if (yych == 'L') goto yy701;
+               if (yych != 'l') goto yy291;
+yy701:
+               YYDEBUG(701, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'E') goto yy705;
-               if (yych != 'e') goto yy296;
-yy705:
-               YYDEBUG(705, *YYCURSOR);
+               if (yych == 'E') goto yy702;
+               if (yych != 'e') goto yy291;
+yy702:
+               YYDEBUG(702, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
-               YYDEBUG(706, *YYCURSOR);
+               YYDEBUG(703, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1458 "Zend/zend_language_scanner.l"
                {
        return T_WHILE;
 }
-#line 7347 "Zend/zend_language_scanner.c"
-yy707:
-               YYDEBUG(707, *YYCURSOR);
+#line 7369 "Zend/zend_language_scanner.c"
+yy704:
+               YYDEBUG(704, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
-               YYDEBUG(708, *YYCURSOR);
+               YYDEBUG(705, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1442 "Zend/zend_language_scanner.l"
                {
        return T_IF;
 }
-#line 7360 "Zend/zend_language_scanner.c"
-yy709:
-               YYDEBUG(709, *YYCURSOR);
+#line 7382 "Zend/zend_language_scanner.c"
+yy706:
+               YYDEBUG(706, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'P') goto yy745;
-               if (yych == 'p') goto yy745;
-               goto yy296;
-yy710:
-               YYDEBUG(710, *YYCURSOR);
+               if (yych == 'P') goto yy742;
+               if (yych == 'p') goto yy742;
+               goto yy291;
+yy707:
+               YYDEBUG(707, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych <= 'T') {
                        if (yych <= 'C') {
-                               if (yych <= 'B') goto yy296;
-                               goto yy718;
+                               if (yych <= 'B') goto yy291;
+                               goto yy715;
                        } else {
-                               if (yych <= 'R') goto yy296;
-                               if (yych <= 'S') goto yy716;
-                               goto yy717;
+                               if (yych <= 'R') goto yy291;
+                               if (yych <= 'S') goto yy713;
+                               goto yy714;
                        }
                } else {
                        if (yych <= 'r') {
-                               if (yych == 'c') goto yy718;
-                               goto yy296;
+                               if (yych == 'c') goto yy715;
+                               goto yy291;
                        } else {
-                               if (yych <= 's') goto yy716;
-                               if (yych <= 't') goto yy717;
-                               goto yy296;
+                               if (yych <= 's') goto yy713;
+                               if (yych <= 't') goto yy714;
+                               goto yy291;
                        }
                }
-yy711:
-               YYDEBUG(711, *YYCURSOR);
+yy708:
+               YYDEBUG(708, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'S') goto yy712;
-               if (yych != 's') goto yy296;
-yy712:
-               YYDEBUG(712, *YYCURSOR);
+               if (yych == 'S') goto yy709;
+               if (yych != 's') goto yy291;
+yy709:
+               YYDEBUG(709, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'E') goto yy713;
-               if (yych != 'e') goto yy296;
-yy713:
-               YYDEBUG(713, *YYCURSOR);
+               if (yych == 'E') goto yy710;
+               if (yych != 'e') goto yy291;
+yy710:
+               YYDEBUG(710, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'T') goto yy714;
-               if (yych != 't') goto yy296;
-yy714:
-               YYDEBUG(714, *YYCURSOR);
+               if (yych == 'T') goto yy711;
+               if (yych != 't') goto yy291;
+yy711:
+               YYDEBUG(711, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
-               YYDEBUG(715, *YYCURSOR);
+               YYDEBUG(712, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1669 "Zend/zend_language_scanner.l"
+#line 1672 "Zend/zend_language_scanner.l"
                {
        return T_ISSET;
 }
-#line 7416 "Zend/zend_language_scanner.c"
+#line 7438 "Zend/zend_language_scanner.c"
+yy713:
+               YYDEBUG(713, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'T') goto yy734;
+               if (yych == 't') goto yy734;
+               goto yy291;
+yy714:
+               YYDEBUG(714, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'E') goto yy727;
+               if (yych == 'e') goto yy727;
+               goto yy291;
+yy715:
+               YYDEBUG(715, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'L') goto yy716;
+               if (yych != 'l') goto yy291;
 yy716:
                YYDEBUG(716, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'T') goto yy737;
-               if (yych == 't') goto yy737;
-               goto yy296;
+               if (yych == 'U') goto yy717;
+               if (yych != 'u') goto yy291;
 yy717:
                YYDEBUG(717, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'E') goto yy730;
-               if (yych == 'e') goto yy730;
-               goto yy296;
+               if (yych == 'D') goto yy718;
+               if (yych != 'd') goto yy291;
 yy718:
                YYDEBUG(718, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'L') goto yy719;
-               if (yych != 'l') goto yy296;
+               if (yych == 'E') goto yy719;
+               if (yych != 'e') goto yy291;
 yy719:
                YYDEBUG(719, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'U') goto yy720;
-               if (yych != 'u') goto yy296;
-yy720:
-               YYDEBUG(720, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'D') goto yy721;
-               if (yych != 'd') goto yy296;
-yy721:
-               YYDEBUG(721, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'E') goto yy722;
-               if (yych != 'e') goto yy296;
-yy722:
-               YYDEBUG(722, *YYCURSOR);
                ++YYCURSOR;
                if ((yych = *YYCURSOR) <= '^') {
                        if (yych <= '9') {
-                               if (yych >= '0') goto yy295;
+                               if (yych >= '0') goto yy290;
                        } else {
-                               if (yych <= '@') goto yy723;
-                               if (yych <= 'Z') goto yy295;
+                               if (yych <= '@') goto yy720;
+                               if (yych <= 'Z') goto yy290;
                        }
                } else {
                        if (yych <= '`') {
-                               if (yych <= '_') goto yy724;
+                               if (yych <= '_') goto yy721;
                        } else {
-                               if (yych <= 'z') goto yy295;
-                               if (yych >= 0x7F) goto yy295;
+                               if (yych <= 'z') goto yy290;
+                               if (yych >= 0x7F) goto yy290;
                        }
                }
-yy723:
-               YYDEBUG(723, *YYCURSOR);
+yy720:
+               YYDEBUG(720, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1641 "Zend/zend_language_scanner.l"
+#line 1644 "Zend/zend_language_scanner.l"
                {
        return T_INCLUDE;
 }
-#line 7474 "Zend/zend_language_scanner.c"
+#line 7496 "Zend/zend_language_scanner.c"
+yy721:
+               YYDEBUG(721, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'O') goto yy722;
+               if (yych != 'o') goto yy291;
+yy722:
+               YYDEBUG(722, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'N') goto yy723;
+               if (yych != 'n') goto yy291;
+yy723:
+               YYDEBUG(723, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'C') goto yy724;
+               if (yych != 'c') goto yy291;
 yy724:
                YYDEBUG(724, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'O') goto yy725;
-               if (yych != 'o') goto yy296;
+               if (yych == 'E') goto yy725;
+               if (yych != 'e') goto yy291;
 yy725:
                YYDEBUG(725, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'N') goto yy726;
-               if (yych != 'n') goto yy296;
-yy726:
+               ++YYCURSOR;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
+               }
                YYDEBUG(726, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'C') goto yy727;
-               if (yych != 'c') goto yy296;
+               yyleng = YYCURSOR - SCNG(yy_text);
+#line 1648 "Zend/zend_language_scanner.l"
+               {
+       return T_INCLUDE_ONCE;
+}
+#line 7529 "Zend/zend_language_scanner.c"
 yy727:
                YYDEBUG(727, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'E') goto yy728;
-               if (yych != 'e') goto yy296;
+               if (yych == 'R') goto yy728;
+               if (yych != 'r') goto yy291;
 yy728:
                YYDEBUG(728, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
-               }
+               yych = *++YYCURSOR;
+               if (yych == 'F') goto yy729;
+               if (yych != 'f') goto yy291;
+yy729:
                YYDEBUG(729, *YYCURSOR);
-               yyleng = YYCURSOR - SCNG(yy_text);
-#line 1645 "Zend/zend_language_scanner.l"
-               {
-       return T_INCLUDE_ONCE;
-}
-#line 7507 "Zend/zend_language_scanner.c"
+               yych = *++YYCURSOR;
+               if (yych == 'A') goto yy730;
+               if (yych != 'a') goto yy291;
 yy730:
                YYDEBUG(730, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'R') goto yy731;
-               if (yych != 'r') goto yy296;
+               if (yych == 'C') goto yy731;
+               if (yych != 'c') goto yy291;
 yy731:
                YYDEBUG(731, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'F') goto yy732;
-               if (yych != 'f') goto yy296;
+               if (yych == 'E') goto yy732;
+               if (yych != 'e') goto yy291;
 yy732:
                YYDEBUG(732, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'A') goto yy733;
-               if (yych != 'a') goto yy296;
-yy733:
-               YYDEBUG(733, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'C') goto yy734;
-               if (yych != 'c') goto yy296;
-yy734:
-               YYDEBUG(734, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'E') goto yy735;
-               if (yych != 'e') goto yy296;
-yy735:
-               YYDEBUG(735, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
-               YYDEBUG(736, *YYCURSOR);
+               YYDEBUG(733, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1542 "Zend/zend_language_scanner.l"
                {
        return T_INTERFACE;
 }
-#line 7545 "Zend/zend_language_scanner.c"
+#line 7567 "Zend/zend_language_scanner.c"
+yy734:
+               YYDEBUG(734, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'A') goto yy735;
+               if (yych != 'a') goto yy291;
+yy735:
+               YYDEBUG(735, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'N') goto yy736;
+               if (yych != 'n') goto yy291;
+yy736:
+               YYDEBUG(736, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'C') goto yy737;
+               if (yych != 'c') goto yy291;
 yy737:
                YYDEBUG(737, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'A') goto yy738;
-               if (yych != 'a') goto yy296;
+               if (yych == 'E') goto yy738;
+               if (yych != 'e') goto yy291;
 yy738:
                YYDEBUG(738, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'N') goto yy739;
-               if (yych != 'n') goto yy296;
+               if (yych == 'O') goto yy739;
+               if (yych != 'o') goto yy291;
 yy739:
                YYDEBUG(739, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'C') goto yy740;
-               if (yych != 'c') goto yy296;
+               if (yych == 'F') goto yy740;
+               if (yych != 'f') goto yy291;
 yy740:
                YYDEBUG(740, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'E') goto yy741;
-               if (yych != 'e') goto yy296;
-yy741:
-               YYDEBUG(741, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'O') goto yy742;
-               if (yych != 'o') goto yy296;
-yy742:
-               YYDEBUG(742, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'F') goto yy743;
-               if (yych != 'f') goto yy296;
-yy743:
-               YYDEBUG(743, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
-               YYDEBUG(744, *YYCURSOR);
+               YYDEBUG(741, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1494 "Zend/zend_language_scanner.l"
                {
        return T_INSTANCEOF;
 }
-#line 7588 "Zend/zend_language_scanner.c"
+#line 7610 "Zend/zend_language_scanner.c"
+yy742:
+               YYDEBUG(742, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'L') goto yy743;
+               if (yych != 'l') goto yy291;
+yy743:
+               YYDEBUG(743, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'E') goto yy744;
+               if (yych != 'e') goto yy291;
+yy744:
+               YYDEBUG(744, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'M') goto yy745;
+               if (yych != 'm') goto yy291;
 yy745:
                YYDEBUG(745, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'L') goto yy746;
-               if (yych != 'l') goto yy296;
+               if (yych == 'E') goto yy746;
+               if (yych != 'e') goto yy291;
 yy746:
                YYDEBUG(746, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'E') goto yy747;
-               if (yych != 'e') goto yy296;
+               if (yych == 'N') goto yy747;
+               if (yych != 'n') goto yy291;
 yy747:
                YYDEBUG(747, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'M') goto yy748;
-               if (yych != 'm') goto yy296;
+               if (yych == 'T') goto yy748;
+               if (yych != 't') goto yy291;
 yy748:
                YYDEBUG(748, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'E') goto yy749;
-               if (yych != 'e') goto yy296;
+               if (yych == 'S') goto yy749;
+               if (yych != 's') goto yy291;
 yy749:
                YYDEBUG(749, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'N') goto yy750;
-               if (yych != 'n') goto yy296;
-yy750:
-               YYDEBUG(750, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'T') goto yy751;
-               if (yych != 't') goto yy296;
-yy751:
-               YYDEBUG(751, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'S') goto yy752;
-               if (yych != 's') goto yy296;
-yy752:
-               YYDEBUG(752, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
-               YYDEBUG(753, *YYCURSOR);
+               YYDEBUG(750, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1550 "Zend/zend_language_scanner.l"
                {
        return T_IMPLEMENTS;
 }
-#line 7636 "Zend/zend_language_scanner.c"
-yy754:
-               YYDEBUG(754, *YYCURSOR);
+#line 7658 "Zend/zend_language_scanner.c"
+yy751:
+               YYDEBUG(751, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'R') goto yy758;
-               if (yych == 'r') goto yy758;
-               goto yy296;
-yy755:
-               YYDEBUG(755, *YYCURSOR);
+               if (yych == 'R') goto yy755;
+               if (yych == 'r') goto yy755;
+               goto yy291;
+yy752:
+               YYDEBUG(752, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'Y') goto yy756;
-               if (yych != 'y') goto yy296;
-yy756:
-               YYDEBUG(756, *YYCURSOR);
+               if (yych == 'Y') goto yy753;
+               if (yych != 'y') goto yy291;
+yy753:
+               YYDEBUG(753, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
-               YYDEBUG(757, *YYCURSOR);
+               YYDEBUG(754, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1430 "Zend/zend_language_scanner.l"
                {
        return T_TRY;
 }
-#line 7660 "Zend/zend_language_scanner.c"
-yy758:
-               YYDEBUG(758, *YYCURSOR);
+#line 7682 "Zend/zend_language_scanner.c"
+yy755:
+               YYDEBUG(755, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'O') goto yy759;
-               if (yych != 'o') goto yy296;
-yy759:
-               YYDEBUG(759, *YYCURSOR);
+               if (yych == 'O') goto yy756;
+               if (yych != 'o') goto yy291;
+yy756:
+               YYDEBUG(756, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'W') goto yy760;
-               if (yych != 'w') goto yy296;
-yy760:
-               YYDEBUG(760, *YYCURSOR);
+               if (yych == 'W') goto yy757;
+               if (yych != 'w') goto yy291;
+yy757:
+               YYDEBUG(757, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
-               YYDEBUG(761, *YYCURSOR);
+               YYDEBUG(758, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1438 "Zend/zend_language_scanner.l"
                {
        return T_THROW;
 }
-#line 7683 "Zend/zend_language_scanner.c"
-yy762:
-               YYDEBUG(762, *YYCURSOR);
+#line 7705 "Zend/zend_language_scanner.c"
+yy759:
+               YYDEBUG(759, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych <= 'T') {
-                       if (yych == 'Q') goto yy764;
-                       if (yych <= 'S') goto yy296;
+                       if (yych == 'Q') goto yy761;
+                       if (yych <= 'S') goto yy291;
                } else {
                        if (yych <= 'q') {
-                               if (yych <= 'p') goto yy296;
-                               goto yy764;
+                               if (yych <= 'p') goto yy291;
+                               goto yy761;
                        } else {
-                               if (yych != 't') goto yy296;
+                               if (yych != 't') goto yy291;
                        }
                }
+               YYDEBUG(760, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'U') goto yy773;
+               if (yych == 'u') goto yy773;
+               goto yy291;
+yy761:
+               YYDEBUG(761, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'U') goto yy762;
+               if (yych != 'u') goto yy291;
+yy762:
+               YYDEBUG(762, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'I') goto yy763;
+               if (yych != 'i') goto yy291;
+yy763:
                YYDEBUG(763, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'U') goto yy776;
-               if (yych == 'u') goto yy776;
-               goto yy296;
+               if (yych == 'R') goto yy764;
+               if (yych != 'r') goto yy291;
 yy764:
                YYDEBUG(764, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'U') goto yy765;
-               if (yych != 'u') goto yy296;
+               if (yych == 'E') goto yy765;
+               if (yych != 'e') goto yy291;
 yy765:
                YYDEBUG(765, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'I') goto yy766;
-               if (yych != 'i') goto yy296;
-yy766:
-               YYDEBUG(766, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'R') goto yy767;
-               if (yych != 'r') goto yy296;
-yy767:
-               YYDEBUG(767, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'E') goto yy768;
-               if (yych != 'e') goto yy296;
-yy768:
-               YYDEBUG(768, *YYCURSOR);
                ++YYCURSOR;
                if ((yych = *YYCURSOR) <= '^') {
                        if (yych <= '9') {
-                               if (yych >= '0') goto yy295;
+                               if (yych >= '0') goto yy290;
                        } else {
-                               if (yych <= '@') goto yy769;
-                               if (yych <= 'Z') goto yy295;
+                               if (yych <= '@') goto yy766;
+                               if (yych <= 'Z') goto yy290;
                        }
                } else {
                        if (yych <= '`') {
-                               if (yych <= '_') goto yy770;
+                               if (yych <= '_') goto yy767;
                        } else {
-                               if (yych <= 'z') goto yy295;
-                               if (yych >= 0x7F) goto yy295;
+                               if (yych <= 'z') goto yy290;
+                               if (yych >= 0x7F) goto yy290;
                        }
                }
-yy769:
-               YYDEBUG(769, *YYCURSOR);
+yy766:
+               YYDEBUG(766, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1649 "Zend/zend_language_scanner.l"
+#line 1652 "Zend/zend_language_scanner.l"
                {
        return T_REQUIRE;
 }
-#line 7748 "Zend/zend_language_scanner.c"
+#line 7770 "Zend/zend_language_scanner.c"
+yy767:
+               YYDEBUG(767, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'O') goto yy768;
+               if (yych != 'o') goto yy291;
+yy768:
+               YYDEBUG(768, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'N') goto yy769;
+               if (yych != 'n') goto yy291;
+yy769:
+               YYDEBUG(769, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'C') goto yy770;
+               if (yych != 'c') goto yy291;
 yy770:
                YYDEBUG(770, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'O') goto yy771;
-               if (yych != 'o') goto yy296;
+               if (yych == 'E') goto yy771;
+               if (yych != 'e') goto yy291;
 yy771:
                YYDEBUG(771, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'N') goto yy772;
-               if (yych != 'n') goto yy296;
-yy772:
+               ++YYCURSOR;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
+               }
                YYDEBUG(772, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'C') goto yy773;
-               if (yych != 'c') goto yy296;
+               yyleng = YYCURSOR - SCNG(yy_text);
+#line 1656 "Zend/zend_language_scanner.l"
+               {
+       return T_REQUIRE_ONCE;
+}
+#line 7803 "Zend/zend_language_scanner.c"
 yy773:
                YYDEBUG(773, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'E') goto yy774;
-               if (yych != 'e') goto yy296;
+               if (yych == 'R') goto yy774;
+               if (yych != 'r') goto yy291;
 yy774:
                YYDEBUG(774, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'N') goto yy775;
+               if (yych != 'n') goto yy291;
+yy775:
+               YYDEBUG(775, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
-               YYDEBUG(775, *YYCURSOR);
+               YYDEBUG(776, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1653 "Zend/zend_language_scanner.l"
+#line 1426 "Zend/zend_language_scanner.l"
                {
-       return T_REQUIRE_ONCE;
+       return T_RETURN;
 }
-#line 7781 "Zend/zend_language_scanner.c"
-yy776:
-               YYDEBUG(776, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'R') goto yy777;
-               if (yych != 'r') goto yy296;
+#line 7826 "Zend/zend_language_scanner.c"
 yy777:
                YYDEBUG(777, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'N') goto yy778;
-               if (yych != 'n') goto yy296;
+               if (yych <= 'T') {
+                       if (yych <= 'R') goto yy291;
+                       if (yych <= 'S') goto yy799;
+                       goto yy798;
+               } else {
+                       if (yych <= 'r') goto yy291;
+                       if (yych <= 's') goto yy799;
+                       if (yych <= 't') goto yy798;
+                       goto yy291;
+               }
 yy778:
                YYDEBUG(778, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               yych = *++YYCURSOR;
+               if (yych <= 'O') {
+                       if (yych == 'A') goto yy790;
+                       if (yych <= 'N') goto yy291;
+                       goto yy791;
+               } else {
+                       if (yych <= 'a') {
+                               if (yych <= '`') goto yy291;
+                               goto yy790;
+                       } else {
+                               if (yych == 'o') goto yy791;
+                               goto yy291;
+                       }
                }
+yy779:
                YYDEBUG(779, *YYCURSOR);
-               yyleng = YYCURSOR - SCNG(yy_text);
-#line 1426 "Zend/zend_language_scanner.l"
-               {
-       return T_RETURN;
-}
-#line 7804 "Zend/zend_language_scanner.c"
+               yych = *++YYCURSOR;
+               if (yych == 'N') goto yy780;
+               if (yych != 'n') goto yy291;
 yy780:
                YYDEBUG(780, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych <= 'T') {
-                       if (yych <= 'R') goto yy296;
-                       if (yych <= 'S') goto yy802;
-                       goto yy801;
+                       if (yych <= 'R') goto yy291;
+                       if (yych >= 'T') goto yy782;
                } else {
-                       if (yych <= 'r') goto yy296;
-                       if (yych <= 's') goto yy802;
-                       if (yych <= 't') goto yy801;
-                       goto yy296;
+                       if (yych <= 'r') goto yy291;
+                       if (yych <= 's') goto yy781;
+                       if (yych <= 't') goto yy782;
+                       goto yy291;
                }
 yy781:
                YYDEBUG(781, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych <= 'O') {
-                       if (yych == 'A') goto yy793;
-                       if (yych <= 'N') goto yy296;
-                       goto yy794;
-               } else {
-                       if (yych <= 'a') {
-                               if (yych <= '`') goto yy296;
-                               goto yy793;
-                       } else {
-                               if (yych == 'o') goto yy794;
-                               goto yy296;
-                       }
-               }
+               if (yych == 'T') goto yy788;
+               if (yych == 't') goto yy788;
+               goto yy291;
 yy782:
                YYDEBUG(782, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'N') goto yy783;
-               if (yych != 'n') goto yy296;
+               if (yych == 'I') goto yy783;
+               if (yych != 'i') goto yy291;
 yy783:
                YYDEBUG(783, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych <= 'T') {
-                       if (yych <= 'R') goto yy296;
-                       if (yych >= 'T') goto yy785;
-               } else {
-                       if (yych <= 'r') goto yy296;
-                       if (yych <= 's') goto yy784;
-                       if (yych <= 't') goto yy785;
-                       goto yy296;
-               }
+               if (yych == 'N') goto yy784;
+               if (yych != 'n') goto yy291;
 yy784:
                YYDEBUG(784, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'T') goto yy791;
-               if (yych == 't') goto yy791;
-               goto yy296;
+               if (yych == 'U') goto yy785;
+               if (yych != 'u') goto yy291;
 yy785:
                YYDEBUG(785, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'I') goto yy786;
-               if (yych != 'i') goto yy296;
+               if (yych == 'E') goto yy786;
+               if (yych != 'e') goto yy291;
 yy786:
                YYDEBUG(786, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'N') goto yy787;
-               if (yych != 'n') goto yy296;
-yy787:
-               YYDEBUG(787, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'U') goto yy788;
-               if (yych != 'u') goto yy296;
-yy788:
-               YYDEBUG(788, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'E') goto yy789;
-               if (yych != 'e') goto yy296;
-yy789:
-               YYDEBUG(789, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
-               YYDEBUG(790, *YYCURSOR);
+               YYDEBUG(787, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1522 "Zend/zend_language_scanner.l"
                {
        return T_CONTINUE;
 }
-#line 7889 "Zend/zend_language_scanner.c"
-yy791:
-               YYDEBUG(791, *YYCURSOR);
+#line 7911 "Zend/zend_language_scanner.c"
+yy788:
+               YYDEBUG(788, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
-               YYDEBUG(792, *YYCURSOR);
+               YYDEBUG(789, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1422 "Zend/zend_language_scanner.l"
                {
        return T_CONST;
 }
-#line 7902 "Zend/zend_language_scanner.c"
+#line 7924 "Zend/zend_language_scanner.c"
+yy790:
+               YYDEBUG(790, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'S') goto yy795;
+               if (yych == 's') goto yy795;
+               goto yy291;
+yy791:
+               YYDEBUG(791, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'N') goto yy792;
+               if (yych != 'n') goto yy291;
+yy792:
+               YYDEBUG(792, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'E') goto yy793;
+               if (yych != 'e') goto yy291;
 yy793:
                YYDEBUG(793, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'S') goto yy798;
-               if (yych == 's') goto yy798;
-               goto yy296;
-yy794:
+               ++YYCURSOR;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
+               }
                YYDEBUG(794, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'N') goto yy795;
-               if (yych != 'n') goto yy296;
+               yyleng = YYCURSOR - SCNG(yy_text);
+#line 1596 "Zend/zend_language_scanner.l"
+               {
+       return T_CLONE;
+}
+#line 7953 "Zend/zend_language_scanner.c"
 yy795:
                YYDEBUG(795, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'E') goto yy796;
-               if (yych != 'e') goto yy296;
+               if (yych == 'S') goto yy796;
+               if (yych != 's') goto yy291;
 yy796:
                YYDEBUG(796, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
                YYDEBUG(797, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1593 "Zend/zend_language_scanner.l"
+#line 1538 "Zend/zend_language_scanner.l"
                {
-       return T_CLONE;
+       return T_CLASS;
 }
-#line 7931 "Zend/zend_language_scanner.c"
+#line 7971 "Zend/zend_language_scanner.c"
 yy798:
                YYDEBUG(798, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'S') goto yy799;
-               if (yych != 's') goto yy296;
+               if (yych == 'C') goto yy802;
+               if (yych == 'c') goto yy802;
+               goto yy291;
 yy799:
                YYDEBUG(799, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'E') goto yy800;
+               if (yych != 'e') goto yy291;
+yy800:
+               YYDEBUG(800, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
-               YYDEBUG(800, *YYCURSOR);
+               YYDEBUG(801, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1538 "Zend/zend_language_scanner.l"
+#line 1510 "Zend/zend_language_scanner.l"
                {
-       return T_CLASS;
+       return T_CASE;
 }
-#line 7949 "Zend/zend_language_scanner.c"
-yy801:
-               YYDEBUG(801, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'C') goto yy805;
-               if (yych == 'c') goto yy805;
-               goto yy296;
+#line 7995 "Zend/zend_language_scanner.c"
 yy802:
                YYDEBUG(802, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'E') goto yy803;
-               if (yych != 'e') goto yy296;
+               if (yych == 'H') goto yy803;
+               if (yych != 'h') goto yy291;
 yy803:
                YYDEBUG(803, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
                YYDEBUG(804, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1510 "Zend/zend_language_scanner.l"
+#line 1434 "Zend/zend_language_scanner.l"
                {
-       return T_CASE;
+       return T_CATCH;
 }
-#line 7973 "Zend/zend_language_scanner.c"
+#line 8013 "Zend/zend_language_scanner.c"
 yy805:
                YYDEBUG(805, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'H') goto yy806;
-               if (yych != 'h') goto yy296;
+               if (yych == 'N') goto yy822;
+               if (yych == 'n') goto yy822;
+               goto yy291;
 yy806:
                YYDEBUG(806, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
-               }
+               yych = *++YYCURSOR;
+               if (yych == 'R') goto yy815;
+               if (yych == 'r') goto yy815;
+               goto yy291;
+yy807:
                YYDEBUG(807, *YYCURSOR);
-               yyleng = YYCURSOR - SCNG(yy_text);
-#line 1434 "Zend/zend_language_scanner.l"
-               {
-       return T_CATCH;
-}
-#line 7991 "Zend/zend_language_scanner.c"
+               yych = *++YYCURSOR;
+               if (yych == 'N') goto yy808;
+               if (yych != 'n') goto yy291;
 yy808:
                YYDEBUG(808, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'N') goto yy825;
-               if (yych == 'n') goto yy825;
-               goto yy296;
+               if (yych == 'C') goto yy809;
+               if (yych != 'c') goto yy291;
 yy809:
                YYDEBUG(809, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'R') goto yy818;
-               if (yych == 'r') goto yy818;
-               goto yy296;
+               if (yych == 'T') goto yy810;
+               if (yych != 't') goto yy291;
 yy810:
                YYDEBUG(810, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'N') goto yy811;
-               if (yych != 'n') goto yy296;
+               if (yych == 'I') goto yy811;
+               if (yych != 'i') goto yy291;
 yy811:
                YYDEBUG(811, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'C') goto yy812;
-               if (yych != 'c') goto yy296;
+               if (yych == 'O') goto yy812;
+               if (yych != 'o') goto yy291;
 yy812:
                YYDEBUG(812, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'T') goto yy813;
-               if (yych != 't') goto yy296;
+               if (yych == 'N') goto yy813;
+               if (yych != 'n') goto yy291;
 yy813:
                YYDEBUG(813, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'I') goto yy814;
-               if (yych != 'i') goto yy296;
-yy814:
-               YYDEBUG(814, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'O') goto yy815;
-               if (yych != 'o') goto yy296;
-yy815:
-               YYDEBUG(815, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'N') goto yy816;
-               if (yych != 'n') goto yy296;
-yy816:
-               YYDEBUG(816, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
-               YYDEBUG(817, *YYCURSOR);
+               YYDEBUG(814, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1418 "Zend/zend_language_scanner.l"
                {
        return T_FUNCTION;
 }
-#line 8046 "Zend/zend_language_scanner.c"
-yy818:
-               YYDEBUG(818, *YYCURSOR);
+#line 8068 "Zend/zend_language_scanner.c"
+yy815:
+               YYDEBUG(815, *YYCURSOR);
                ++YYCURSOR;
                if ((yych = *YYCURSOR) <= '^') {
                        if (yych <= '@') {
-                               if (yych <= '/') goto yy819;
-                               if (yych <= '9') goto yy295;
+                               if (yych <= '/') goto yy816;
+                               if (yych <= '9') goto yy290;
                        } else {
-                               if (yych == 'E') goto yy820;
-                               if (yych <= 'Z') goto yy295;
+                               if (yych == 'E') goto yy817;
+                               if (yych <= 'Z') goto yy290;
                        }
                } else {
                        if (yych <= 'd') {
-                               if (yych != '`') goto yy295;
+                               if (yych != '`') goto yy290;
                        } else {
-                               if (yych <= 'e') goto yy820;
-                               if (yych <= 'z') goto yy295;
-                               if (yych >= 0x7F) goto yy295;
+                               if (yych <= 'e') goto yy817;
+                               if (yych <= 'z') goto yy290;
+                               if (yych >= 0x7F) goto yy290;
                        }
                }
-yy819:
-               YYDEBUG(819, *YYCURSOR);
+yy816:
+               YYDEBUG(816, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1470 "Zend/zend_language_scanner.l"
                {
        return T_FOR;
 }
-#line 8074 "Zend/zend_language_scanner.c"
-yy820:
-               YYDEBUG(820, *YYCURSOR);
+#line 8096 "Zend/zend_language_scanner.c"
+yy817:
+               YYDEBUG(817, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'A') goto yy821;
-               if (yych != 'a') goto yy296;
-yy821:
-               YYDEBUG(821, *YYCURSOR);
+               if (yych == 'A') goto yy818;
+               if (yych != 'a') goto yy291;
+yy818:
+               YYDEBUG(818, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'C') goto yy822;
-               if (yych != 'c') goto yy296;
-yy822:
-               YYDEBUG(822, *YYCURSOR);
+               if (yych == 'C') goto yy819;
+               if (yych != 'c') goto yy291;
+yy819:
+               YYDEBUG(819, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'H') goto yy823;
-               if (yych != 'h') goto yy296;
-yy823:
-               YYDEBUG(823, *YYCURSOR);
+               if (yych == 'H') goto yy820;
+               if (yych != 'h') goto yy291;
+yy820:
+               YYDEBUG(820, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
-               YYDEBUG(824, *YYCURSOR);
+               YYDEBUG(821, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1478 "Zend/zend_language_scanner.l"
                {
        return T_FOREACH;
 }
-#line 8102 "Zend/zend_language_scanner.c"
-yy825:
-               YYDEBUG(825, *YYCURSOR);
+#line 8124 "Zend/zend_language_scanner.c"
+yy822:
+               YYDEBUG(822, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'A') goto yy826;
-               if (yych != 'a') goto yy296;
-yy826:
-               YYDEBUG(826, *YYCURSOR);
+               if (yych == 'A') goto yy823;
+               if (yych != 'a') goto yy291;
+yy823:
+               YYDEBUG(823, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'L') goto yy827;
-               if (yych != 'l') goto yy296;
-yy827:
-               YYDEBUG(827, *YYCURSOR);
+               if (yych == 'L') goto yy824;
+               if (yych != 'l') goto yy291;
+yy824:
+               YYDEBUG(824, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
-               YYDEBUG(828, *YYCURSOR);
+               YYDEBUG(825, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1689 "Zend/zend_language_scanner.l"
+#line 1692 "Zend/zend_language_scanner.l"
                {
        return T_FINAL;
 }
-#line 8125 "Zend/zend_language_scanner.c"
-yy829:
-               YYDEBUG(829, *YYCURSOR);
+#line 8147 "Zend/zend_language_scanner.c"
+yy826:
+               YYDEBUG(826, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych <= 'F') {
-                       if (yych == 'C') goto yy835;
-                       if (yych <= 'E') goto yy296;
-                       goto yy836;
+                       if (yych == 'C') goto yy832;
+                       if (yych <= 'E') goto yy291;
+                       goto yy833;
                } else {
                        if (yych <= 'c') {
-                               if (yych <= 'b') goto yy296;
-                               goto yy835;
+                               if (yych <= 'b') goto yy291;
+                               goto yy832;
                        } else {
-                               if (yych == 'f') goto yy836;
-                               goto yy296;
+                               if (yych == 'f') goto yy833;
+                               goto yy291;
                        }
                }
-yy830:
-               YYDEBUG(830, *YYCURSOR);
+yy827:
+               YYDEBUG(827, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'E') goto yy833;
-               if (yych == 'e') goto yy833;
-               goto yy296;
-yy831:
-               YYDEBUG(831, *YYCURSOR);
+               if (yych == 'E') goto yy830;
+               if (yych == 'e') goto yy830;
+               goto yy291;
+yy828:
+               YYDEBUG(828, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
-               YYDEBUG(832, *YYCURSOR);
+               YYDEBUG(829, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1466 "Zend/zend_language_scanner.l"
                {
        return T_DO;
 }
-#line 8160 "Zend/zend_language_scanner.c"
-yy833:
-               YYDEBUG(833, *YYCURSOR);
+#line 8182 "Zend/zend_language_scanner.c"
+yy830:
+               YYDEBUG(830, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
-               YYDEBUG(834, *YYCURSOR);
+               YYDEBUG(831, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1414 "Zend/zend_language_scanner.l"
                {
        return T_EXIT;
 }
-#line 8173 "Zend/zend_language_scanner.c"
+#line 8195 "Zend/zend_language_scanner.c"
+yy832:
+               YYDEBUG(832, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'L') goto yy839;
+               if (yych == 'l') goto yy839;
+               goto yy291;
+yy833:
+               YYDEBUG(833, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'A') goto yy834;
+               if (yych != 'a') goto yy291;
+yy834:
+               YYDEBUG(834, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'U') goto yy835;
+               if (yych != 'u') goto yy291;
 yy835:
                YYDEBUG(835, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'L') goto yy842;
-               if (yych == 'l') goto yy842;
-               goto yy296;
+               if (yych == 'L') goto yy836;
+               if (yych != 'l') goto yy291;
 yy836:
                YYDEBUG(836, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'A') goto yy837;
-               if (yych != 'a') goto yy296;
+               if (yych == 'T') goto yy837;
+               if (yych != 't') goto yy291;
 yy837:
                YYDEBUG(837, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'U') goto yy838;
-               if (yych != 'u') goto yy296;
-yy838:
-               YYDEBUG(838, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'L') goto yy839;
-               if (yych != 'l') goto yy296;
-yy839:
-               YYDEBUG(839, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'T') goto yy840;
-               if (yych != 't') goto yy296;
-yy840:
-               YYDEBUG(840, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
-               YYDEBUG(841, *YYCURSOR);
+               YYDEBUG(838, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1514 "Zend/zend_language_scanner.l"
                {
        return T_DEFAULT;
 }
-#line 8212 "Zend/zend_language_scanner.c"
-yy842:
-               YYDEBUG(842, *YYCURSOR);
+#line 8234 "Zend/zend_language_scanner.c"
+yy839:
+               YYDEBUG(839, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'A') goto yy843;
-               if (yych != 'a') goto yy296;
-yy843:
-               YYDEBUG(843, *YYCURSOR);
+               if (yych == 'A') goto yy840;
+               if (yych != 'a') goto yy291;
+yy840:
+               YYDEBUG(840, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'R') goto yy844;
-               if (yych != 'r') goto yy296;
-yy844:
-               YYDEBUG(844, *YYCURSOR);
+               if (yych == 'R') goto yy841;
+               if (yych != 'r') goto yy291;
+yy841:
+               YYDEBUG(841, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'E') goto yy845;
-               if (yych != 'e') goto yy296;
-yy845:
-               YYDEBUG(845, *YYCURSOR);
+               if (yych == 'E') goto yy842;
+               if (yych != 'e') goto yy291;
+yy842:
+               YYDEBUG(842, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
-               YYDEBUG(846, *YYCURSOR);
+               YYDEBUG(843, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1486 "Zend/zend_language_scanner.l"
                {
        return T_DECLARE;
 }
-#line 8240 "Zend/zend_language_scanner.c"
+#line 8262 "Zend/zend_language_scanner.c"
+yy844:
+               YYDEBUG(844, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'H') goto yy906;
+               if (yych == 'h') goto yy906;
+               goto yy291;
+yy845:
+               YYDEBUG(845, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'S') goto yy900;
+               if (yych == 's') goto yy900;
+               goto yy291;
+yy846:
+               YYDEBUG(846, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'P') goto yy896;
+               if (yych == 'p') goto yy896;
+               goto yy291;
 yy847:
                YYDEBUG(847, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'H') goto yy909;
-               if (yych == 'h') goto yy909;
-               goto yy296;
+               if (yych == 'D') goto yy862;
+               if (yych == 'd') goto yy862;
+               goto yy291;
 yy848:
                YYDEBUG(848, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'S') goto yy903;
-               if (yych == 's') goto yy903;
-               goto yy296;
+               if (yych == 'A') goto yy859;
+               if (yych == 'a') goto yy859;
+               goto yy291;
 yy849:
                YYDEBUG(849, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'P') goto yy899;
-               if (yych == 'p') goto yy899;
-               goto yy296;
+               if (yych <= 'T') {
+                       if (yych == 'I') goto yy850;
+                       if (yych <= 'S') goto yy291;
+                       goto yy851;
+               } else {
+                       if (yych <= 'i') {
+                               if (yych <= 'h') goto yy291;
+                       } else {
+                               if (yych == 't') goto yy851;
+                               goto yy291;
+                       }
+               }
 yy850:
                YYDEBUG(850, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'D') goto yy865;
-               if (yych == 'd') goto yy865;
-               goto yy296;
+               if (yych == 'T') goto yy857;
+               if (yych == 't') goto yy857;
+               goto yy291;
 yy851:
                YYDEBUG(851, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'A') goto yy862;
-               if (yych == 'a') goto yy862;
-               goto yy296;
+               if (yych == 'E') goto yy852;
+               if (yych != 'e') goto yy291;
 yy852:
                YYDEBUG(852, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych <= 'T') {
-                       if (yych == 'I') goto yy853;
-                       if (yych <= 'S') goto yy296;
-                       goto yy854;
-               } else {
-                       if (yych <= 'i') {
-                               if (yych <= 'h') goto yy296;
-                       } else {
-                               if (yych == 't') goto yy854;
-                               goto yy296;
-                       }
-               }
+               if (yych == 'N') goto yy853;
+               if (yych != 'n') goto yy291;
 yy853:
                YYDEBUG(853, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'T') goto yy860;
-               if (yych == 't') goto yy860;
-               goto yy296;
-yy854:
-               YYDEBUG(854, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'E') goto yy855;
-               if (yych != 'e') goto yy296;
-yy855:
-               YYDEBUG(855, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'N') goto yy856;
-               if (yych != 'n') goto yy296;
-yy856:
-               YYDEBUG(856, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'D') goto yy857;
-               if (yych != 'd') goto yy296;
-yy857:
-               YYDEBUG(857, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'S') goto yy858;
-               if (yych != 's') goto yy296;
-yy858:
-               YYDEBUG(858, *YYCURSOR);
+               if (yych == 'D') goto yy854;
+               if (yych != 'd') goto yy291;
+yy854:
+               YYDEBUG(854, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'S') goto yy855;
+               if (yych != 's') goto yy291;
+yy855:
+               YYDEBUG(855, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
-               YYDEBUG(859, *YYCURSOR);
+               YYDEBUG(856, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1546 "Zend/zend_language_scanner.l"
                {
        return T_EXTENDS;
 }
-#line 8324 "Zend/zend_language_scanner.c"
-yy860:
-               YYDEBUG(860, *YYCURSOR);
+#line 8346 "Zend/zend_language_scanner.c"
+yy857:
+               YYDEBUG(857, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
-               YYDEBUG(861, *YYCURSOR);
+               YYDEBUG(858, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1410 "Zend/zend_language_scanner.l"
                {
        return T_EXIT;
 }
-#line 8337 "Zend/zend_language_scanner.c"
-yy862:
-               YYDEBUG(862, *YYCURSOR);
+#line 8359 "Zend/zend_language_scanner.c"
+yy859:
+               YYDEBUG(859, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'L') goto yy863;
-               if (yych != 'l') goto yy296;
-yy863:
-               YYDEBUG(863, *YYCURSOR);
+               if (yych == 'L') goto yy860;
+               if (yych != 'l') goto yy291;
+yy860:
+               YYDEBUG(860, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
-               YYDEBUG(864, *YYCURSOR);
+               YYDEBUG(861, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1637 "Zend/zend_language_scanner.l"
+#line 1640 "Zend/zend_language_scanner.l"
                {
        return T_EVAL;
 }
-#line 8355 "Zend/zend_language_scanner.c"
-yy865:
-               YYDEBUG(865, *YYCURSOR);
+#line 8377 "Zend/zend_language_scanner.c"
+yy862:
+               YYDEBUG(862, *YYCURSOR);
                yych = *++YYCURSOR;
                YYDEBUG(-1, yych);
                switch (yych) {
                case 'D':
-               case 'd':       goto yy866;
+               case 'd':       goto yy863;
                case 'F':
-               case 'f':       goto yy867;
+               case 'f':       goto yy864;
                case 'I':
-               case 'i':       goto yy868;
+               case 'i':       goto yy865;
                case 'S':
-               case 's':       goto yy869;
+               case 's':       goto yy866;
                case 'W':
-               case 'w':       goto yy870;
-               default:        goto yy296;
+               case 'w':       goto yy867;
+               default:        goto yy291;
                }
+yy863:
+               YYDEBUG(863, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'E') goto yy889;
+               if (yych == 'e') goto yy889;
+               goto yy291;
+yy864:
+               YYDEBUG(864, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'O') goto yy881;
+               if (yych == 'o') goto yy881;
+               goto yy291;
+yy865:
+               YYDEBUG(865, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'F') goto yy879;
+               if (yych == 'f') goto yy879;
+               goto yy291;
 yy866:
                YYDEBUG(866, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'E') goto yy892;
-               if (yych == 'e') goto yy892;
-               goto yy296;
+               if (yych == 'W') goto yy873;
+               if (yych == 'w') goto yy873;
+               goto yy291;
 yy867:
                YYDEBUG(867, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'O') goto yy884;
-               if (yych == 'o') goto yy884;
-               goto yy296;
+               if (yych == 'H') goto yy868;
+               if (yych != 'h') goto yy291;
 yy868:
                YYDEBUG(868, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'F') goto yy882;
-               if (yych == 'f') goto yy882;
-               goto yy296;
+               if (yych == 'I') goto yy869;
+               if (yych != 'i') goto yy291;
 yy869:
                YYDEBUG(869, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'W') goto yy876;
-               if (yych == 'w') goto yy876;
-               goto yy296;
+               if (yych == 'L') goto yy870;
+               if (yych != 'l') goto yy291;
 yy870:
                YYDEBUG(870, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'H') goto yy871;
-               if (yych != 'h') goto yy296;
+               if (yych == 'E') goto yy871;
+               if (yych != 'e') goto yy291;
 yy871:
                YYDEBUG(871, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'I') goto yy872;
-               if (yych != 'i') goto yy296;
-yy872:
-               YYDEBUG(872, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'L') goto yy873;
-               if (yych != 'l') goto yy296;
-yy873:
-               YYDEBUG(873, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'E') goto yy874;
-               if (yych != 'e') goto yy296;
-yy874:
-               YYDEBUG(874, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
-               YYDEBUG(875, *YYCURSOR);
+               YYDEBUG(872, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1462 "Zend/zend_language_scanner.l"
                {
        return T_ENDWHILE;
 }
-#line 8429 "Zend/zend_language_scanner.c"
+#line 8451 "Zend/zend_language_scanner.c"
+yy873:
+               YYDEBUG(873, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'I') goto yy874;
+               if (yych != 'i') goto yy291;
+yy874:
+               YYDEBUG(874, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'T') goto yy875;
+               if (yych != 't') goto yy291;
+yy875:
+               YYDEBUG(875, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'C') goto yy876;
+               if (yych != 'c') goto yy291;
 yy876:
                YYDEBUG(876, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'I') goto yy877;
-               if (yych != 'i') goto yy296;
+               if (yych == 'H') goto yy877;
+               if (yych != 'h') goto yy291;
 yy877:
                YYDEBUG(877, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'T') goto yy878;
-               if (yych != 't') goto yy296;
-yy878:
-               YYDEBUG(878, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'C') goto yy879;
-               if (yych != 'c') goto yy296;
-yy879:
-               YYDEBUG(879, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'H') goto yy880;
-               if (yych != 'h') goto yy296;
-yy880:
-               YYDEBUG(880, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
-               YYDEBUG(881, *YYCURSOR);
+               YYDEBUG(878, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1506 "Zend/zend_language_scanner.l"
                {
        return T_ENDSWITCH;
 }
-#line 8462 "Zend/zend_language_scanner.c"
-yy882:
-               YYDEBUG(882, *YYCURSOR);
+#line 8484 "Zend/zend_language_scanner.c"
+yy879:
+               YYDEBUG(879, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
-               YYDEBUG(883, *YYCURSOR);
+               YYDEBUG(880, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1450 "Zend/zend_language_scanner.l"
                {
        return T_ENDIF;
 }
-#line 8475 "Zend/zend_language_scanner.c"
-yy884:
-               YYDEBUG(884, *YYCURSOR);
+#line 8497 "Zend/zend_language_scanner.c"
+yy881:
+               YYDEBUG(881, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'R') goto yy885;
-               if (yych != 'r') goto yy296;
-yy885:
-               YYDEBUG(885, *YYCURSOR);
+               if (yych == 'R') goto yy882;
+               if (yych != 'r') goto yy291;
+yy882:
+               YYDEBUG(882, *YYCURSOR);
                ++YYCURSOR;
                if ((yych = *YYCURSOR) <= '^') {
                        if (yych <= '@') {
-                               if (yych <= '/') goto yy886;
-                               if (yych <= '9') goto yy295;
+                               if (yych <= '/') goto yy883;
+                               if (yych <= '9') goto yy290;
                        } else {
-                               if (yych == 'E') goto yy887;
-                               if (yych <= 'Z') goto yy295;
+                               if (yych == 'E') goto yy884;
+                               if (yych <= 'Z') goto yy290;
                        }
                } else {
                        if (yych <= 'd') {
-                               if (yych != '`') goto yy295;
+                               if (yych != '`') goto yy290;
                        } else {
-                               if (yych <= 'e') goto yy887;
-                               if (yych <= 'z') goto yy295;
-                               if (yych >= 0x7F) goto yy295;
+                               if (yych <= 'e') goto yy884;
+                               if (yych <= 'z') goto yy290;
+                               if (yych >= 0x7F) goto yy290;
                        }
                }
-yy886:
-               YYDEBUG(886, *YYCURSOR);
+yy883:
+               YYDEBUG(883, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1474 "Zend/zend_language_scanner.l"
                {
        return T_ENDFOR;
 }
-#line 8508 "Zend/zend_language_scanner.c"
-yy887:
-               YYDEBUG(887, *YYCURSOR);
+#line 8530 "Zend/zend_language_scanner.c"
+yy884:
+               YYDEBUG(884, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'A') goto yy888;
-               if (yych != 'a') goto yy296;
-yy888:
-               YYDEBUG(888, *YYCURSOR);
+               if (yych == 'A') goto yy885;
+               if (yych != 'a') goto yy291;
+yy885:
+               YYDEBUG(885, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'C') goto yy889;
-               if (yych != 'c') goto yy296;
-yy889:
-               YYDEBUG(889, *YYCURSOR);
+               if (yych == 'C') goto yy886;
+               if (yych != 'c') goto yy291;
+yy886:
+               YYDEBUG(886, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'H') goto yy890;
-               if (yych != 'h') goto yy296;
-yy890:
-               YYDEBUG(890, *YYCURSOR);
+               if (yych == 'H') goto yy887;
+               if (yych != 'h') goto yy291;
+yy887:
+               YYDEBUG(887, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
-               YYDEBUG(891, *YYCURSOR);
+               YYDEBUG(888, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1482 "Zend/zend_language_scanner.l"
                {
        return T_ENDFOREACH;
 }
-#line 8536 "Zend/zend_language_scanner.c"
+#line 8558 "Zend/zend_language_scanner.c"
+yy889:
+               YYDEBUG(889, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'C') goto yy890;
+               if (yych != 'c') goto yy291;
+yy890:
+               YYDEBUG(890, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'L') goto yy891;
+               if (yych != 'l') goto yy291;
+yy891:
+               YYDEBUG(891, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'A') goto yy892;
+               if (yych != 'a') goto yy291;
 yy892:
                YYDEBUG(892, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'C') goto yy893;
-               if (yych != 'c') goto yy296;
+               if (yych == 'R') goto yy893;
+               if (yych != 'r') goto yy291;
 yy893:
                YYDEBUG(893, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'L') goto yy894;
-               if (yych != 'l') goto yy296;
+               if (yych == 'E') goto yy894;
+               if (yych != 'e') goto yy291;
 yy894:
                YYDEBUG(894, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'A') goto yy895;
-               if (yych != 'a') goto yy296;
-yy895:
-               YYDEBUG(895, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'R') goto yy896;
-               if (yych != 'r') goto yy296;
-yy896:
-               YYDEBUG(896, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'E') goto yy897;
-               if (yych != 'e') goto yy296;
-yy897:
-               YYDEBUG(897, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
-               YYDEBUG(898, *YYCURSOR);
+               YYDEBUG(895, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1490 "Zend/zend_language_scanner.l"
                {
        return T_ENDDECLARE;
 }
-#line 8574 "Zend/zend_language_scanner.c"
-yy899:
-               YYDEBUG(899, *YYCURSOR);
+#line 8596 "Zend/zend_language_scanner.c"
+yy896:
+               YYDEBUG(896, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'T') goto yy900;
-               if (yych != 't') goto yy296;
-yy900:
-               YYDEBUG(900, *YYCURSOR);
+               if (yych == 'T') goto yy897;
+               if (yych != 't') goto yy291;
+yy897:
+               YYDEBUG(897, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'Y') goto yy901;
-               if (yych != 'y') goto yy296;
-yy901:
-               YYDEBUG(901, *YYCURSOR);
+               if (yych == 'Y') goto yy898;
+               if (yych != 'y') goto yy291;
+yy898:
+               YYDEBUG(898, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
-               YYDEBUG(902, *YYCURSOR);
+               YYDEBUG(899, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1673 "Zend/zend_language_scanner.l"
+#line 1676 "Zend/zend_language_scanner.l"
                {
        return T_EMPTY;
 }
-#line 8597 "Zend/zend_language_scanner.c"
-yy903:
-               YYDEBUG(903, *YYCURSOR);
+#line 8619 "Zend/zend_language_scanner.c"
+yy900:
+               YYDEBUG(900, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'E') goto yy904;
-               if (yych != 'e') goto yy296;
-yy904:
-               YYDEBUG(904, *YYCURSOR);
+               if (yych == 'E') goto yy901;
+               if (yych != 'e') goto yy291;
+yy901:
+               YYDEBUG(901, *YYCURSOR);
                ++YYCURSOR;
                if ((yych = *YYCURSOR) <= '^') {
                        if (yych <= '@') {
-                               if (yych <= '/') goto yy905;
-                               if (yych <= '9') goto yy295;
+                               if (yych <= '/') goto yy902;
+                               if (yych <= '9') goto yy290;
                        } else {
-                               if (yych == 'I') goto yy906;
-                               if (yych <= 'Z') goto yy295;
+                               if (yych == 'I') goto yy903;
+                               if (yych <= 'Z') goto yy290;
                        }
                } else {
                        if (yych <= 'h') {
-                               if (yych != '`') goto yy295;
+                               if (yych != '`') goto yy290;
                        } else {
-                               if (yych <= 'i') goto yy906;
-                               if (yych <= 'z') goto yy295;
-                               if (yych >= 0x7F) goto yy295;
+                               if (yych <= 'i') goto yy903;
+                               if (yych <= 'z') goto yy290;
+                               if (yych >= 0x7F) goto yy290;
                        }
                }
-yy905:
-               YYDEBUG(905, *YYCURSOR);
+yy902:
+               YYDEBUG(902, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1454 "Zend/zend_language_scanner.l"
                {
        return T_ELSE;
 }
-#line 8630 "Zend/zend_language_scanner.c"
-yy906:
-               YYDEBUG(906, *YYCURSOR);
+#line 8652 "Zend/zend_language_scanner.c"
+yy903:
+               YYDEBUG(903, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'F') goto yy907;
-               if (yych != 'f') goto yy296;
-yy907:
-               YYDEBUG(907, *YYCURSOR);
+               if (yych == 'F') goto yy904;
+               if (yych != 'f') goto yy291;
+yy904:
+               YYDEBUG(904, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
-               YYDEBUG(908, *YYCURSOR);
+               YYDEBUG(905, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1446 "Zend/zend_language_scanner.l"
                {
        return T_ELSEIF;
 }
-#line 8648 "Zend/zend_language_scanner.c"
-yy909:
-               YYDEBUG(909, *YYCURSOR);
+#line 8670 "Zend/zend_language_scanner.c"
+yy906:
+               YYDEBUG(906, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'O') goto yy910;
-               if (yych != 'o') goto yy296;
-yy910:
-               YYDEBUG(910, *YYCURSOR);
+               if (yych == 'O') goto yy907;
+               if (yych != 'o') goto yy291;
+yy907:
+               YYDEBUG(907, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
-                       goto yy295;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy290;
                }
-               YYDEBUG(911, *YYCURSOR);
+               YYDEBUG(908, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1530 "Zend/zend_language_scanner.l"
                {
        return T_ECHO;
 }
-#line 8666 "Zend/zend_language_scanner.c"
+#line 8688 "Zend/zend_language_scanner.c"
        }
 /* *********************************** */
 yyc_ST_LOOKING_FOR_PROPERTY:
@@ -8701,69 +8723,72 @@ yyc_ST_LOOKING_FOR_PROPERTY:
                         64,  64,  64,  64,  64,  64,  64,  64, 
                         64,  64,  64,  64,  64,  64,  64,  64, 
                };
-               YYDEBUG(912, *YYCURSOR);
+               YYDEBUG(909, *YYCURSOR);
                YYFILL(2);
                yych = *YYCURSOR;
                if (yych <= '-') {
                        if (yych <= '\r') {
-                               if (yych <= 0x08) goto yy920;
-                               if (yych <= '\n') goto yy914;
-                               if (yych <= '\f') goto yy920;
+                               if (yych <= 0x08) goto yy917;
+                               if (yych <= '\n') goto yy911;
+                               if (yych <= '\f') goto yy917;
                        } else {
-                               if (yych == ' ') goto yy914;
-                               if (yych <= ',') goto yy920;
-                               goto yy916;
+                               if (yych == ' ') goto yy911;
+                               if (yych <= ',') goto yy917;
+                               goto yy913;
                        }
                } else {
                        if (yych <= '_') {
-                               if (yych <= '@') goto yy920;
-                               if (yych <= 'Z') goto yy918;
-                               if (yych <= '^') goto yy920;
-                               goto yy918;
+                               if (yych <= '@') goto yy917;
+                               if (yych <= 'Z') goto yy915;
+                               if (yych <= '^') goto yy917;
+                               goto yy915;
                        } else {
-                               if (yych <= '`') goto yy920;
-                               if (yych <= 'z') goto yy918;
-                               if (yych <= '~') goto yy920;
-                               goto yy918;
+                               if (yych <= '`') goto yy917;
+                               if (yych <= 'z') goto yy915;
+                               if (yych <= '~') goto yy917;
+                               goto yy915;
                        }
                }
-yy914:
-               YYDEBUG(914, *YYCURSOR);
+yy911:
+               YYDEBUG(911, *YYCURSOR);
                ++YYCURSOR;
                yych = *YYCURSOR;
-               goto yy926;
-yy915:
-               YYDEBUG(915, *YYCURSOR);
+               goto yy923;
+yy912:
+               YYDEBUG(912, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1559 "Zend/zend_language_scanner.l"
                {
-       /* do nothing */
-       goto restart;
+       Z_STRVAL_P(zendlval) = yytext; /* no copying - intentional */
+       Z_STRLEN_P(zendlval) = yyleng;
+       Z_TYPE_P(zendlval) = IS_STRING;
+       HANDLE_NEWLINES(yytext, yyleng);
+       return T_WHITESPACE;
 }
-#line 8744 "Zend/zend_language_scanner.c"
-yy916:
-               YYDEBUG(916, *YYCURSOR);
+#line 8769 "Zend/zend_language_scanner.c"
+yy913:
+               YYDEBUG(913, *YYCURSOR);
                ++YYCURSOR;
-               if ((yych = *YYCURSOR) == '>') goto yy923;
-yy917:
-               YYDEBUG(917, *YYCURSOR);
+               if ((yych = *YYCURSOR) == '>') goto yy920;
+yy914:
+               YYDEBUG(914, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1579 "Zend/zend_language_scanner.l"
+#line 1582 "Zend/zend_language_scanner.l"
                {
        yyless(0);
        yy_pop_state(TSRMLS_C);
        goto restart;
 }
-#line 8758 "Zend/zend_language_scanner.c"
-yy918:
-               YYDEBUG(918, *YYCURSOR);
+#line 8783 "Zend/zend_language_scanner.c"
+yy915:
+               YYDEBUG(915, *YYCURSOR);
                ++YYCURSOR;
                yych = *YYCURSOR;
-               goto yy922;
-yy919:
-               YYDEBUG(919, *YYCURSOR);
+               goto yy919;
+yy916:
+               YYDEBUG(916, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1568 "Zend/zend_language_scanner.l"
+#line 1571 "Zend/zend_language_scanner.l"
                {
        yy_pop_state(TSRMLS_C);
        if (!zend_copy_scanner_string(zendlval, yytext, yyleng, UG(unicode)?IS_UNICODE:IS_STRING, SCNG(output_conv) TSRMLS_CC)) {
@@ -8774,43 +8799,43 @@ yy919:
        }
        return T_STRING;
 }
-#line 8778 "Zend/zend_language_scanner.c"
-yy920:
-               YYDEBUG(920, *YYCURSOR);
+#line 8803 "Zend/zend_language_scanner.c"
+yy917:
+               YYDEBUG(917, *YYCURSOR);
                yych = *++YYCURSOR;
-               goto yy917;
-yy921:
-               YYDEBUG(921, *YYCURSOR);
+               goto yy914;
+yy918:
+               YYDEBUG(918, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-yy922:
-               YYDEBUG(922, *YYCURSOR);
+yy919:
+               YYDEBUG(919, *YYCURSOR);
                if (yybm[0+yych] & 64) {
-                       goto yy921;
+                       goto yy918;
                }
-               goto yy919;
-yy923:
-               YYDEBUG(923, *YYCURSOR);
+               goto yy916;
+yy920:
+               YYDEBUG(920, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(924, *YYCURSOR);
+               YYDEBUG(921, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1564 "Zend/zend_language_scanner.l"
+#line 1567 "Zend/zend_language_scanner.l"
                {
        return T_OBJECT_OPERATOR;
 }
-#line 8803 "Zend/zend_language_scanner.c"
-yy925:
-               YYDEBUG(925, *YYCURSOR);
+#line 8828 "Zend/zend_language_scanner.c"
+yy922:
+               YYDEBUG(922, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-yy926:
-               YYDEBUG(926, *YYCURSOR);
+yy923:
+               YYDEBUG(923, *YYCURSOR);
                if (yybm[0+yych] & 128) {
-                       goto yy925;
+                       goto yy922;
                }
-               goto yy915;
+               goto yy912;
        }
 /* *********************************** */
 yyc_ST_LOOKING_FOR_VARNAME:
@@ -8849,27 +8874,27 @@ yyc_ST_LOOKING_FOR_VARNAME:
                        128, 128, 128, 128, 128, 128, 128, 128, 
                        128, 128, 128, 128, 128, 128, 128, 128, 
                };
-               YYDEBUG(927, *YYCURSOR);
+               YYDEBUG(924, *YYCURSOR);
                YYFILL(2);
                yych = *YYCURSOR;
                if (yych <= '_') {
-                       if (yych <= '@') goto yy931;
-                       if (yych <= 'Z') goto yy929;
-                       if (yych <= '^') goto yy931;
+                       if (yych <= '@') goto yy928;
+                       if (yych <= 'Z') goto yy926;
+                       if (yych <= '^') goto yy928;
                } else {
-                       if (yych <= '`') goto yy931;
-                       if (yych <= 'z') goto yy929;
-                       if (yych <= '~') goto yy931;
+                       if (yych <= '`') goto yy928;
+                       if (yych <= 'z') goto yy926;
+                       if (yych <= '~') goto yy928;
                }
-yy929:
-               YYDEBUG(929, *YYCURSOR);
+yy926:
+               YYDEBUG(926, *YYCURSOR);
                ++YYCURSOR;
                yych = *YYCURSOR;
-               goto yy934;
-yy930:
-               YYDEBUG(930, *YYCURSOR);
+               goto yy931;
+yy927:
+               YYDEBUG(927, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1852 "Zend/zend_language_scanner.l"
+#line 1854 "Zend/zend_language_scanner.l"
                {
        if (!zend_copy_scanner_string(zendlval, yytext, yyleng, UG(unicode)?IS_UNICODE:IS_STRING, SCNG(output_conv) TSRMLS_CC)) {
                return 0;
@@ -8881,31 +8906,31 @@ yy930:
        yy_push_state(ST_IN_SCRIPTING TSRMLS_CC);
        return T_STRING_VARNAME;
 }
-#line 8885 "Zend/zend_language_scanner.c"
-yy931:
-               YYDEBUG(931, *YYCURSOR);
+#line 8910 "Zend/zend_language_scanner.c"
+yy928:
+               YYDEBUG(928, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(932, *YYCURSOR);
+               YYDEBUG(929, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1865 "Zend/zend_language_scanner.l"
+#line 1867 "Zend/zend_language_scanner.l"
                {
        yyless(0);
        yy_pop_state(TSRMLS_C);
        yy_push_state(ST_IN_SCRIPTING TSRMLS_CC);
        goto restart;
 }
-#line 8898 "Zend/zend_language_scanner.c"
-yy933:
-               YYDEBUG(933, *YYCURSOR);
+#line 8923 "Zend/zend_language_scanner.c"
+yy930:
+               YYDEBUG(930, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-yy934:
-               YYDEBUG(934, *YYCURSOR);
+yy931:
+               YYDEBUG(931, *YYCURSOR);
                if (yybm[0+yych] & 128) {
-                       goto yy933;
+                       goto yy930;
                }
-               goto yy930;
+               goto yy927;
        }
 /* *********************************** */
 yyc_ST_NOWDOC:
@@ -8944,419 +8969,419 @@ yyc_ST_NOWDOC:
                        192, 192, 192, 192, 192, 192, 192, 192, 
                        192, 192, 192, 192, 192, 192, 192, 192, 
                };
-               YYDEBUG(935, *YYCURSOR);
+               YYDEBUG(932, *YYCURSOR);
                YYFILL(1);
                yych = *YYCURSOR;
                if (yybm[0+yych] & 32) {
-                       goto yy941;
+                       goto yy938;
                }
-               if (yych <= '\f') goto yy937;
-               if (yych <= '\r') goto yy939;
-               goto yy943;
-yy937:
-               YYDEBUG(937, *YYCURSOR);
+               if (yych <= '\f') goto yy934;
+               if (yych <= '\r') goto yy936;
+               goto yy940;
+yy934:
+               YYDEBUG(934, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(938, *YYCURSOR);
+               YYDEBUG(935, *YYCURSOR);
                if (yybm[0+yych] & 32) {
-                       goto yy941;
+                       goto yy938;
                }
-               if (yych <= '\f') goto yy937;
-               if (yych >= 0x0E) goto yy967;
-yy939:
-               YYDEBUG(939, *YYCURSOR);
+               if (yych <= '\f') goto yy934;
+               if (yych >= 0x0E) goto yy964;
+yy936:
+               YYDEBUG(936, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(940, *YYCURSOR);
+               YYDEBUG(937, *YYCURSOR);
                if (yybm[0+yych] & 32) {
-                       goto yy941;
+                       goto yy938;
                }
-               if (yych <= '\f') goto yy937;
-               if (yych <= '\r') goto yy939;
-               goto yy967;
-yy941:
-               YYDEBUG(941, *YYCURSOR);
+               if (yych <= '\f') goto yy934;
+               if (yych <= '\r') goto yy936;
+               goto yy964;
+yy938:
+               YYDEBUG(938, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(942, *YYCURSOR);
+               YYDEBUG(939, *YYCURSOR);
                if (yybm[0+yych] & 32) {
-                       goto yy941;
+                       goto yy938;
                }
-               if (yych <= '\f') goto yy937;
-               if (yych <= '\r') goto yy939;
-               goto yy965;
-yy943:
-               YYDEBUG(943, *YYCURSOR);
+               if (yych <= '\f') goto yy934;
+               if (yych <= '\r') goto yy936;
+               goto yy962;
+yy940:
+               YYDEBUG(940, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(2);
                yych = *YYCURSOR;
-               YYDEBUG(944, *YYCURSOR);
+               YYDEBUG(941, *YYCURSOR);
                if (yybm[0+yych] & 64) {
-                       goto yy943;
+                       goto yy940;
                }
                if (yych <= '\f') {
-                       if (yych != '\n') goto yy947;
+                       if (yych != '\n') goto yy944;
                } else {
-                       if (yych <= '\r') goto yy945;
-                       if (yych == ';') goto yy946;
-                       goto yy947;
+                       if (yych <= '\r') goto yy942;
+                       if (yych == ';') goto yy943;
+                       goto yy944;
                }
-yy945:
-               YYDEBUG(945, *YYCURSOR);
-yy946:
-               YYDEBUG(946, *YYCURSOR);
+yy942:
+               YYDEBUG(942, *YYCURSOR);
+yy943:
+               YYDEBUG(943, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == '\n') goto yy945;
-               if (yych == '\r') goto yy945;
-               goto yy958;
-yy947:
-               YYDEBUG(947, *YYCURSOR);
+               if (yych == '\n') goto yy942;
+               if (yych == '\r') goto yy942;
+               goto yy955;
+yy944:
+               YYDEBUG(944, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
                if (yybm[0+yych] & 8) {
-                       goto yy937;
+                       goto yy934;
                }
                if (yych <= '^') {
                        if (yych <= '\r') {
-                               if (yych >= '\r') goto yy939;
+                               if (yych >= '\r') goto yy936;
                        } else {
-                               if (yych <= '@') goto yy948;
-                               if (yych <= 'Z') goto yy950;
+                               if (yych <= '@') goto yy945;
+                               if (yych <= 'Z') goto yy947;
                        }
                } else {
                        if (yych <= '`') {
-                               if (yych <= '_') goto yy950;
+                               if (yych <= '_') goto yy947;
                        } else {
-                               if (yych <= 'z') goto yy950;
-                               if (yych >= 0x7F) goto yy950;
+                               if (yych <= 'z') goto yy947;
+                               if (yych >= 0x7F) goto yy947;
                        }
                }
-yy948:
-               YYDEBUG(948, *YYCURSOR);
+yy945:
+               YYDEBUG(945, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(949, *YYCURSOR);
+               YYDEBUG(946, *YYCURSOR);
                if (yybm[0+yych] & 8) {
-                       goto yy937;
+                       goto yy934;
                }
                if (yych <= '^') {
                        if (yych <= '\r') {
-                               if (yych <= '\f') goto yy948;
-                               goto yy939;
+                               if (yych <= '\f') goto yy945;
+                               goto yy936;
                        } else {
-                               if (yych <= '@') goto yy948;
-                               if (yych <= 'Z') goto yy952;
-                               goto yy948;
+                               if (yych <= '@') goto yy945;
+                               if (yych <= 'Z') goto yy949;
+                               goto yy945;
                        }
                } else {
                        if (yych <= '`') {
-                               if (yych <= '_') goto yy952;
-                               goto yy948;
+                               if (yych <= '_') goto yy949;
+                               goto yy945;
                        } else {
-                               if (yych <= 'z') goto yy952;
-                               if (yych <= '~') goto yy948;
-                               goto yy952;
+                               if (yych <= 'z') goto yy949;
+                               if (yych <= '~') goto yy945;
+                               goto yy949;
                        }
                }
-yy950:
-               YYDEBUG(950, *YYCURSOR);
+yy947:
+               YYDEBUG(947, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(951, *YYCURSOR);
+               YYDEBUG(948, *YYCURSOR);
                if (yybm[0+yych] & 8) {
-                       goto yy937;
+                       goto yy934;
                }
                if (yych <= '@') {
                        if (yych <= '/') {
-                               if (yych == '\r') goto yy939;
-                               goto yy948;
+                               if (yych == '\r') goto yy936;
+                               goto yy945;
                        } else {
-                               if (yych <= '9') goto yy952;
-                               if (yych == ';') goto yy954;
-                               goto yy948;
+                               if (yych <= '9') goto yy949;
+                               if (yych == ';') goto yy951;
+                               goto yy945;
                        }
                } else {
                        if (yych <= '_') {
-                               if (yych <= 'Z') goto yy950;
-                               if (yych <= '^') goto yy948;
-                               goto yy950;
+                               if (yych <= 'Z') goto yy947;
+                               if (yych <= '^') goto yy945;
+                               goto yy947;
                        } else {
-                               if (yych <= '`') goto yy948;
-                               if (yych <= 'z') goto yy950;
-                               if (yych <= '~') goto yy948;
-                               goto yy950;
+                               if (yych <= '`') goto yy945;
+                               if (yych <= 'z') goto yy947;
+                               if (yych <= '~') goto yy945;
+                               goto yy947;
                        }
                }
-yy952:
-               YYDEBUG(952, *YYCURSOR);
+yy949:
+               YYDEBUG(949, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(953, *YYCURSOR);
+               YYDEBUG(950, *YYCURSOR);
                if (yybm[0+yych] & 8) {
-                       goto yy937;
+                       goto yy934;
                }
                if (yych <= '@') {
                        if (yych <= '/') {
-                               if (yych == '\r') goto yy939;
-                               goto yy948;
+                               if (yych == '\r') goto yy936;
+                               goto yy945;
                        } else {
-                               if (yych <= '9') goto yy952;
-                               if (yych != ';') goto yy948;
+                               if (yych <= '9') goto yy949;
+                               if (yych != ';') goto yy945;
                        }
                } else {
                        if (yych <= '_') {
-                               if (yych <= 'Z') goto yy952;
-                               if (yych <= '^') goto yy948;
-                               goto yy952;
+                               if (yych <= 'Z') goto yy949;
+                               if (yych <= '^') goto yy945;
+                               goto yy949;
                        } else {
-                               if (yych <= '`') goto yy948;
-                               if (yych <= 'z') goto yy952;
-                               if (yych <= '~') goto yy948;
-                               goto yy952;
+                               if (yych <= '`') goto yy945;
+                               if (yych <= 'z') goto yy949;
+                               if (yych <= '~') goto yy945;
+                               goto yy949;
                        }
                }
-yy954:
-               YYDEBUG(954, *YYCURSOR);
+yy951:
+               YYDEBUG(951, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(955, *YYCURSOR);
+               YYDEBUG(952, *YYCURSOR);
                if (yybm[0+yych] & 8) {
-                       goto yy937;
+                       goto yy934;
                }
                if (yych <= '^') {
                        if (yych <= '\r') {
-                               if (yych <= '\f') goto yy954;
-                               goto yy939;
+                               if (yych <= '\f') goto yy951;
+                               goto yy936;
                        } else {
-                               if (yych <= '@') goto yy954;
-                               if (yych >= '[') goto yy954;
+                               if (yych <= '@') goto yy951;
+                               if (yych >= '[') goto yy951;
                        }
                } else {
                        if (yych <= '`') {
-                               if (yych >= '`') goto yy954;
+                               if (yych >= '`') goto yy951;
                        } else {
-                               if (yych <= 'z') goto yy956;
-                               if (yych <= '~') goto yy954;
+                               if (yych <= 'z') goto yy953;
+                               if (yych <= '~') goto yy951;
                        }
                }
-yy956:
-               YYDEBUG(956, *YYCURSOR);
+yy953:
+               YYDEBUG(953, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(957, *YYCURSOR);
+               YYDEBUG(954, *YYCURSOR);
                if (yybm[0+yych] & 8) {
-                       goto yy937;
+                       goto yy934;
                }
                if (yych <= 'Z') {
                        if (yych <= '/') {
-                               if (yych == '\r') goto yy939;
-                               goto yy954;
+                               if (yych == '\r') goto yy936;
+                               goto yy951;
                        } else {
-                               if (yych <= '9') goto yy956;
-                               if (yych <= '@') goto yy954;
-                               goto yy956;
+                               if (yych <= '9') goto yy953;
+                               if (yych <= '@') goto yy951;
+                               goto yy953;
                        }
                } else {
                        if (yych <= '`') {
-                               if (yych == '_') goto yy956;
-                               goto yy954;
+                               if (yych == '_') goto yy953;
+                               goto yy951;
                        } else {
-                               if (yych <= 'z') goto yy956;
-                               if (yych <= '~') goto yy954;
-                               goto yy956;
+                               if (yych <= 'z') goto yy953;
+                               if (yych <= '~') goto yy951;
+                               goto yy953;
                        }
                }
-yy958:
-               YYDEBUG(958, *YYCURSOR);
+yy955:
+               YYDEBUG(955, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
                if (yybm[0+yych] & 8) {
-                       goto yy937;
+                       goto yy934;
                }
                if (yych <= '^') {
                        if (yych <= '\r') {
-                               if (yych >= '\r') goto yy939;
+                               if (yych >= '\r') goto yy936;
                        } else {
-                               if (yych <= '@') goto yy959;
-                               if (yych <= 'Z') goto yy961;
+                               if (yych <= '@') goto yy956;
+                               if (yych <= 'Z') goto yy958;
                        }
                } else {
                        if (yych <= '`') {
-                               if (yych <= '_') goto yy961;
+                               if (yych <= '_') goto yy958;
                        } else {
-                               if (yych <= 'z') goto yy961;
-                               if (yych >= 0x7F) goto yy961;
+                               if (yych <= 'z') goto yy958;
+                               if (yych >= 0x7F) goto yy958;
                        }
                }
-yy959:
-               YYDEBUG(959, *YYCURSOR);
+yy956:
+               YYDEBUG(956, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(960, *YYCURSOR);
+               YYDEBUG(957, *YYCURSOR);
                if (yybm[0+yych] & 8) {
-                       goto yy937;
+                       goto yy934;
                }
                if (yych <= '^') {
                        if (yych <= '\r') {
-                               if (yych <= '\f') goto yy959;
-                               goto yy939;
+                               if (yych <= '\f') goto yy956;
+                               goto yy936;
                        } else {
-                               if (yych <= '@') goto yy959;
-                               if (yych <= 'Z') goto yy963;
-                               goto yy959;
+                               if (yych <= '@') goto yy956;
+                               if (yych <= 'Z') goto yy960;
+                               goto yy956;
                        }
                } else {
                        if (yych <= '`') {
-                               if (yych <= '_') goto yy963;
-                               goto yy959;
+                               if (yych <= '_') goto yy960;
+                               goto yy956;
                        } else {
-                               if (yych <= 'z') goto yy963;
-                               if (yych <= '~') goto yy959;
-                               goto yy963;
+                               if (yych <= 'z') goto yy960;
+                               if (yych <= '~') goto yy956;
+                               goto yy960;
                        }
                }
-yy961:
-               YYDEBUG(961, *YYCURSOR);
+yy958:
+               YYDEBUG(958, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(962, *YYCURSOR);
+               YYDEBUG(959, *YYCURSOR);
                if (yybm[0+yych] & 8) {
-                       goto yy937;
+                       goto yy934;
                }
                if (yych <= '@') {
                        if (yych <= '/') {
-                               if (yych == '\r') goto yy939;
-                               goto yy954;
+                               if (yych == '\r') goto yy936;
+                               goto yy951;
                        } else {
-                               if (yych <= '9') goto yy963;
-                               if (yych == ';') goto yy959;
-                               goto yy954;
+                               if (yych <= '9') goto yy960;
+                               if (yych == ';') goto yy956;
+                               goto yy951;
                        }
                } else {
                        if (yych <= '_') {
-                               if (yych <= 'Z') goto yy961;
-                               if (yych <= '^') goto yy954;
-                               goto yy961;
+                               if (yych <= 'Z') goto yy958;
+                               if (yych <= '^') goto yy951;
+                               goto yy958;
                        } else {
-                               if (yych <= '`') goto yy954;
-                               if (yych <= 'z') goto yy961;
-                               if (yych <= '~') goto yy954;
-                               goto yy961;
+                               if (yych <= '`') goto yy951;
+                               if (yych <= 'z') goto yy958;
+                               if (yych <= '~') goto yy951;
+                               goto yy958;
                        }
                }
-yy963:
-               YYDEBUG(963, *YYCURSOR);
+yy960:
+               YYDEBUG(960, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(964, *YYCURSOR);
+               YYDEBUG(961, *YYCURSOR);
                if (yybm[0+yych] & 8) {
-                       goto yy937;
+                       goto yy934;
                }
                if (yych <= '@') {
                        if (yych <= '/') {
-                               if (yych == '\r') goto yy939;
-                               goto yy954;
+                               if (yych == '\r') goto yy936;
+                               goto yy951;
                        } else {
-                               if (yych <= '9') goto yy963;
-                               if (yych == ';') goto yy959;
-                               goto yy954;
+                               if (yych <= '9') goto yy960;
+                               if (yych == ';') goto yy956;
+                               goto yy951;
                        }
                } else {
                        if (yych <= '_') {
-                               if (yych <= 'Z') goto yy963;
-                               if (yych <= '^') goto yy954;
-                               goto yy963;
+                               if (yych <= 'Z') goto yy960;
+                               if (yych <= '^') goto yy951;
+                               goto yy960;
                        } else {
-                               if (yych <= '`') goto yy954;
-                               if (yych <= 'z') goto yy963;
-                               if (yych <= '~') goto yy954;
-                               goto yy963;
+                               if (yych <= '`') goto yy951;
+                               if (yych <= 'z') goto yy960;
+                               if (yych <= '~') goto yy951;
+                               goto yy960;
                        }
                }
-yy965:
-               YYDEBUG(965, *YYCURSOR);
+yy962:
+               YYDEBUG(962, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(966, *YYCURSOR);
+               YYDEBUG(963, *YYCURSOR);
                if (yybm[0+yych] & 8) {
-                       goto yy937;
+                       goto yy934;
                }
                if (yych <= '@') {
                        if (yych <= '/') {
-                               if (yych == '\r') goto yy939;
-                               goto yy948;
+                               if (yych == '\r') goto yy936;
+                               goto yy945;
                        } else {
-                               if (yych <= '9') goto yy965;
-                               if (yych == ';') goto yy959;
-                               goto yy948;
+                               if (yych <= '9') goto yy962;
+                               if (yych == ';') goto yy956;
+                               goto yy945;
                        }
                } else {
                        if (yych <= '_') {
-                               if (yych <= 'Z') goto yy965;
-                               if (yych <= '^') goto yy948;
-                               goto yy965;
+                               if (yych <= 'Z') goto yy962;
+                               if (yych <= '^') goto yy945;
+                               goto yy962;
                        } else {
-                               if (yych <= '`') goto yy948;
-                               if (yych <= 'z') goto yy965;
-                               if (yych <= '~') goto yy948;
-                               goto yy965;
+                               if (yych <= '`') goto yy945;
+                               if (yych <= 'z') goto yy962;
+                               if (yych <= '~') goto yy945;
+                               goto yy962;
                        }
                }
-yy967:
-               YYDEBUG(967, *YYCURSOR);
+yy964:
+               YYDEBUG(964, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(968, *YYCURSOR);
+               YYDEBUG(965, *YYCURSOR);
                if (yych <= ';') {
                        if (yych <= '\r') {
-                               if (yych == '\n') goto yy970;
-                               if (yych <= '\f') goto yy947;
-                               goto yy970;
+                               if (yych == '\n') goto yy967;
+                               if (yych <= '\f') goto yy944;
+                               goto yy967;
                        } else {
-                               if (yych <= '/') goto yy947;
-                               if (yych <= '9') goto yy967;
-                               if (yych <= ':') goto yy947;
+                               if (yych <= '/') goto yy944;
+                               if (yych <= '9') goto yy964;
+                               if (yych <= ':') goto yy944;
                        }
                } else {
                        if (yych <= '_') {
-                               if (yych <= '@') goto yy947;
-                               if (yych <= 'Z') goto yy967;
-                               if (yych <= '^') goto yy947;
-                               goto yy967;
+                               if (yych <= '@') goto yy944;
+                               if (yych <= 'Z') goto yy964;
+                               if (yych <= '^') goto yy944;
+                               goto yy964;
                        } else {
-                               if (yych <= '`') goto yy947;
-                               if (yych <= 'z') goto yy967;
-                               if (yych <= '~') goto yy947;
-                               goto yy967;
+                               if (yych <= '`') goto yy944;
+                               if (yych <= 'z') goto yy964;
+                               if (yych <= '~') goto yy944;
+                               goto yy964;
                        }
                }
-               YYDEBUG(969, *YYCURSOR);
+               YYDEBUG(966, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               if (yych == '\n') goto yy970;
-               if (yych != '\r') goto yy958;
-yy970:
-               YYDEBUG(970, *YYCURSOR);
+               if (yych == '\n') goto yy967;
+               if (yych != '\r') goto yy955;
+yy967:
+               YYDEBUG(967, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(971, *YYCURSOR);
+               YYDEBUG(968, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2698 "Zend/zend_language_scanner.l"
+#line 2710 "Zend/zend_language_scanner.l"
                {
        char *end = yytext + yyleng - 1;
 
@@ -9368,16 +9393,22 @@ yy970:
        if (yyleng > CG(heredoc_len) && !memcmp(end - CG(heredoc_len), CG(heredoc), CG(heredoc_len))) {
                int len = yyleng - CG(heredoc_len) - 2; /* 2 for newline before and after label */
 
-               if (len > 0 && yytext[len - 1] == '\r' && yytext[len] == '\n') {
-                       len--;
+               /* May have matched fooLABEL; make sure there's a newline before it */
+               if (yytext[len] != '\n') {
+                       if (yytext[len] != '\r') {
+                               yyless(yyleng - 1);
+                               yymore();
+                       }
+               } else if (len > 0 && yytext[len - 1] == '\r') {
+                       len--; /* Windows newline */
                }
 
-               /* Go back before last label char, to match in ST_END_HEREDOC state */
+               /* Go back before last label char, to match in ST_END_NOWDOC state */
                yyless(yyleng - 2);
 
-               /* Subtract the remaining label length. yyleng must include newline
+               /* Subtract the label/newline length. yyleng must include newline
                 * before label, for zend_highlight/strip, tokenizer, etc. */
-               yyleng = yyleng - CG(heredoc_len) - 1;
+               yyleng -= CG(heredoc_len) + 1;
 
                CG(increment_lineno) = 1; /* For newline before label */
                BEGIN(ST_END_NOWDOC);
@@ -9389,12 +9420,12 @@ yy970:
                return T_ENCAPSED_AND_WHITESPACE;
        } else {
                /* Go back to end of label, so the next match works correctly in case of
-                * a variable or another label at the beginning of the next line */
+                * another label at the beginning of the next line */
                yyless(yyleng - 1);
                yymore();
        }
 }
-#line 9398 "Zend/zend_language_scanner.c"
+#line 9429 "Zend/zend_language_scanner.c"
        }
 /* *********************************** */
 yyc_ST_ONE_LINE_COMMENT:
@@ -9433,52 +9464,52 @@ yyc_ST_ONE_LINE_COMMENT:
                        128, 128, 128, 128, 128, 128, 128, 128, 
                        128, 128, 128, 128, 128, 128, 128, 128, 
                };
-               YYDEBUG(972, *YYCURSOR);
+               YYDEBUG(969, *YYCURSOR);
                YYFILL(2);
                yych = *YYCURSOR;
                if (yybm[0+yych] & 128) {
-                       goto yy978;
-               }
-               if (yych <= '\f') goto yy981;
-               if (yych <= '\r') goto yy982;
-               if (yych <= '=') goto yy974;
-               if (yych <= '>') goto yy976;
-               goto yy977;
-yy974:
-               YYDEBUG(974, *YYCURSOR);
+                       goto yy975;
+               }
+               if (yych <= '\f') goto yy978;
+               if (yych <= '\r') goto yy979;
+               if (yych <= '=') goto yy971;
+               if (yych <= '>') goto yy973;
+               goto yy974;
+yy971:
+               YYDEBUG(971, *YYCURSOR);
                ++YYCURSOR;
-               if ((yych = *YYCURSOR) == '>') goto yy986;
-yy975:
-               YYDEBUG(975, *YYCURSOR);
+               if ((yych = *YYCURSOR) == '>') goto yy983;
+yy972:
+               YYDEBUG(972, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2286 "Zend/zend_language_scanner.l"
+#line 2282 "Zend/zend_language_scanner.l"
                {
        yymore();
 }
-#line 9459 "Zend/zend_language_scanner.c"
-yy976:
-               YYDEBUG(976, *YYCURSOR);
+#line 9490 "Zend/zend_language_scanner.c"
+yy973:
+               YYDEBUG(973, *YYCURSOR);
                yych = *++YYCURSOR;
-               goto yy975;
-yy977:
-               YYDEBUG(977, *YYCURSOR);
+               goto yy972;
+yy974:
+               YYDEBUG(974, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == '>') goto yy986;
-               goto yy975;
-yy978:
-               YYDEBUG(978, *YYCURSOR);
+               if (yych == '>') goto yy983;
+               goto yy972;
+yy975:
+               YYDEBUG(975, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(979, *YYCURSOR);
+               YYDEBUG(976, *YYCURSOR);
                if (yybm[0+yych] & 128) {
-                       goto yy978;
+                       goto yy975;
                }
-               goto yy985;
-yy980:
-               YYDEBUG(980, *YYCURSOR);
+               goto yy982;
+yy977:
+               YYDEBUG(977, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2290 "Zend/zend_language_scanner.l"
+#line 2286 "Zend/zend_language_scanner.l"
                {
        switch (yytext[yyleng-1]) {
                case '?': case '%': case '>':
@@ -9496,20 +9527,20 @@ yy980:
                        return T_COMMENT;
        }
 }
-#line 9500 "Zend/zend_language_scanner.c"
-yy981:
-               YYDEBUG(981, *YYCURSOR);
+#line 9531 "Zend/zend_language_scanner.c"
+yy978:
+               YYDEBUG(978, *YYCURSOR);
                yych = *++YYCURSOR;
-               goto yy980;
-yy982:
-               YYDEBUG(982, *YYCURSOR);
+               goto yy977;
+yy979:
+               YYDEBUG(979, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != '\n') goto yy980;
-               YYDEBUG(983, *YYCURSOR);
+               if (yych != '\n') goto yy977;
+               YYDEBUG(980, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(984, *YYCURSOR);
+               YYDEBUG(981, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2308 "Zend/zend_language_scanner.l"
+#line 2304 "Zend/zend_language_scanner.l"
                {
        Z_STRVAL_P(zendlval) = yytext; /* no copying - intentional */
        Z_STRLEN_P(zendlval) = yyleng;
@@ -9518,17 +9549,17 @@ yy982:
        CG(zend_lineno)++;
        return T_COMMENT;
 }
-#line 9522 "Zend/zend_language_scanner.c"
-yy985:
-               YYDEBUG(985, *YYCURSOR);
+#line 9553 "Zend/zend_language_scanner.c"
+yy982:
+               YYDEBUG(982, *YYCURSOR);
                yych = *++YYCURSOR;
-               goto yy980;
-yy986:
-               YYDEBUG(986, *YYCURSOR);
+               goto yy977;
+yy983:
+               YYDEBUG(983, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(987, *YYCURSOR);
+               YYDEBUG(984, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2317 "Zend/zend_language_scanner.l"
+#line 2313 "Zend/zend_language_scanner.l"
                {
     if (CG(asp_tags) || yytext[yyleng-2] != '%') { /* asp comment? */
                Z_STRVAL_P(zendlval) = yytext; /* no copying - intentional */
@@ -9542,7 +9573,7 @@ yy986:
                yymore();
        }
 }
-#line 9546 "Zend/zend_language_scanner.c"
+#line 9577 "Zend/zend_language_scanner.c"
        }
 /* *********************************** */
 yyc_ST_START_HEREDOC:
@@ -9581,76 +9612,76 @@ yyc_ST_START_HEREDOC:
                        128, 128, 128, 128, 128, 128, 128, 128, 
                        128, 128, 128, 128, 128, 128, 128, 128, 
                };
-               YYDEBUG(988, *YYCURSOR);
+               YYDEBUG(985, *YYCURSOR);
                YYFILL(3);
                yych = *YYCURSOR;
                if (yych <= '_') {
-                       if (yych <= '@') goto yy990;
-                       if (yych <= 'Z') goto yy992;
-                       if (yych >= '_') goto yy992;
+                       if (yych <= '@') goto yy987;
+                       if (yych <= 'Z') goto yy989;
+                       if (yych >= '_') goto yy989;
                } else {
-                       if (yych <= '`') goto yy990;
-                       if (yych <= 'z') goto yy992;
-                       if (yych >= 0x7F) goto yy992;
+                       if (yych <= '`') goto yy987;
+                       if (yych <= 'z') goto yy989;
+                       if (yych >= 0x7F) goto yy989;
                }
-yy990:
-               YYDEBUG(990, *YYCURSOR);
+yy987:
+               YYDEBUG(987, *YYCURSOR);
                ++YYCURSOR;
-yy991:
-               YYDEBUG(991, *YYCURSOR);
+yy988:
+               YYDEBUG(988, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2477 "Zend/zend_language_scanner.l"
+#line 2482 "Zend/zend_language_scanner.l"
                {
        yyless(0);
        BEGIN(ST_HEREDOC);
        goto restart;
 }
-#line 9609 "Zend/zend_language_scanner.c"
-yy992:
-               YYDEBUG(992, *YYCURSOR);
+#line 9640 "Zend/zend_language_scanner.c"
+yy989:
+               YYDEBUG(989, *YYCURSOR);
                yyaccept = 0;
                yych = *(YYMARKER = ++YYCURSOR);
                if (yybm[0+yych] & 128) {
-                       goto yy993;
+                       goto yy990;
                }
                if (yych <= '\f') {
-                       if (yych == '\n') goto yy997;
-                       goto yy991;
+                       if (yych == '\n') goto yy994;
+                       goto yy988;
                } else {
-                       if (yych <= '\r') goto yy997;
-                       if (yych == ';') goto yy996;
-                       goto yy991;
+                       if (yych <= '\r') goto yy994;
+                       if (yych == ';') goto yy993;
+                       goto yy988;
                }
-yy993:
-               YYDEBUG(993, *YYCURSOR);
+yy990:
+               YYDEBUG(990, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(2);
                yych = *YYCURSOR;
-               YYDEBUG(994, *YYCURSOR);
+               YYDEBUG(991, *YYCURSOR);
                if (yybm[0+yych] & 128) {
-                       goto yy993;
+                       goto yy990;
                }
                if (yych <= '\f') {
-                       if (yych == '\n') goto yy997;
+                       if (yych == '\n') goto yy994;
                } else {
-                       if (yych <= '\r') goto yy997;
-                       if (yych == ';') goto yy996;
+                       if (yych <= '\r') goto yy994;
+                       if (yych == ';') goto yy993;
                }
-yy995:
-               YYDEBUG(995, *YYCURSOR);
+yy992:
+               YYDEBUG(992, *YYCURSOR);
                YYCURSOR = YYMARKER;
-               goto yy991;
-yy996:
-               YYDEBUG(996, *YYCURSOR);
+               goto yy988;
+yy993:
+               YYDEBUG(993, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == '\n') goto yy997;
-               if (yych != '\r') goto yy995;
-yy997:
-               YYDEBUG(997, *YYCURSOR);
+               if (yych == '\n') goto yy994;
+               if (yych != '\r') goto yy992;
+yy994:
+               YYDEBUG(994, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(998, *YYCURSOR);
+               YYDEBUG(995, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2483 "Zend/zend_language_scanner.l"
+#line 2488 "Zend/zend_language_scanner.l"
                {
        int label_len = yyleng - 1;
 
@@ -9659,6 +9690,7 @@ yy997:
        }
 
        yyless(label_len);
+       yyleng = label_len;
 
        if (label_len==CG(heredoc_len) && !memcmp(yytext, CG(heredoc), label_len)) {
                Z_STRVAL_P(zendlval) = CG(heredoc);
@@ -9672,7 +9704,7 @@ yy997:
                yymore();
        }
 }
-#line 9676 "Zend/zend_language_scanner.c"
+#line 9708 "Zend/zend_language_scanner.c"
        }
 /* *********************************** */
 yyc_ST_START_NOWDOC:
@@ -9711,76 +9743,76 @@ yyc_ST_START_NOWDOC:
                        128, 128, 128, 128, 128, 128, 128, 128, 
                        128, 128, 128, 128, 128, 128, 128, 128, 
                };
-               YYDEBUG(999, *YYCURSOR);
+               YYDEBUG(996, *YYCURSOR);
                YYFILL(3);
                yych = *YYCURSOR;
                if (yych <= '_') {
-                       if (yych <= '@') goto yy1001;
-                       if (yych <= 'Z') goto yy1003;
-                       if (yych >= '_') goto yy1003;
+                       if (yych <= '@') goto yy998;
+                       if (yych <= 'Z') goto yy1000;
+                       if (yych >= '_') goto yy1000;
                } else {
-                       if (yych <= '`') goto yy1001;
-                       if (yych <= 'z') goto yy1003;
-                       if (yych >= 0x7F) goto yy1003;
+                       if (yych <= '`') goto yy998;
+                       if (yych <= 'z') goto yy1000;
+                       if (yych >= 0x7F) goto yy1000;
                }
-yy1001:
-               YYDEBUG(1001, *YYCURSOR);
+yy998:
+               YYDEBUG(998, *YYCURSOR);
                ++YYCURSOR;
-yy1002:
-               YYDEBUG(1002, *YYCURSOR);
+yy999:
+               YYDEBUG(999, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2668 "Zend/zend_language_scanner.l"
+#line 2680 "Zend/zend_language_scanner.l"
                {
        yyless(0);
        BEGIN(ST_NOWDOC);
        goto restart;
 }
-#line 9739 "Zend/zend_language_scanner.c"
-yy1003:
-               YYDEBUG(1003, *YYCURSOR);
+#line 9771 "Zend/zend_language_scanner.c"
+yy1000:
+               YYDEBUG(1000, *YYCURSOR);
                yyaccept = 0;
                yych = *(YYMARKER = ++YYCURSOR);
                if (yybm[0+yych] & 128) {
-                       goto yy1004;
+                       goto yy1001;
                }
                if (yych <= '\f') {
-                       if (yych == '\n') goto yy1008;
-                       goto yy1002;
+                       if (yych == '\n') goto yy1005;
+                       goto yy999;
                } else {
-                       if (yych <= '\r') goto yy1008;
-                       if (yych == ';') goto yy1007;
-                       goto yy1002;
+                       if (yych <= '\r') goto yy1005;
+                       if (yych == ';') goto yy1004;
+                       goto yy999;
                }
-yy1004:
-               YYDEBUG(1004, *YYCURSOR);
+yy1001:
+               YYDEBUG(1001, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(2);
                yych = *YYCURSOR;
-               YYDEBUG(1005, *YYCURSOR);
+               YYDEBUG(1002, *YYCURSOR);
                if (yybm[0+yych] & 128) {
-                       goto yy1004;
+                       goto yy1001;
                }
                if (yych <= '\f') {
-                       if (yych == '\n') goto yy1008;
+                       if (yych == '\n') goto yy1005;
                } else {
-                       if (yych <= '\r') goto yy1008;
-                       if (yych == ';') goto yy1007;
+                       if (yych <= '\r') goto yy1005;
+                       if (yych == ';') goto yy1004;
                }
-yy1006:
-               YYDEBUG(1006, *YYCURSOR);
+yy1003:
+               YYDEBUG(1003, *YYCURSOR);
                YYCURSOR = YYMARKER;
-               goto yy1002;
-yy1007:
-               YYDEBUG(1007, *YYCURSOR);
+               goto yy999;
+yy1004:
+               YYDEBUG(1004, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == '\n') goto yy1008;
-               if (yych != '\r') goto yy1006;
-yy1008:
-               YYDEBUG(1008, *YYCURSOR);
+               if (yych == '\n') goto yy1005;
+               if (yych != '\r') goto yy1003;
+yy1005:
+               YYDEBUG(1005, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(1009, *YYCURSOR);
+               YYDEBUG(1006, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2674 "Zend/zend_language_scanner.l"
+#line 2686 "Zend/zend_language_scanner.l"
                {
        int label_len = yyleng - 1;
 
@@ -9804,7 +9836,7 @@ yy1008:
                yymore();
        }
 }
-#line 9808 "Zend/zend_language_scanner.c"
+#line 9840 "Zend/zend_language_scanner.c"
        }
 /* *********************************** */
 yyc_ST_VAR_OFFSET:
@@ -9843,69 +9875,69 @@ yyc_ST_VAR_OFFSET:
                         32,  32,  32,  32,  32,  32,  32,  32, 
                         32,  32,  32,  32,  32,  32,  32,  32, 
                };
-               YYDEBUG(1010, *YYCURSOR);
+               YYDEBUG(1007, *YYCURSOR);
                YYFILL(3);
                yych = *YYCURSOR;
                if (yych <= '/') {
                        if (yych <= ' ') {
                                if (yych <= '\f') {
-                                       if (yych <= 0x08) goto yy1024;
-                                       if (yych <= '\n') goto yy1020;
-                                       goto yy1024;
+                                       if (yych <= 0x08) goto yy1021;
+                                       if (yych <= '\n') goto yy1017;
+                                       goto yy1021;
                                } else {
-                                       if (yych <= '\r') goto yy1020;
-                                       if (yych <= 0x1F) goto yy1024;
-                                       goto yy1020;
+                                       if (yych <= '\r') goto yy1017;
+                                       if (yych <= 0x1F) goto yy1021;
+                                       goto yy1017;
                                }
                        } else {
                                if (yych <= '$') {
-                                       if (yych <= '"') goto yy1019;
-                                       if (yych <= '#') goto yy1020;
-                                       goto yy1015;
+                                       if (yych <= '"') goto yy1016;
+                                       if (yych <= '#') goto yy1017;
+                                       goto yy1012;
                                } else {
-                                       if (yych == '\'') goto yy1020;
-                                       goto yy1019;
+                                       if (yych == '\'') goto yy1017;
+                                       goto yy1016;
                                }
                        }
                } else {
                        if (yych <= '\\') {
                                if (yych <= '@') {
-                                       if (yych <= '0') goto yy1012;
-                                       if (yych <= '9') goto yy1014;
-                                       goto yy1019;
+                                       if (yych <= '0') goto yy1009;
+                                       if (yych <= '9') goto yy1011;
+                                       goto yy1016;
                                } else {
-                                       if (yych <= 'Z') goto yy1022;
-                                       if (yych <= '[') goto yy1019;
-                                       goto yy1020;
+                                       if (yych <= 'Z') goto yy1019;
+                                       if (yych <= '[') goto yy1016;
+                                       goto yy1017;
                                }
                        } else {
                                if (yych <= '_') {
-                                       if (yych <= ']') goto yy1017;
-                                       if (yych <= '^') goto yy1019;
-                                       goto yy1022;
+                                       if (yych <= ']') goto yy1014;
+                                       if (yych <= '^') goto yy1016;
+                                       goto yy1019;
                                } else {
-                                       if (yych <= '`') goto yy1019;
-                                       if (yych <= 'z') goto yy1022;
-                                       if (yych <= '~') goto yy1019;
-                                       goto yy1022;
+                                       if (yych <= '`') goto yy1016;
+                                       if (yych <= 'z') goto yy1019;
+                                       if (yych <= '~') goto yy1016;
+                                       goto yy1019;
                                }
                        }
                }
-yy1012:
-               YYDEBUG(1012, *YYCURSOR);
+yy1009:
+               YYDEBUG(1009, *YYCURSOR);
                yyaccept = 0;
                yych = *(YYMARKER = ++YYCURSOR);
                if (yych <= 'W') {
-                       if (yych <= '/') goto yy1013;
-                       if (yych <= '9') goto yy1035;
+                       if (yych <= '/') goto yy1010;
+                       if (yych <= '9') goto yy1032;
                } else {
-                       if (yych <= 'X') goto yy1033;
-                       if (yych == 'x') goto yy1033;
+                       if (yych <= 'X') goto yy1030;
+                       if (yych == 'x') goto yy1030;
                }
-yy1013:
-               YYDEBUG(1013, *YYCURSOR);
+yy1010:
+               YYDEBUG(1010, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1915 "Zend/zend_language_scanner.l"
+#line 1917 "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)) {
                Z_LVAL_P(zendlval) = strtol(yytext, NULL, 10);
@@ -9917,124 +9949,125 @@ yy1013:
        }
        return T_NUM_STRING;
 }
-#line 9921 "Zend/zend_language_scanner.c"
-yy1014:
-               YYDEBUG(1014, *YYCURSOR);
+#line 9953 "Zend/zend_language_scanner.c"
+yy1011:
+               YYDEBUG(1011, *YYCURSOR);
                yych = *++YYCURSOR;
-               goto yy1032;
-yy1015:
-               YYDEBUG(1015, *YYCURSOR);
+               goto yy1029;
+yy1012:
+               YYDEBUG(1012, *YYCURSOR);
                ++YYCURSOR;
                if ((yych = *YYCURSOR) <= '_') {
-                       if (yych <= '@') goto yy1016;
-                       if (yych <= 'Z') goto yy1028;
-                       if (yych >= '_') goto yy1028;
+                       if (yych <= '@') goto yy1013;
+                       if (yych <= 'Z') goto yy1025;
+                       if (yych >= '_') goto yy1025;
                } else {
-                       if (yych <= '`') goto yy1016;
-                       if (yych <= 'z') goto yy1028;
-                       if (yych >= 0x7F) goto yy1028;
+                       if (yych <= '`') goto yy1013;
+                       if (yych <= 'z') goto yy1025;
+                       if (yych >= 0x7F) goto yy1025;
                }
-yy1016:
-               YYDEBUG(1016, *YYCURSOR);
+yy1013:
+               YYDEBUG(1013, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2241 "Zend/zend_language_scanner.l"
+#line 2245 "Zend/zend_language_scanner.l"
                {
        /* Only '[' can be valid, but returning other tokens will allow a more explicit parse error */
        return yytext[0];
 }
-#line 9946 "Zend/zend_language_scanner.c"
-yy1017:
-               YYDEBUG(1017, *YYCURSOR);
+#line 9978 "Zend/zend_language_scanner.c"
+yy1014:
+               YYDEBUG(1014, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(1018, *YYCURSOR);
+               YYDEBUG(1015, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2236 "Zend/zend_language_scanner.l"
+#line 2240 "Zend/zend_language_scanner.l"
                {
        yy_pop_state(TSRMLS_C);
        return ']';
 }
-#line 9957 "Zend/zend_language_scanner.c"
-yy1019:
-               YYDEBUG(1019, *YYCURSOR);
+#line 9989 "Zend/zend_language_scanner.c"
+yy1016:
+               YYDEBUG(1016, *YYCURSOR);
                yych = *++YYCURSOR;
-               goto yy1016;
-yy1020:
-               YYDEBUG(1020, *YYCURSOR);
+               goto yy1013;
+yy1017:
+               YYDEBUG(1017, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(1021, *YYCURSOR);
+               YYDEBUG(1018, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2246 "Zend/zend_language_scanner.l"
+#line 2250 "Zend/zend_language_scanner.l"
                {
        /* Invalid rule to return a more explicit parse error with proper line number */
        yyless(0);
+       yyleng = 0;
        yy_pop_state(TSRMLS_C);
        ZVAL_EMPTY_TEXT(zendlval); /* Empty since it won't be used */
        return T_ENCAPSED_AND_WHITESPACE;
 }
-#line 9975 "Zend/zend_language_scanner.c"
-yy1022:
-               YYDEBUG(1022, *YYCURSOR);
+#line 10008 "Zend/zend_language_scanner.c"
+yy1019:
+               YYDEBUG(1019, *YYCURSOR);
                ++YYCURSOR;
                yych = *YYCURSOR;
-               goto yy1027;
-yy1023:
-               YYDEBUG(1023, *YYCURSOR);
+               goto yy1024;
+yy1020:
+               YYDEBUG(1020, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2264 "Zend/zend_language_scanner.l"
+#line 2269 "Zend/zend_language_scanner.l"
                {
        if (!zend_copy_scanner_string(zendlval, yytext, yyleng, CG(literal_type), SCNG(output_conv) TSRMLS_CC)) {
                return 0;
        }
        return T_STRING;
 }
-#line 9991 "Zend/zend_language_scanner.c"
-yy1024:
-               YYDEBUG(1024, *YYCURSOR);
+#line 10024 "Zend/zend_language_scanner.c"
+yy1021:
+               YYDEBUG(1021, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(1025, *YYCURSOR);
+               YYDEBUG(1022, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2761 "Zend/zend_language_scanner.l"
+#line 2777 "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 10002 "Zend/zend_language_scanner.c"
-yy1026:
-               YYDEBUG(1026, *YYCURSOR);
+#line 10035 "Zend/zend_language_scanner.c"
+yy1023:
+               YYDEBUG(1023, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-yy1027:
-               YYDEBUG(1027, *YYCURSOR);
+yy1024:
+               YYDEBUG(1024, *YYCURSOR);
                if (yybm[0+yych] & 32) {
-                       goto yy1026;
+                       goto yy1023;
                }
-               goto yy1023;
-yy1028:
-               YYDEBUG(1028, *YYCURSOR);
+               goto yy1020;
+yy1025:
+               YYDEBUG(1025, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(1029, *YYCURSOR);
+               YYDEBUG(1026, *YYCURSOR);
                if (yych <= '^') {
                        if (yych <= '9') {
-                               if (yych >= '0') goto yy1028;
+                               if (yych >= '0') goto yy1025;
                        } else {
-                               if (yych <= '@') goto yy1030;
-                               if (yych <= 'Z') goto yy1028;
+                               if (yych <= '@') goto yy1027;
+                               if (yych <= 'Z') goto yy1025;
                        }
                } else {
                        if (yych <= '`') {
-                               if (yych <= '_') goto yy1028;
+                               if (yych <= '_') goto yy1025;
                        } else {
-                               if (yych <= 'z') goto yy1028;
-                               if (yych >= 0x7F) goto yy1028;
+                               if (yych <= 'z') goto yy1025;
+                               if (yych >= 0x7F) goto yy1025;
                        }
                }
-yy1030:
-               YYDEBUG(1030, *YYCURSOR);
+yy1027:
+               YYDEBUG(1027, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2226 "Zend/zend_language_scanner.l"
+#line 2230 "Zend/zend_language_scanner.l"
                {
        if (!zend_copy_scanner_string(zendlval, (yytext+1), (yyleng-1), UG(unicode)?IS_UNICODE:IS_STRING, SCNG(output_conv) TSRMLS_CC)) {
                return 0;
@@ -10044,58 +10077,58 @@ yy1030:
        }
        return T_VARIABLE;
 }
-#line 10048 "Zend/zend_language_scanner.c"
-yy1031:
-               YYDEBUG(1031, *YYCURSOR);
+#line 10081 "Zend/zend_language_scanner.c"
+yy1028:
+               YYDEBUG(1028, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-yy1032:
-               YYDEBUG(1032, *YYCURSOR);
+yy1029:
+               YYDEBUG(1029, *YYCURSOR);
                if (yybm[0+yych] & 64) {
-                       goto yy1031;
+                       goto yy1028;
                }
-               goto yy1013;
-yy1033:
-               YYDEBUG(1033, *YYCURSOR);
+               goto yy1010;
+yy1030:
+               YYDEBUG(1030, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yybm[0+yych] & 128) {
-                       goto yy1038;
+                       goto yy1035;
                }
-               YYDEBUG(1034, *YYCURSOR);
+               YYDEBUG(1031, *YYCURSOR);
                YYCURSOR = YYMARKER;
-               goto yy1013;
-yy1035:
-               YYDEBUG(1035, *YYCURSOR);
+               goto yy1010;
+yy1032:
+               YYDEBUG(1032, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(1036, *YYCURSOR);
-               if (yych <= '/') goto yy1037;
-               if (yych <= '9') goto yy1035;
-yy1037:
-               YYDEBUG(1037, *YYCURSOR);
+               YYDEBUG(1033, *YYCURSOR);
+               if (yych <= '/') goto yy1034;
+               if (yych <= '9') goto yy1032;
+yy1034:
+               YYDEBUG(1034, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1927 "Zend/zend_language_scanner.l"
+#line 1929 "Zend/zend_language_scanner.l"
                { /* Offset must be treated as a string */
        if (!zend_copy_scanner_string(zendlval, yytext, yyleng, CG(literal_type), SCNG(output_conv) TSRMLS_CC)) {
                return 0;
        }
        return T_NUM_STRING;
 }
-#line 10087 "Zend/zend_language_scanner.c"
-yy1038:
-               YYDEBUG(1038, *YYCURSOR);
+#line 10120 "Zend/zend_language_scanner.c"
+yy1035:
+               YYDEBUG(1035, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(1039, *YYCURSOR);
+               YYDEBUG(1036, *YYCURSOR);
                if (yybm[0+yych] & 128) {
-                       goto yy1038;
+                       goto yy1035;
                }
-               goto yy1037;
+               goto yy1034;
        }
 }
-#line 2766 "Zend/zend_language_scanner.l"
+#line 2782 "Zend/zend_language_scanner.l"
 
 }
index 22e987f4e2a06de0fc95b505a6eb7561459eb4c4..cd056ec8299d9583f9cb9cd483fede1b1884aecf 100644 (file)
@@ -1331,7 +1331,7 @@ yymore_restart:
        if (YYCURSOR >= YYLIMIT) {
                /* special case */
                if (YYSTATE == STATE(ST_COMMENT) || YYSTATE == STATE(ST_DOC_COMMENT)) {
-                       zend_error(E_COMPILE_WARNING,"Unterminated comment starting line %d", CG(comment_start_line));
+                       zend_error(E_COMPILE_WARNING, "Unterminated comment starting line %d", CG(zend_lineno));
                }
                return 0;
        }
@@ -1556,9 +1556,12 @@ NOWDOC_CHARS             ({NEWLINE}*(([^a-zA-Z_\x7f-\xff\n\r][^\n\r]*)|({LABEL}[^a-zA-Z0-9_
        return T_OBJECT_OPERATOR;
 }
 
-<ST_LOOKING_FOR_PROPERTY>{WHITESPACE}+ {
-       /* do nothing */
-       goto restart;
+<ST_IN_SCRIPTING,ST_LOOKING_FOR_PROPERTY>{WHITESPACE}+ {
+       Z_STRVAL_P(zendlval) = yytext; /* no copying - intentional */
+       Z_STRLEN_P(zendlval) = yyleng;
+       Z_TYPE_P(zendlval) = IS_STRING;
+       HANDLE_NEWLINES(yytext, yyleng);
+       return T_WHITESPACE;
 }
 
 <ST_LOOKING_FOR_PROPERTY>"->" {
@@ -1841,7 +1844,6 @@ NOWDOC_CHARS              ({NEWLINE}*(([^a-zA-Z_\x7f-\xff\n\r][^\n\r]*)|({LABEL}[^a-zA-Z0-9_
 
 <ST_IN_SCRIPTING>"}" {
        RESET_DOC_COMMENT();
-       /* This is a temporary fix which is dependant on flex and it's implementation */
        if (!zend_stack_is_empty(&SCNG(state_stack))) {
                yy_pop_state(TSRMLS_C);
        }
@@ -1871,45 +1873,45 @@ NOWDOC_CHARS            ({NEWLINE}*(([^a-zA-Z_\x7f-\xff\n\r][^\n\r]*)|({LABEL}[^a-zA-Z0-9_
 
 
 <ST_IN_SCRIPTING>{LNUM} {
-    if (yyleng < MAX_LENGTH_OF_LONG - 1) { /* Won't overflow */
-        zendlval->value.lval = strtol(yytext, NULL, 0);
-    } else {
-        errno = 0;
-        zendlval->value.lval = strtol(yytext, NULL, 0);
-        if (errno == ERANGE) { /* Overflow */
-            if (yytext[0] == '0') { /* octal overflow */
-                zendlval->value.dval = zend_oct_strtod(yytext, NULL);
-            } else {
-                zendlval->value.dval = zend_strtod(yytext, NULL);
-            }
-            zendlval->type = IS_DOUBLE;
-            return T_DNUMBER;
-        }
-    }
+       if (yyleng < MAX_LENGTH_OF_LONG - 1) { /* Won't overflow */
+               Z_LVAL_P(zendlval) = strtol(yytext, NULL, 0);
+       } else {
+               errno = 0;
+               Z_LVAL_P(zendlval) = strtol(yytext, NULL, 0);
+               if (errno == ERANGE) { /* Overflow */
+                       if (yytext[0] == '0') { /* octal overflow */
+                               Z_DVAL_P(zendlval) = zend_oct_strtod(yytext, NULL);
+                       } else {
+                               Z_DVAL_P(zendlval) = zend_strtod(yytext, NULL);
+                       }
+                       Z_TYPE_P(zendlval) = IS_DOUBLE;
+                       return T_DNUMBER;
+               }
+       }
 
-    zendlval->type = IS_LONG;
-    return T_LNUMBER;
+       Z_TYPE_P(zendlval) = IS_LONG;
+       return T_LNUMBER;
 }
 
 <ST_IN_SCRIPTING>{HNUM} {
-    char *hex = yytext + 2; /* Skip "0x" */
-    int len = yyleng - 2;
+       char *hex = yytext + 2; /* Skip "0x" */
+       int len = yyleng - 2;
 
-    /* Skip any leading 0s */
-    while (*hex == '0') {
-        hex++;
-        len--;
-    }
+       /* Skip any leading 0s */
+       while (*hex == '0') {
+               hex++;
+               len--;
+       }
 
-    if (len < SIZEOF_LONG * 2 || (len == SIZEOF_LONG * 2 && *hex <= '7')) {
-        zendlval->value.lval = strtol(hex, NULL, 16);
-        zendlval->type = IS_LONG;
-        return T_LNUMBER;
-    } else {
-        zendlval->value.dval = zend_hex_strtod(hex, NULL);
-        zendlval->type = IS_DOUBLE;
-        return T_DNUMBER;
-    }
+       if (len < SIZEOF_LONG * 2 || (len == SIZEOF_LONG * 2 && *hex <= '7')) {
+               Z_LVAL_P(zendlval) = strtol(hex, NULL, 16);
+               Z_TYPE_P(zendlval) = IS_LONG;
+               return T_LNUMBER;
+       } else {
+               Z_DVAL_P(zendlval) = zend_hex_strtod(hex, NULL);
+               Z_TYPE_P(zendlval) = IS_DOUBLE;
+               return T_DNUMBER;
+       }
 }
 
 <ST_VAR_OFFSET>[0]|([1-9][0-9]*) { /* Offset could be treated as a long */
@@ -2196,10 +2198,11 @@ inline_char_handler:
  * and "->" will be taken literally
  */
 <ST_DOUBLE_QUOTES,ST_HEREDOC,ST_BACKQUOTE>"$"{LABEL}"->"[a-zA-Z_\x7f-\xff] {
-       yyless(yyleng - 3);
+       yyleng -= 3;
+       yyless(yyleng);
        yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC);
 
-       if (!zend_copy_scanner_string(zendlval, (yytext+1), (yyleng-4), UG(unicode)?IS_UNICODE:IS_STRING, SCNG(output_conv) TSRMLS_CC)) {
+       if (!zend_copy_scanner_string(zendlval, (yytext+1), (yyleng-1), UG(unicode)?IS_UNICODE:IS_STRING, SCNG(output_conv) TSRMLS_CC)) {
                return 0;
        }
        if (UG(unicode) && !zend_check_and_normalize_identifier(zendlval)) {
@@ -2211,10 +2214,11 @@ inline_char_handler:
 /* A [ always designates a variable offset, regardless of what follows
  */
 <ST_DOUBLE_QUOTES,ST_HEREDOC,ST_BACKQUOTE>"$"{LABEL}"[" {
-       yyless(yyleng - 1);
+       yyleng--;
+       yyless(yyleng);
        yy_push_state(ST_VAR_OFFSET TSRMLS_CC);
 
-       if (!zend_copy_scanner_string(zendlval, (yytext+1), (yyleng-2), UG(unicode)?IS_UNICODE:IS_STRING, SCNG(output_conv) TSRMLS_CC)) {
+       if (!zend_copy_scanner_string(zendlval, (yytext+1), (yyleng-1), UG(unicode)?IS_UNICODE:IS_STRING, SCNG(output_conv) TSRMLS_CC)) {
                return 0;
        }
        if (UG(unicode) && !zend_check_and_normalize_identifier(zendlval)) {
@@ -2246,6 +2250,7 @@ inline_char_handler:
 <ST_VAR_OFFSET>[ \n\r\t\\'#] {
        /* Invalid rule to return a more explicit parse error with proper line number */
        yyless(0);
+       yyleng = 0;
        yy_pop_state(TSRMLS_C);
        ZVAL_EMPTY_TEXT(zendlval); /* Empty since it won't be used */
        return T_ENCAPSED_AND_WHITESPACE;
@@ -2269,15 +2274,6 @@ inline_char_handler:
 }
 
 
-<ST_IN_SCRIPTING>{WHITESPACE} {
-       Z_STRVAL_P(zendlval) = yytext; /* no copying - intentional */
-       Z_STRLEN_P(zendlval) = yyleng;
-       Z_TYPE_P(zendlval) = IS_STRING;
-       HANDLE_NEWLINES(yytext, yyleng);
-       return T_WHITESPACE;
-}
-
-
 <ST_IN_SCRIPTING>"#"|"//" {
        BEGIN(ST_ONE_LINE_COMMENT);
        yymore();
@@ -2329,14 +2325,12 @@ inline_char_handler:
 }
 
 <ST_IN_SCRIPTING>"/**"{WHITESPACE} {
-       CG(comment_start_line) = CG(zend_lineno);
        RESET_DOC_COMMENT();
        BEGIN(ST_DOC_COMMENT);
        yymore();
 }
 
 <ST_IN_SCRIPTING>"/*" {
-       CG(comment_start_line) = CG(zend_lineno);
        BEGIN(ST_COMMENT);
        yymore();
 }
@@ -2387,6 +2381,7 @@ inline_char_handler:
                return T_CLOSE_TAG;  /* implicit ';' at php-end tag */
        } else {
                yyless(1);
+               yyleng = 1;
                return yytext[0];
        }
 }
@@ -2438,14 +2433,19 @@ inline_char_handler:
 
 <ST_IN_SCRIPTING>b"<<<"{TABS_AND_SPACES}({LABEL}|["]{LABEL}["]){NEWLINE} {
        char *s;
-       int quotes  = (yytext[4] == '"') ? 2 : 0;
+
        CG(zend_lineno)++;
-       CG(heredoc_len) = yyleng-4-quotes-1-(yytext[yyleng-2]=='\r'?1:0);
-       s = yytext+4+(quotes ? 1 : 0);
+       CG(heredoc_len) = yyleng-4-1-(yytext[yyleng-2]=='\r'?1:0);
+       s = yytext+4;
        while ((*s == ' ') || (*s == '\t')) {
                s++;
                CG(heredoc_len)--;
        }
+
+       if (*s == '"') {
+               s++;
+               CG(heredoc_len) -= 2;
+       }
        CG(heredoc) = estrndup(s, CG(heredoc_len));
        BEGIN(ST_START_HEREDOC);
        return T_BINARY_HEREDOC;
@@ -2454,14 +2454,19 @@ inline_char_handler:
 
 <ST_IN_SCRIPTING>"<<<"{TABS_AND_SPACES}({LABEL}|["]{LABEL}["]){NEWLINE} {
        char *s;
-       int quotes  = (yytext[3] == '"') ? 2 : 0;
+
        CG(zend_lineno)++;
-       CG(heredoc_len) = yyleng-3-quotes-1-(yytext[yyleng-2]=='\r'?1:0);
-       s = yytext+3+(quotes ? 1 : 0);
+       CG(heredoc_len) = yyleng-3-1-(yytext[yyleng-2]=='\r'?1:0);
+       s = yytext+3;
        while ((*s == ' ') || (*s == '\t')) {
                s++;
                CG(heredoc_len)--;
        }
+
+       if (*s == '"') {
+               s++;
+               CG(heredoc_len) -= 2;
+       }
        CG(heredoc) = estrndup(s, CG(heredoc_len));
        BEGIN(ST_START_HEREDOC);
        return T_START_HEREDOC;
@@ -2488,6 +2493,7 @@ inline_char_handler:
        }
 
        yyless(label_len);
+       yyleng = label_len;
 
        if (label_len==CG(heredoc_len) && !memcmp(yytext, CG(heredoc), label_len)) {
                Z_STRVAL_P(zendlval) = CG(heredoc);
@@ -2519,16 +2525,22 @@ inline_char_handler:
        if (yyleng > CG(heredoc_len) && !memcmp(end - CG(heredoc_len), CG(heredoc), CG(heredoc_len))) {
                int len = yyleng - CG(heredoc_len) - 2; /* 2 for newline before and after label */
 
-               if (len > 0 && yytext[len - 1] == '\r' && yytext[len] == '\n') {
-                       len--;
+               /* May have matched fooLABEL; make sure there's a newline before it */
+               if (yytext[len] != '\n') {
+                       if (yytext[len] != '\r') {
+                               yyless(yyleng - 1);
+                               yymore();
+                       }
+               } else if (len > 0 && yytext[len - 1] == '\r') {
+                       len--; /* Windows newline */
                }
 
                /* Go back before last label char, to match in ST_END_HEREDOC state */
                yyless(yyleng - 2);
 
-               /* Subtract the remaining label length. yyleng must include newline
+               /* Subtract the label/newline length. yyleng must include newline
                 * before label, for zend_highlight/strip, tokenizer, etc. */
-               yyleng = yyleng - CG(heredoc_len) - 1;
+               yyleng -= CG(heredoc_len) + 1;
 
                CG(increment_lineno) = 1; /* For newline before label */
                BEGIN(ST_END_HEREDOC);
@@ -2548,10 +2560,8 @@ inline_char_handler:
 }
 
 <ST_END_HEREDOC>{ANY_CHAR} {
-       Z_STRVAL_P(zendlval) = CG(heredoc);
-       Z_STRLEN_P(zendlval) = CG(heredoc_len);
-       SCNG(yy_text) = Z_STRVAL_P(zendlval);
-       yyleng = Z_STRLEN_P(zendlval);
+       SCNG(yy_text) = Z_STRVAL_P(zendlval) = CG(heredoc);
+       SCNG(yy_leng) = Z_STRLEN_P(zendlval) = CG(heredoc_len);
        CG(heredoc) = NULL;
        CG(heredoc_len) = 0;
        BEGIN(ST_IN_SCRIPTING);
@@ -2559,10 +2569,10 @@ inline_char_handler:
 }
 
 
-<ST_DOUBLE_QUOTES,ST_BACKQUOTE,ST_HEREDOC>"{$" {
+/* Will only match when $ follows: "{$" */
+<ST_DOUBLE_QUOTES,ST_BACKQUOTE,ST_HEREDOC>"{" {
        Z_LVAL_P(zendlval) = (long) '{';
        yy_push_state(ST_IN_SCRIPTING TSRMLS_CC);
-       yyless(1);
        return T_CURLY_OPEN;
 }
 
@@ -2580,11 +2590,11 @@ inline_char_handler:
  * (("{"+|"$"+)["]) handles { or $ at the end of a string
  *
  * Same for backquotes and heredocs, except the second case doesn't apply to
- * heredocs. yyless(yyleng - 1) is used to correct taking one character too many
+ * heredocs. yyleng--/yyless() is used to correct taking one character too many
  */
 <ST_DOUBLE_QUOTES>{DOUBLE_QUOTES_CHARS}*("{"{2,}|"$"{2,}|(("{"+|"$"+)["])) {
-       yyless(yyleng - 1);
-       if (yytext[yyleng-1] == '"') --yyleng;
+       yyleng--;
+       yyless(yyleng);
 
        if (CG(literal_type) == IS_UNICODE) {
                return zend_scan_unicode_escape_string(zendlval, yytext, yyleng, 0x22 /*'"'*/, T_ENCAPSED_AND_WHITESPACE TSRMLS_CC);
@@ -2605,7 +2615,8 @@ inline_char_handler:
 }
 
 <ST_BACKQUOTE>{BACKQUOTE_CHARS}*("{"{2,}|"$"{2,}|(("{"+|"$"+)[`])) {
-       yyless(yyleng - 1);
+       yyleng--;
+       yyless(yyleng);
 
        if (CG(literal_type) == IS_UNICODE) {
                return zend_scan_unicode_escape_string(zendlval, yytext, yyleng, 0x60 /*'`'*/, T_ENCAPSED_AND_WHITESPACE TSRMLS_CC);
@@ -2633,7 +2644,8 @@ inline_char_handler:
 }
 
 <ST_HEREDOC>{HEREDOC_CHARS}*({HEREDOC_NEWLINE}+({LABEL}";"?)?)?("{"{2,}|"$"{2,}) {
-       yyless(yyleng - 1);
+       yyleng--;
+       yyless(yyleng);
 
        if (CG(literal_type) == IS_UNICODE) {
                return zend_scan_unicode_escape_string(zendlval, yytext, yyleng, 0, T_ENCAPSED_AND_WHITESPACE TSRMLS_CC);
@@ -2706,16 +2718,22 @@ inline_char_handler:
        if (yyleng > CG(heredoc_len) && !memcmp(end - CG(heredoc_len), CG(heredoc), CG(heredoc_len))) {
                int len = yyleng - CG(heredoc_len) - 2; /* 2 for newline before and after label */
 
-               if (len > 0 && yytext[len - 1] == '\r' && yytext[len] == '\n') {
-                       len--;
+               /* May have matched fooLABEL; make sure there's a newline before it */
+               if (yytext[len] != '\n') {
+                       if (yytext[len] != '\r') {
+                               yyless(yyleng - 1);
+                               yymore();
+                       }
+               } else if (len > 0 && yytext[len - 1] == '\r') {
+                       len--; /* Windows newline */
                }
 
-               /* Go back before last label char, to match in ST_END_HEREDOC state */
+               /* Go back before last label char, to match in ST_END_NOWDOC state */
                yyless(yyleng - 2);
 
-               /* Subtract the remaining label length. yyleng must include newline
+               /* Subtract the label/newline length. yyleng must include newline
                 * before label, for zend_highlight/strip, tokenizer, etc. */
-               yyleng = yyleng - CG(heredoc_len) - 1;
+               yyleng -= CG(heredoc_len) + 1;
 
                CG(increment_lineno) = 1; /* For newline before label */
                BEGIN(ST_END_NOWDOC);
@@ -2727,17 +2745,15 @@ inline_char_handler:
                return T_ENCAPSED_AND_WHITESPACE;
        } else {
                /* Go back to end of label, so the next match works correctly in case of
-                * a variable or another label at the beginning of the next line */
+                * another label at the beginning of the next line */
                yyless(yyleng - 1);
                yymore();
        }
 }
 
 <ST_END_NOWDOC>{ANY_CHAR} {
-       Z_STRVAL_P(zendlval) = CG(heredoc);
-       Z_STRLEN_P(zendlval) = CG(heredoc_len);
-       SCNG(yy_text) = CG(heredoc);
-       yyleng = CG(heredoc_len);
+       SCNG(yy_text) = Z_STRVAL_P(zendlval) = CG(heredoc);
+       SCNG(yy_leng) = Z_STRLEN_P(zendlval) = CG(heredoc_len);
        CG(heredoc) = NULL;
        CG(heredoc_len) = 0;
        BEGIN(ST_IN_SCRIPTING);