Merge branch 'PHP-7.0'

Conflicts:
	Zend/zend_language_scanner.c

diff --cc Zend/zend_language_scanner.c
index c3a4736d3b92987213fa25eada7cb7f9e91375b6,9df9828eb4229bda15830a2253194683cd84f343..7809f95f11c8b7de911f38fec7c3613e469763d6
--- 1/Zend/zend_language_scanner.c
--- 2/Zend/zend_language_scanner.c
+++ b/Zend/zend_language_scanner.c
@@@ -1147,7 -1171,7 +1147,7 @@@ yyc_INITIAL
  yy3:
        YYDEBUG(3, *YYCURSOR);
        yyleng = YYCURSOR - SCNG(yy_text);
- #line 1788 "Zend/zend_language_scanner.l"
 -#line 1813 "Zend/zend_language_scanner.l"
++#line 1789 "Zend/zend_language_scanner.l"
        {
        if (YYCURSOR > YYLIMIT) {
                RETURN_TOKEN(END);
@@@ -1210,7 -1234,7 +1210,7 @@@ yy5
  yy6:
        YYDEBUG(6, *YYCURSOR);
        yyleng = YYCURSOR - SCNG(yy_text);
- #line 1779 "Zend/zend_language_scanner.l"
 -#line 1804 "Zend/zend_language_scanner.l"
++#line 1780 "Zend/zend_language_scanner.l"
        {
        if (CG(short_tags)) {
                BEGIN(ST_IN_SCRIPTING);
@@@ -1225,7 -1249,7 +1225,7 @@@ yy7
        ++YYCURSOR;
        YYDEBUG(8, *YYCURSOR);
        yyleng = YYCURSOR - SCNG(yy_text);
- #line 1766 "Zend/zend_language_scanner.l"
 -#line 1791 "Zend/zend_language_scanner.l"
++#line 1767 "Zend/zend_language_scanner.l"
        {
        BEGIN(ST_IN_SCRIPTING);
        RETURN_TOKEN(T_OPEN_TAG_WITH_ECHO);
@@@ -1261,7 -1285,7 +1261,7 @@@ yy13
  yy14:
        YYDEBUG(14, *YYCURSOR);
        yyleng = YYCURSOR - SCNG(yy_text);
- #line 1772 "Zend/zend_language_scanner.l"
 -#line 1797 "Zend/zend_language_scanner.l"
++#line 1773 "Zend/zend_language_scanner.l"
        {
        HANDLE_NEWLINE(yytext[yyleng-1]);
        BEGIN(ST_IN_SCRIPTING);
@@@ -1337,7 -1361,7 +1337,7 @@@ yyc_ST_BACKQUOTE
  yy19:
                YYDEBUG(19, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 2198 "Zend/zend_language_scanner.l"
 -#line 2223 "Zend/zend_language_scanner.l"
++#line 2199 "Zend/zend_language_scanner.l"
                {
        if (YYCURSOR > YYLIMIT) {
                RETURN_TOKEN(END);
@@@ -1389,7 -1413,7 +1389,7 @@@ yy21
                ++YYCURSOR;
                YYDEBUG(22, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 2142 "Zend/zend_language_scanner.l"
 -#line 2167 "Zend/zend_language_scanner.l"
++#line 2143 "Zend/zend_language_scanner.l"
                {
        BEGIN(ST_IN_SCRIPTING);
        RETURN_TOKEN('`');
@@@ -1404,7 -1428,7 +1404,7 @@@ yy24
                ++YYCURSOR;
                YYDEBUG(25, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 2129 "Zend/zend_language_scanner.l"
 -#line 2154 "Zend/zend_language_scanner.l"
++#line 2130 "Zend/zend_language_scanner.l"
                {
        Z_LVAL_P(zendlval) = (zend_long) '{';
        yy_push_state(ST_IN_SCRIPTING);
@@@ -1427,7 -1451,7 +1427,7 @@@ yy26
  yy28:
                YYDEBUG(28, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1853 "Zend/zend_language_scanner.l"
 -#line 1878 "Zend/zend_language_scanner.l"
++#line 1854 "Zend/zend_language_scanner.l"
                {
        zend_copy_value(zendlval, (yytext+1), (yyleng-1));
        RETURN_TOKEN(T_VARIABLE);
@@@ -1438,7 -1462,7 +1438,7 @@@ yy29
                ++YYCURSOR;
                YYDEBUG(30, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1571 "Zend/zend_language_scanner.l"
 -#line 1596 "Zend/zend_language_scanner.l"
++#line 1572 "Zend/zend_language_scanner.l"
                {
        yy_push_state(ST_LOOKING_FOR_VARNAME);
        RETURN_TOKEN(T_DOLLAR_OPEN_CURLY_BRACES);
@@@ -1457,7 -1481,7 +1457,7 @@@ yy33
                ++YYCURSOR;
                YYDEBUG(34, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1846 "Zend/zend_language_scanner.l"
 -#line 1871 "Zend/zend_language_scanner.l"
++#line 1847 "Zend/zend_language_scanner.l"
                {
        yyless(yyleng - 1);
        yy_push_state(ST_VAR_OFFSET);
@@@ -1482,7 -1506,7 +1482,7 @@@ yy36
                ++YYCURSOR;
                YYDEBUG(37, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1837 "Zend/zend_language_scanner.l"
 -#line 1862 "Zend/zend_language_scanner.l"
++#line 1838 "Zend/zend_language_scanner.l"
                {
        yyless(yyleng - 3);
        yy_push_state(ST_LOOKING_FOR_PROPERTY);
@@@ -1557,7 -1581,7 +1557,7 @@@ yy40
  yy41:
                YYDEBUG(41, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 2148 "Zend/zend_language_scanner.l"
 -#line 2173 "Zend/zend_language_scanner.l"
++#line 2149 "Zend/zend_language_scanner.l"
                {
        if (GET_DOUBLE_QUOTES_SCANNED_LENGTH()) {
                YYCURSOR += GET_DOUBLE_QUOTES_SCANNED_LENGTH() - 1;
@@@ -1617,7 -1641,7 +1617,7 @@@ yy43
                ++YYCURSOR;
                YYDEBUG(44, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 2137 "Zend/zend_language_scanner.l"
 -#line 2162 "Zend/zend_language_scanner.l"
++#line 2138 "Zend/zend_language_scanner.l"
                {
        BEGIN(ST_IN_SCRIPTING);
        RETURN_TOKEN('"');
@@@ -1632,7 -1656,7 +1632,7 @@@ yy46
                ++YYCURSOR;
                YYDEBUG(47, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 2129 "Zend/zend_language_scanner.l"
 -#line 2154 "Zend/zend_language_scanner.l"
++#line 2130 "Zend/zend_language_scanner.l"
                {
        Z_LVAL_P(zendlval) = (zend_long) '{';
        yy_push_state(ST_IN_SCRIPTING);
@@@ -1655,7 -1679,7 +1655,7 @@@ yy48
  yy50:
                YYDEBUG(50, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1853 "Zend/zend_language_scanner.l"
 -#line 1878 "Zend/zend_language_scanner.l"
++#line 1854 "Zend/zend_language_scanner.l"
                {
        zend_copy_value(zendlval, (yytext+1), (yyleng-1));
        RETURN_TOKEN(T_VARIABLE);
@@@ -1666,7 -1690,7 +1666,7 @@@ yy51
                ++YYCURSOR;
                YYDEBUG(52, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1571 "Zend/zend_language_scanner.l"
 -#line 1596 "Zend/zend_language_scanner.l"
++#line 1572 "Zend/zend_language_scanner.l"
                {
        yy_push_state(ST_LOOKING_FOR_VARNAME);
        RETURN_TOKEN(T_DOLLAR_OPEN_CURLY_BRACES);
@@@ -1685,7 -1709,7 +1685,7 @@@ yy55
                ++YYCURSOR;
                YYDEBUG(56, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1846 "Zend/zend_language_scanner.l"
 -#line 1871 "Zend/zend_language_scanner.l"
++#line 1847 "Zend/zend_language_scanner.l"
                {
        yyless(yyleng - 1);
        yy_push_state(ST_VAR_OFFSET);
@@@ -1710,7 -1734,7 +1710,7 @@@ yy58
                ++YYCURSOR;
                YYDEBUG(59, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1837 "Zend/zend_language_scanner.l"
 -#line 1862 "Zend/zend_language_scanner.l"
++#line 1838 "Zend/zend_language_scanner.l"
                {
        yyless(yyleng - 3);
        yy_push_state(ST_LOOKING_FOR_PROPERTY);
@@@ -1728,7 -1752,7 +1728,7 @@@ yyc_ST_END_HEREDOC
        ++YYCURSOR;
        YYDEBUG(63, *YYCURSOR);
        yyleng = YYCURSOR - SCNG(yy_text);
- #line 2115 "Zend/zend_language_scanner.l"
 -#line 2140 "Zend/zend_language_scanner.l"
++#line 2116 "Zend/zend_language_scanner.l"
        {
        zend_heredoc_label *heredoc_label = zend_ptr_stack_pop(&SCNG(heredoc_label_stack));
  
@@@ -1803,7 -1827,7 +1803,7 @@@ yy66
  yy67:
                YYDEBUG(67, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 2240 "Zend/zend_language_scanner.l"
 -#line 2265 "Zend/zend_language_scanner.l"
++#line 2241 "Zend/zend_language_scanner.l"
                {
        int newline = 0;
  
@@@ -1891,7 -1915,7 +1891,7 @@@ yy70
                ++YYCURSOR;
                YYDEBUG(71, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 2129 "Zend/zend_language_scanner.l"
 -#line 2154 "Zend/zend_language_scanner.l"
++#line 2130 "Zend/zend_language_scanner.l"
                {
        Z_LVAL_P(zendlval) = (zend_long) '{';
        yy_push_state(ST_IN_SCRIPTING);
@@@ -1914,7 -1938,7 +1914,7 @@@ yy72
  yy74:
                YYDEBUG(74, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1853 "Zend/zend_language_scanner.l"
 -#line 1878 "Zend/zend_language_scanner.l"
++#line 1854 "Zend/zend_language_scanner.l"
                {
        zend_copy_value(zendlval, (yytext+1), (yyleng-1));
        RETURN_TOKEN(T_VARIABLE);
@@@ -1925,7 -1949,7 +1925,7 @@@ yy75
                ++YYCURSOR;
                YYDEBUG(76, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1571 "Zend/zend_language_scanner.l"
 -#line 1596 "Zend/zend_language_scanner.l"
++#line 1572 "Zend/zend_language_scanner.l"
                {
        yy_push_state(ST_LOOKING_FOR_VARNAME);
        RETURN_TOKEN(T_DOLLAR_OPEN_CURLY_BRACES);
@@@ -1944,7 -1968,7 +1944,7 @@@ yy79
                ++YYCURSOR;
                YYDEBUG(80, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1846 "Zend/zend_language_scanner.l"
 -#line 1871 "Zend/zend_language_scanner.l"
++#line 1847 "Zend/zend_language_scanner.l"
                {
        yyless(yyleng - 1);
        yy_push_state(ST_VAR_OFFSET);
@@@ -1969,7 -1993,7 +1969,7 @@@ yy82
                ++YYCURSOR;
                YYDEBUG(83, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1837 "Zend/zend_language_scanner.l"
 -#line 1862 "Zend/zend_language_scanner.l"
++#line 1838 "Zend/zend_language_scanner.l"
                {
        yyless(yyleng - 3);
        yy_push_state(ST_LOOKING_FOR_PROPERTY);
@@@ -2159,7 -2183,7 +2159,7 @@@ yy86
  yy87:
                YYDEBUG(87, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1876 "Zend/zend_language_scanner.l"
 -#line 1901 "Zend/zend_language_scanner.l"
++#line 1877 "Zend/zend_language_scanner.l"
                {
        zend_copy_value(zendlval, yytext, yyleng);
        RETURN_TOKEN(T_STRING);
@@@ -2396,7 -2420,7 +2396,7 @@@ yy101
  yy102:
                YYDEBUG(102, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1560 "Zend/zend_language_scanner.l"
 -#line 1585 "Zend/zend_language_scanner.l"
++#line 1561 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(yytext[0]);
  }
@@@ -2409,7 -2433,7 +2409,7 @@@ yy103
  yy104:
                YYDEBUG(104, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1275 "Zend/zend_language_scanner.l"
 -#line 1300 "Zend/zend_language_scanner.l"
++#line 1276 "Zend/zend_language_scanner.l"
                {
        HANDLE_NEWLINES(yytext, yyleng);
        RETURN_TOKEN(T_WHITESPACE);
@@@ -2425,7 -2449,7 +2425,7 @@@ yy106
                ++YYCURSOR;
                YYDEBUG(107, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1300 "Zend/zend_language_scanner.l"
 -#line 1325 "Zend/zend_language_scanner.l"
++#line 1301 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_NS_SEPARATOR);
  }
@@@ -2658,7 -2682,7 +2658,7 @@@ yy131
                ++YYCURSOR;
                YYDEBUG(132, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1565 "Zend/zend_language_scanner.l"
 -#line 1590 "Zend/zend_language_scanner.l"
++#line 1566 "Zend/zend_language_scanner.l"
                {
        yy_push_state(ST_IN_SCRIPTING);
        RETURN_TOKEN('{');
@@@ -2669,7 -2693,7 +2669,7 @@@ yy133
                ++YYCURSOR;
                YYDEBUG(134, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1577 "Zend/zend_language_scanner.l"
 -#line 1602 "Zend/zend_language_scanner.l"
++#line 1578 "Zend/zend_language_scanner.l"
                {
        RESET_DOC_COMMENT();
        if (!zend_stack_is_empty(&SCNG(state_stack))) {
@@@ -2705,7 -2729,7 +2705,7 @@@ yy135
  yy136:
                YYDEBUG(136, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1630 "Zend/zend_language_scanner.l"
 -#line 1655 "Zend/zend_language_scanner.l"
++#line 1631 "Zend/zend_language_scanner.l"
                {
        char *end;
        if (yyleng < MAX_LENGTH_OF_LONG - 1) { /* Won't overflow */
@@@ -2778,7 -2802,7 +2778,7 @@@ yy139
  yy140:
                YYDEBUG(140, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1882 "Zend/zend_language_scanner.l"
 -#line 1907 "Zend/zend_language_scanner.l"
++#line 1883 "Zend/zend_language_scanner.l"
                {
        while (YYCURSOR < YYLIMIT) {
                switch (*YYCURSOR++) {
@@@ -2814,7 -2838,7 +2814,7 @@@ yy141
  yy142:
                YYDEBUG(142, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1950 "Zend/zend_language_scanner.l"
 -#line 1975 "Zend/zend_language_scanner.l"
++#line 1951 "Zend/zend_language_scanner.l"
                {
        register char *s, *t;
        char *end;
@@@ -2889,7 -2913,7 +2889,7 @@@ yy143
  yy144:
                YYDEBUG(144, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 2019 "Zend/zend_language_scanner.l"
 -#line 2044 "Zend/zend_language_scanner.l"
++#line 2020 "Zend/zend_language_scanner.l"
                {
        int bprefix = (yytext[0] != '"') ? 1 : 0;
  
@@@ -2936,7 -2960,7 +2936,7 @@@ yy145
                ++YYCURSOR;
                YYDEBUG(146, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 2109 "Zend/zend_language_scanner.l"
 -#line 2134 "Zend/zend_language_scanner.l"
++#line 2110 "Zend/zend_language_scanner.l"
                {
        BEGIN(ST_BACKQUOTE);
        RETURN_TOKEN('`');
@@@ -2947,7 -2971,7 +2947,7 @@@ yy147
                ++YYCURSOR;
                YYDEBUG(148, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 2371 "Zend/zend_language_scanner.l"
 -#line 2396 "Zend/zend_language_scanner.l"
++#line 2372 "Zend/zend_language_scanner.l"
                {
        if (YYCURSOR > YYLIMIT) {
                RETURN_TOKEN(END);
@@@ -2983,7 -3007,7 +2983,7 @@@ yy151
  yy153:
                YYDEBUG(153, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1724 "Zend/zend_language_scanner.l"
 -#line 1749 "Zend/zend_language_scanner.l"
++#line 1725 "Zend/zend_language_scanner.l"
                {
        const char *end;
  
@@@ -3088,7 -3112,7 +3088,7 @@@ yy163
                }
                YYDEBUG(165, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1602 "Zend/zend_language_scanner.l"
 -#line 1627 "Zend/zend_language_scanner.l"
++#line 1603 "Zend/zend_language_scanner.l"
                {
        char *bin = yytext + 2; /* Skip "0b" */
        int len = yyleng - 2;
@@@ -3128,7 -3152,7 +3128,7 @@@ yy166
                }
                YYDEBUG(168, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1675 "Zend/zend_language_scanner.l"
 -#line 1700 "Zend/zend_language_scanner.l"
++#line 1676 "Zend/zend_language_scanner.l"
                {
        char *hex = yytext + 2; /* Skip "0x" */
        int len = yyleng - 2;
@@@ -3181,7 -3205,7 +3181,7 @@@ yy169
  yy171:
                YYDEBUG(171, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1853 "Zend/zend_language_scanner.l"
 -#line 1878 "Zend/zend_language_scanner.l"
++#line 1854 "Zend/zend_language_scanner.l"
                {
        zend_copy_value(zendlval, (yytext+1), (yyleng-1));
        RETURN_TOKEN(T_VARIABLE);
@@@ -3200,7 -3224,7 +3200,7 @@@ yy173
                }
                YYDEBUG(174, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1548 "Zend/zend_language_scanner.l"
 -#line 1573 "Zend/zend_language_scanner.l"
++#line 1549 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_LOGICAL_XOR);
  }
@@@ -3213,7 -3237,7 +3213,7 @@@ yy175
                }
                YYDEBUG(176, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1540 "Zend/zend_language_scanner.l"
 -#line 1565 "Zend/zend_language_scanner.l"
++#line 1541 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_LOGICAL_OR);
  }
@@@ -3223,7 -3247,7 +3223,7 @@@ yy177
                ++YYCURSOR;
                YYDEBUG(178, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1528 "Zend/zend_language_scanner.l"
 -#line 1553 "Zend/zend_language_scanner.l"
++#line 1529 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_XOR_EQUAL);
  }
@@@ -3233,7 -3257,7 +3233,7 @@@ yy179
                ++YYCURSOR;
                YYDEBUG(180, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1532 "Zend/zend_language_scanner.l"
 -#line 1557 "Zend/zend_language_scanner.l"
++#line 1533 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_BOOLEAN_OR);
  }
@@@ -3243,7 -3267,7 +3243,7 @@@ yy181
                ++YYCURSOR;
                YYDEBUG(182, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1524 "Zend/zend_language_scanner.l"
 -#line 1549 "Zend/zend_language_scanner.l"
++#line 1525 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_OR_EQUAL);
  }
@@@ -3253,7 -3277,7 +3253,7 @@@ yy183
                ++YYCURSOR;
                YYDEBUG(184, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1536 "Zend/zend_language_scanner.l"
 -#line 1561 "Zend/zend_language_scanner.l"
++#line 1537 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_BOOLEAN_AND);
  }
@@@ -3263,7 -3287,7 +3263,7 @@@ yy185
                ++YYCURSOR;
                YYDEBUG(186, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1520 "Zend/zend_language_scanner.l"
 -#line 1545 "Zend/zend_language_scanner.l"
++#line 1521 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_AND_EQUAL);
  }
@@@ -3273,7 -3297,7 +3273,7 @@@ yy187
                ++YYCURSOR;
                YYDEBUG(188, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1508 "Zend/zend_language_scanner.l"
 -#line 1533 "Zend/zend_language_scanner.l"
++#line 1509 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_MOD_EQUAL);
  }
@@@ -3286,7 -3310,7 +3286,7 @@@ yy189
  yy190:
                YYDEBUG(190, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1911 "Zend/zend_language_scanner.l"
 -#line 1936 "Zend/zend_language_scanner.l"
++#line 1912 "Zend/zend_language_scanner.l"
                {
        int doc_com;
  
@@@ -3329,7 -3353,7 +3329,7 @@@ yy192
                ++YYCURSOR;
                YYDEBUG(193, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1500 "Zend/zend_language_scanner.l"
 -#line 1525 "Zend/zend_language_scanner.l"
++#line 1501 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_DIV_EQUAL);
  }
@@@ -3357,7 -3381,7 +3357,7 @@@ yy197
                if ((yych = *YYCURSOR) == '=') goto yy201;
                YYDEBUG(198, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1492 "Zend/zend_language_scanner.l"
 -#line 1517 "Zend/zend_language_scanner.l"
++#line 1493 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_POW);
  }
@@@ -3367,7 -3391,7 +3367,7 @@@ yy199
                ++YYCURSOR;
                YYDEBUG(200, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1488 "Zend/zend_language_scanner.l"
 -#line 1513 "Zend/zend_language_scanner.l"
++#line 1489 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_MUL_EQUAL);
  }
@@@ -3377,7 -3401,7 +3377,7 @@@ yy201
                ++YYCURSOR;
                YYDEBUG(202, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1496 "Zend/zend_language_scanner.l"
 -#line 1521 "Zend/zend_language_scanner.l"
++#line 1497 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_POW_EQUAL);
  }
@@@ -3388,7 -3412,7 +3388,7 @@@ yy203
                if ((yych = *YYCURSOR) == '=') goto yy207;
                YYDEBUG(204, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1556 "Zend/zend_language_scanner.l"
 -#line 1581 "Zend/zend_language_scanner.l"
++#line 1557 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_SR);
  }
@@@ -3398,7 -3422,7 +3398,7 @@@ yy205
                ++YYCURSOR;
                YYDEBUG(206, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1476 "Zend/zend_language_scanner.l"
 -#line 1501 "Zend/zend_language_scanner.l"
++#line 1477 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_IS_GREATER_OR_EQUAL);
  }
@@@ -3408,7 -3432,7 +3408,7 @@@ yy207
                ++YYCURSOR;
                YYDEBUG(208, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1516 "Zend/zend_language_scanner.l"
 -#line 1541 "Zend/zend_language_scanner.l"
++#line 1517 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_SR_EQUAL);
  }
@@@ -3423,7 -3447,7 +3423,7 @@@ yy209
  yy210:
                YYDEBUG(210, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1552 "Zend/zend_language_scanner.l"
 -#line 1577 "Zend/zend_language_scanner.l"
++#line 1553 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_SL);
  }
@@@ -3434,7 -3458,7 +3434,7 @@@ yy211
                if ((yych = *YYCURSOR) == '>') goto yy215;
                YYDEBUG(212, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1472 "Zend/zend_language_scanner.l"
 -#line 1497 "Zend/zend_language_scanner.l"
++#line 1473 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_IS_SMALLER_OR_EQUAL);
  }
@@@ -3445,7 -3469,7 +3445,7 @@@ yy213
  yy214:
                YYDEBUG(214, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1464 "Zend/zend_language_scanner.l"
 -#line 1489 "Zend/zend_language_scanner.l"
++#line 1465 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_IS_NOT_EQUAL);
  }
@@@ -3455,7 -3479,7 +3455,7 @@@ yy215
                ++YYCURSOR;
                YYDEBUG(216, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1468 "Zend/zend_language_scanner.l"
 -#line 1493 "Zend/zend_language_scanner.l"
++#line 1469 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_SPACESHIP);
  }
@@@ -3465,7 -3489,7 +3465,7 @@@ yy217
                ++YYCURSOR;
                YYDEBUG(218, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1512 "Zend/zend_language_scanner.l"
 -#line 1537 "Zend/zend_language_scanner.l"
++#line 1513 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_SL_EQUAL);
  }
@@@ -3574,7 -3598,7 +3574,7 @@@ yy228
  yy229:
                YYDEBUG(229, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 2061 "Zend/zend_language_scanner.l"
 -#line 2086 "Zend/zend_language_scanner.l"
++#line 2062 "Zend/zend_language_scanner.l"
                {
        char *s;
        int bprefix = (yytext[0] != '<') ? 1 : 0;
@@@ -3661,7 -3685,7 +3661,7 @@@ yy233
                ++YYCURSOR;
                YYDEBUG(235, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1456 "Zend/zend_language_scanner.l"
 -#line 1481 "Zend/zend_language_scanner.l"
++#line 1457 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_IS_NOT_IDENTICAL);
  }
@@@ -3671,7 -3695,7 +3671,7 @@@ yy236
                ++YYCURSOR;
                YYDEBUG(237, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1480 "Zend/zend_language_scanner.l"
 -#line 1505 "Zend/zend_language_scanner.l"
++#line 1481 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_PLUS_EQUAL);
  }
@@@ -3681,7 -3705,7 +3681,7 @@@ yy238
                ++YYCURSOR;
                YYDEBUG(239, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1444 "Zend/zend_language_scanner.l"
 -#line 1469 "Zend/zend_language_scanner.l"
++#line 1445 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_INC);
  }
@@@ -3704,7 -3728,7 +3704,7 @@@ yy242
                }
                YYDEBUG(243, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1432 "Zend/zend_language_scanner.l"
 -#line 1457 "Zend/zend_language_scanner.l"
++#line 1433 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_LIST);
  }
@@@ -3715,7 -3739,7 +3715,7 @@@ yy244
                if ((yych = *YYCURSOR) == '=') goto yy248;
                YYDEBUG(245, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1460 "Zend/zend_language_scanner.l"
 -#line 1485 "Zend/zend_language_scanner.l"
++#line 1461 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_IS_EQUAL);
  }
@@@ -3725,7 -3749,7 +3725,7 @@@ yy246
                ++YYCURSOR;
                YYDEBUG(247, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1428 "Zend/zend_language_scanner.l"
 -#line 1453 "Zend/zend_language_scanner.l"
++#line 1429 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_DOUBLE_ARROW);
  }
@@@ -3735,7 -3759,7 +3735,7 @@@ yy248
                ++YYCURSOR;
                YYDEBUG(249, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1452 "Zend/zend_language_scanner.l"
 -#line 1477 "Zend/zend_language_scanner.l"
++#line 1453 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_IS_IDENTICAL);
  }
@@@ -3869,7 -3893,7 +3869,7 @@@ yy266
                }
                YYDEBUG(269, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1761 "Zend/zend_language_scanner.l"
 -#line 1786 "Zend/zend_language_scanner.l"
++#line 1762 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_NS_C);
  }
@@@ -3893,7 -3917,7 +3893,7 @@@ yy271
                }
                YYDEBUG(274, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1757 "Zend/zend_language_scanner.l"
 -#line 1782 "Zend/zend_language_scanner.l"
++#line 1758 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_DIR);
  }
@@@ -3922,7 -3946,7 +3922,7 @@@ yy277
                }
                YYDEBUG(280, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1749 "Zend/zend_language_scanner.l"
 -#line 1774 "Zend/zend_language_scanner.l"
++#line 1750 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_LINE);
  }
@@@ -3961,7 -3985,7 +3961,7 @@@ yy285
                }
                YYDEBUG(288, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1745 "Zend/zend_language_scanner.l"
 -#line 1770 "Zend/zend_language_scanner.l"
++#line 1746 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_METHOD_C);
  }
@@@ -4016,7 -4040,7 +4016,7 @@@ yy296
                }
                YYDEBUG(299, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1741 "Zend/zend_language_scanner.l"
 -#line 1766 "Zend/zend_language_scanner.l"
++#line 1742 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_FUNC_C);
  }
@@@ -4040,7 -4064,7 +4040,7 @@@ yy301
                }
                YYDEBUG(304, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1753 "Zend/zend_language_scanner.l"
 -#line 1778 "Zend/zend_language_scanner.l"
++#line 1754 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_FILE);
  }
@@@ -4074,7 -4098,7 +4074,7 @@@ yy308
                }
                YYDEBUG(311, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1737 "Zend/zend_language_scanner.l"
 -#line 1762 "Zend/zend_language_scanner.l"
++#line 1738 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_TRAIT_C);
  }
@@@ -4108,7 -4132,7 +4108,7 @@@ yy315
                }
                YYDEBUG(318, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1733 "Zend/zend_language_scanner.l"
 -#line 1758 "Zend/zend_language_scanner.l"
++#line 1734 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_CLASS_C);
  }
@@@ -4174,7 -4198,7 +4174,7 @@@ yy330
                }
                YYDEBUG(331, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1396 "Zend/zend_language_scanner.l"
 -#line 1421 "Zend/zend_language_scanner.l"
++#line 1397 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_HALT_COMPILER);
  }
@@@ -4198,7 -4222,7 +4198,7 @@@ yy334
                }
                YYDEBUG(335, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1376 "Zend/zend_language_scanner.l"
 -#line 1401 "Zend/zend_language_scanner.l"
++#line 1377 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_USE);
  }
@@@ -4221,7 -4245,7 +4221,7 @@@ yy338
                }
                YYDEBUG(339, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1424 "Zend/zend_language_scanner.l"
 -#line 1449 "Zend/zend_language_scanner.l"
++#line 1425 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_UNSET);
  }
@@@ -4397,7 -4421,7 +4397,7 @@@ yy355
                ++YYCURSOR;
                YYDEBUG(357, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1324 "Zend/zend_language_scanner.l"
 -#line 1349 "Zend/zend_language_scanner.l"
++#line 1325 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_INT_CAST);
  }
@@@ -4445,7 -4469,7 +4445,7 @@@ yy363
                ++YYCURSOR;
                YYDEBUG(366, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1328 "Zend/zend_language_scanner.l"
 -#line 1353 "Zend/zend_language_scanner.l"
++#line 1329 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_DOUBLE_CAST);
  }
@@@ -4519,7 -4543,7 +4519,7 @@@ yy377
                ++YYCURSOR;
                YYDEBUG(380, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1332 "Zend/zend_language_scanner.l"
 -#line 1357 "Zend/zend_language_scanner.l"
++#line 1333 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_STRING_CAST);
  }
@@@ -4556,7 -4580,7 +4556,7 @@@ yy384
                ++YYCURSOR;
                YYDEBUG(387, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1336 "Zend/zend_language_scanner.l"
 -#line 1361 "Zend/zend_language_scanner.l"
++#line 1337 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_ARRAY_CAST);
  }
@@@ -4598,7 -4622,7 +4598,7 @@@ yy392
                ++YYCURSOR;
                YYDEBUG(395, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1340 "Zend/zend_language_scanner.l"
 -#line 1365 "Zend/zend_language_scanner.l"
++#line 1341 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_OBJECT_CAST);
  }
@@@ -4643,7 -4667,7 +4643,7 @@@ yy401
                ++YYCURSOR;
                YYDEBUG(403, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1344 "Zend/zend_language_scanner.l"
 -#line 1369 "Zend/zend_language_scanner.l"
++#line 1345 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_BOOL_CAST);
  }
@@@ -4707,7 -4731,7 +4707,7 @@@ yy412
                ++YYCURSOR;
                YYDEBUG(415, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1348 "Zend/zend_language_scanner.l"
 -#line 1373 "Zend/zend_language_scanner.l"
++#line 1349 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_UNSET_CAST);
  }
@@@ -4725,7 -4749,7 +4725,7 @@@ yy417
                }
                YYDEBUG(418, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1320 "Zend/zend_language_scanner.l"
 -#line 1345 "Zend/zend_language_scanner.l"
++#line 1321 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_VAR);
  }
@@@ -4749,7 -4773,7 +4749,7 @@@ yy421
                }
                YYDEBUG(422, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1312 "Zend/zend_language_scanner.l"
 -#line 1337 "Zend/zend_language_scanner.l"
++#line 1313 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_NEW);
  }
@@@ -4792,7 -4816,7 +4792,7 @@@ yy429
                }
                YYDEBUG(430, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1372 "Zend/zend_language_scanner.l"
 -#line 1397 "Zend/zend_language_scanner.l"
++#line 1373 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_NAMESPACE);
  }
@@@ -4805,7 -4829,7 +4805,7 @@@ yy431
  yy432:
                YYDEBUG(432, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1944 "Zend/zend_language_scanner.l"
 -#line 1969 "Zend/zend_language_scanner.l"
++#line 1945 "Zend/zend_language_scanner.l"
                {
        BEGIN(INITIAL);
        RETURN_TOKEN(T_CLOSE_TAG);  /* implicit ';' at php-end tag */
@@@ -4816,7 -4840,7 +4816,7 @@@ yy433
                ++YYCURSOR;
                YYDEBUG(434, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1308 "Zend/zend_language_scanner.l"
 -#line 1333 "Zend/zend_language_scanner.l"
++#line 1309 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_COALESCE);
  }
@@@ -4851,7 -4875,7 +4851,7 @@@ yy439
                ++YYCURSOR;
                YYDEBUG(440, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1504 "Zend/zend_language_scanner.l"
 -#line 1529 "Zend/zend_language_scanner.l"
++#line 1505 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_CONCAT_EQUAL);
  }
@@@ -4864,7 -4888,7 +4864,7 @@@ yy441
                ++YYCURSOR;
                YYDEBUG(443, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1304 "Zend/zend_language_scanner.l"
 -#line 1329 "Zend/zend_language_scanner.l"
++#line 1305 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_ELLIPSIS);
  }
@@@ -4874,7 -4898,7 +4874,7 @@@ yy444
                ++YYCURSOR;
                YYDEBUG(445, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1296 "Zend/zend_language_scanner.l"
 -#line 1321 "Zend/zend_language_scanner.l"
++#line 1297 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_PAAMAYIM_NEKUDOTAYIM);
  }
@@@ -4900,7 -4924,7 +4900,7 @@@ yy448
                ++YYCURSOR;
                YYDEBUG(449, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1484 "Zend/zend_language_scanner.l"
 -#line 1509 "Zend/zend_language_scanner.l"
++#line 1485 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_MINUS_EQUAL);
  }
@@@ -4910,7 -4934,7 +4910,7 @@@ yy450
                ++YYCURSOR;
                YYDEBUG(451, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1448 "Zend/zend_language_scanner.l"
 -#line 1473 "Zend/zend_language_scanner.l"
++#line 1449 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_DEC);
  }
@@@ -4920,7 -4944,7 +4920,7 @@@ yy452
                ++YYCURSOR;
                YYDEBUG(453, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1270 "Zend/zend_language_scanner.l"
 -#line 1295 "Zend/zend_language_scanner.l"
++#line 1271 "Zend/zend_language_scanner.l"
                {
        yy_push_state(ST_LOOKING_FOR_PROPERTY);
        RETURN_TOKEN(T_OBJECT_OPERATOR);
@@@ -4970,7 -4994,7 +4970,7 @@@ yy459
                }
                YYDEBUG(460, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1420 "Zend/zend_language_scanner.l"
 -#line 1445 "Zend/zend_language_scanner.l"
++#line 1421 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_PUBLIC);
  }
@@@ -5029,7 -5053,7 +5029,7 @@@ yy468
                }
                YYDEBUG(469, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1416 "Zend/zend_language_scanner.l"
 -#line 1441 "Zend/zend_language_scanner.l"
++#line 1417 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_PROTECTED);
  }
@@@ -5063,7 -5087,7 +5063,7 @@@ yy474
                }
                YYDEBUG(475, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1412 "Zend/zend_language_scanner.l"
 -#line 1437 "Zend/zend_language_scanner.l"
++#line 1413 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_PRIVATE);
  }
@@@ -5076,7 -5100,7 +5076,7 @@@ yy476
                }
                YYDEBUG(477, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1246 "Zend/zend_language_scanner.l"
 -#line 1271 "Zend/zend_language_scanner.l"
++#line 1247 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_PRINT);
  }
@@@ -5105,7 -5129,7 +5105,7 @@@ yy481
                }
                YYDEBUG(482, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1238 "Zend/zend_language_scanner.l"
 -#line 1263 "Zend/zend_language_scanner.l"
++#line 1239 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_GOTO);
  }
@@@ -5133,7 -5157,7 +5133,7 @@@ yy486
                }
                YYDEBUG(487, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1384 "Zend/zend_language_scanner.l"
 -#line 1409 "Zend/zend_language_scanner.l"
++#line 1385 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_GLOBAL);
  }
@@@ -5174,7 -5198,7 +5174,7 @@@ yy494
                }
                YYDEBUG(495, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1230 "Zend/zend_language_scanner.l"
 -#line 1255 "Zend/zend_language_scanner.l"
++#line 1231 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_BREAK);
  }
@@@ -5218,7 -5242,7 +5218,7 @@@ yy502
                }
                YYDEBUG(503, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1214 "Zend/zend_language_scanner.l"
 -#line 1239 "Zend/zend_language_scanner.l"
++#line 1215 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_SWITCH);
  }
@@@ -5246,7 -5270,7 +5246,7 @@@ yy507
                }
                YYDEBUG(508, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1400 "Zend/zend_language_scanner.l"
 -#line 1425 "Zend/zend_language_scanner.l"
++#line 1401 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_STATIC);
  }
@@@ -5277,7 -5301,7 +5277,7 @@@ yy512
                }
                YYDEBUG(513, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1210 "Zend/zend_language_scanner.l"
 -#line 1235 "Zend/zend_language_scanner.l"
++#line 1211 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_AS);
  }
@@@ -5300,7 -5324,7 +5300,7 @@@ yy516
                }
                YYDEBUG(517, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1436 "Zend/zend_language_scanner.l"
 -#line 1461 "Zend/zend_language_scanner.l"
++#line 1437 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_ARRAY);
  }
@@@ -5313,7 -5337,7 +5313,7 @@@ yy518
                }
                YYDEBUG(519, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1544 "Zend/zend_language_scanner.l"
 -#line 1569 "Zend/zend_language_scanner.l"
++#line 1545 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_LOGICAL_AND);
  }
@@@ -5351,7 -5375,7 +5351,7 @@@ yy525
                }
                YYDEBUG(526, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1404 "Zend/zend_language_scanner.l"
 -#line 1429 "Zend/zend_language_scanner.l"
++#line 1405 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_ABSTRACT);
  }
@@@ -5379,7 -5403,7 +5379,7 @@@ yy530
                }
                YYDEBUG(531, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1170 "Zend/zend_language_scanner.l"
 -#line 1195 "Zend/zend_language_scanner.l"
++#line 1171 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_WHILE);
  }
@@@ -5392,7 -5416,7 +5392,7 @@@ yy532
                }
                YYDEBUG(533, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1154 "Zend/zend_language_scanner.l"
 -#line 1179 "Zend/zend_language_scanner.l"
++#line 1155 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_IF);
  }
@@@ -5448,7 -5472,7 +5448,7 @@@ yy539
                }
                YYDEBUG(540, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1388 "Zend/zend_language_scanner.l"
 -#line 1413 "Zend/zend_language_scanner.l"
++#line 1389 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_ISSET);
  }
@@@ -5506,7 -5530,7 +5506,7 @@@ yy547
  yy548:
                YYDEBUG(548, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1356 "Zend/zend_language_scanner.l"
 -#line 1381 "Zend/zend_language_scanner.l"
++#line 1357 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_INCLUDE);
  }
@@@ -5539,7 -5563,7 +5539,7 @@@ yy553
                }
                YYDEBUG(554, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1360 "Zend/zend_language_scanner.l"
 -#line 1385 "Zend/zend_language_scanner.l"
++#line 1361 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_INCLUDE_ONCE);
  }
@@@ -5577,7 -5601,7 +5577,7 @@@ yy560
                }
                YYDEBUG(561, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1254 "Zend/zend_language_scanner.l"
 -#line 1279 "Zend/zend_language_scanner.l"
++#line 1255 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_INTERFACE);
  }
@@@ -5631,7 -5655,7 +5631,7 @@@ yy568
                }
                YYDEBUG(569, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1380 "Zend/zend_language_scanner.l"
 -#line 1405 "Zend/zend_language_scanner.l"
++#line 1381 "Zend/zend_language_scanner.l"
                {
      RETURN_TOKEN(T_INSTEADOF);
  }
@@@ -5664,7 -5688,7 +5664,7 @@@ yy574
                }
                YYDEBUG(575, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1206 "Zend/zend_language_scanner.l"
 -#line 1231 "Zend/zend_language_scanner.l"
++#line 1207 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_INSTANCEOF);
  }
@@@ -5712,7 -5736,7 +5712,7 @@@ yy583
                }
                YYDEBUG(584, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1266 "Zend/zend_language_scanner.l"
 -#line 1291 "Zend/zend_language_scanner.l"
++#line 1267 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_IMPLEMENTS);
  }
@@@ -5744,7 -5768,7 +5744,7 @@@ yy586
                }
                YYDEBUG(588, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1138 "Zend/zend_language_scanner.l"
 -#line 1163 "Zend/zend_language_scanner.l"
++#line 1139 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_TRY);
  }
@@@ -5767,7 -5791,7 +5767,7 @@@ yy591
                }
                YYDEBUG(592, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1258 "Zend/zend_language_scanner.l"
 -#line 1283 "Zend/zend_language_scanner.l"
++#line 1259 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_TRAIT);
  }
@@@ -5790,7 -5814,7 +5790,7 @@@ yy595
                }
                YYDEBUG(596, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1150 "Zend/zend_language_scanner.l"
 -#line 1175 "Zend/zend_language_scanner.l"
++#line 1151 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_THROW);
  }
@@@ -5827,7 -5851,7 +5827,7 @@@ yy600
  yy601:
                YYDEBUG(601, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1134 "Zend/zend_language_scanner.l"
 -#line 1159 "Zend/zend_language_scanner.l"
++#line 1135 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_YIELD);
  }
@@@ -5873,11 -5897,12 +5873,12 @@@ yy607
                ++YYCURSOR;
                YYDEBUG(608, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 -#line 1154 "Zend/zend_language_scanner.l"
 +#line 1130 "Zend/zend_language_scanner.l"
                {
+       HANDLE_NEWLINES(yytext, yyleng);
        RETURN_TOKEN(T_YIELD_FROM);
  }
- #line 5881 "Zend/zend_language_scanner.c"
 -#line 5906 "Zend/zend_language_scanner.c"
++#line 5882 "Zend/zend_language_scanner.c"
  yy609:
                YYDEBUG(609, *YYCURSOR);
                yych = *++YYCURSOR;
@@@ -5938,11 -5963,11 +5939,11 @@@ yy615
  yy616:
                YYDEBUG(616, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1364 "Zend/zend_language_scanner.l"
 -#line 1389 "Zend/zend_language_scanner.l"
++#line 1365 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_REQUIRE);
  }
- #line 5946 "Zend/zend_language_scanner.c"
 -#line 5971 "Zend/zend_language_scanner.c"
++#line 5947 "Zend/zend_language_scanner.c"
  yy617:
                YYDEBUG(617, *YYCURSOR);
                yych = *++YYCURSOR;
@@@ -5971,11 -5996,11 +5972,11 @@@ yy621
                }
                YYDEBUG(622, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1368 "Zend/zend_language_scanner.l"
 -#line 1393 "Zend/zend_language_scanner.l"
++#line 1369 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_REQUIRE_ONCE);
  }
- #line 5979 "Zend/zend_language_scanner.c"
 -#line 6004 "Zend/zend_language_scanner.c"
++#line 5980 "Zend/zend_language_scanner.c"
  yy623:
                YYDEBUG(623, *YYCURSOR);
                yych = *++YYCURSOR;
@@@ -5998,7 -6023,7 +5999,7 @@@ yy625
                {
        RETURN_TOKEN(T_RETURN);
  }
- #line 6002 "Zend/zend_language_scanner.c"
 -#line 6027 "Zend/zend_language_scanner.c"
++#line 6003 "Zend/zend_language_scanner.c"
  yy627:
                YYDEBUG(627, *YYCURSOR);
                yych = *++YYCURSOR;
@@@ -6088,11 -6113,11 +6089,11 @@@ yy636
                }
                YYDEBUG(637, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1234 "Zend/zend_language_scanner.l"
 -#line 1259 "Zend/zend_language_scanner.l"
++#line 1235 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_CONTINUE);
  }
- #line 6096 "Zend/zend_language_scanner.c"
 -#line 6121 "Zend/zend_language_scanner.c"
++#line 6097 "Zend/zend_language_scanner.c"
  yy638:
                YYDEBUG(638, *YYCURSOR);
                ++YYCURSOR;
@@@ -6105,7 -6130,7 +6106,7 @@@
                {
        RETURN_TOKEN(T_CONST);
  }
- #line 6109 "Zend/zend_language_scanner.c"
 -#line 6134 "Zend/zend_language_scanner.c"
++#line 6110 "Zend/zend_language_scanner.c"
  yy640:
                YYDEBUG(640, *YYCURSOR);
                yych = *++YYCURSOR;
@@@ -6130,11 -6155,11 +6131,11 @@@ yy643
                }
                YYDEBUG(644, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1316 "Zend/zend_language_scanner.l"
 -#line 1341 "Zend/zend_language_scanner.l"
++#line 1317 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_CLONE);
  }
- #line 6138 "Zend/zend_language_scanner.c"
 -#line 6163 "Zend/zend_language_scanner.c"
++#line 6139 "Zend/zend_language_scanner.c"
  yy645:
                YYDEBUG(645, *YYCURSOR);
                yych = *++YYCURSOR;
@@@ -6148,11 -6173,11 +6149,11 @@@ yy646
                }
                YYDEBUG(647, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1250 "Zend/zend_language_scanner.l"
 -#line 1275 "Zend/zend_language_scanner.l"
++#line 1251 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_CLASS);
  }
- #line 6156 "Zend/zend_language_scanner.c"
 -#line 6181 "Zend/zend_language_scanner.c"
++#line 6157 "Zend/zend_language_scanner.c"
  yy648:
                YYDEBUG(648, *YYCURSOR);
                yych = *++YYCURSOR;
@@@ -6198,11 -6223,11 +6199,11 @@@ yy655
                }
                YYDEBUG(656, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1440 "Zend/zend_language_scanner.l"
 -#line 1465 "Zend/zend_language_scanner.l"
++#line 1441 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_CALLABLE);
  }
- #line 6206 "Zend/zend_language_scanner.c"
 -#line 6231 "Zend/zend_language_scanner.c"
++#line 6207 "Zend/zend_language_scanner.c"
  yy657:
                YYDEBUG(657, *YYCURSOR);
                ++YYCURSOR;
@@@ -6211,11 -6236,11 +6212,11 @@@
                }
                YYDEBUG(658, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1222 "Zend/zend_language_scanner.l"
 -#line 1247 "Zend/zend_language_scanner.l"
++#line 1223 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_CASE);
  }
- #line 6219 "Zend/zend_language_scanner.c"
 -#line 6244 "Zend/zend_language_scanner.c"
++#line 6220 "Zend/zend_language_scanner.c"
  yy659:
                YYDEBUG(659, *YYCURSOR);
                yych = *++YYCURSOR;
@@@ -6229,11 -6254,11 +6230,11 @@@ yy660
                }
                YYDEBUG(661, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1142 "Zend/zend_language_scanner.l"
 -#line 1167 "Zend/zend_language_scanner.l"
++#line 1143 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_CATCH);
  }
- #line 6237 "Zend/zend_language_scanner.c"
 -#line 6262 "Zend/zend_language_scanner.c"
++#line 6238 "Zend/zend_language_scanner.c"
  yy662:
                YYDEBUG(662, *YYCURSOR);
                yych = *++YYCURSOR;
@@@ -6288,7 -6313,7 +6289,7 @@@ yy670
                {
        RETURN_TOKEN(T_FUNCTION);
  }
- #line 6292 "Zend/zend_language_scanner.c"
 -#line 6317 "Zend/zend_language_scanner.c"
++#line 6293 "Zend/zend_language_scanner.c"
  yy672:
                YYDEBUG(672, *YYCURSOR);
                ++YYCURSOR;
@@@ -6312,11 -6337,11 +6313,11 @@@
  yy673:
                YYDEBUG(673, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1182 "Zend/zend_language_scanner.l"
 -#line 1207 "Zend/zend_language_scanner.l"
++#line 1183 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_FOR);
  }
- #line 6320 "Zend/zend_language_scanner.c"
 -#line 6345 "Zend/zend_language_scanner.c"
++#line 6321 "Zend/zend_language_scanner.c"
  yy674:
                YYDEBUG(674, *YYCURSOR);
                yych = *++YYCURSOR;
@@@ -6340,11 -6365,11 +6341,11 @@@ yy677
                }
                YYDEBUG(678, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1190 "Zend/zend_language_scanner.l"
 -#line 1215 "Zend/zend_language_scanner.l"
++#line 1191 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_FOREACH);
  }
- #line 6348 "Zend/zend_language_scanner.c"
 -#line 6373 "Zend/zend_language_scanner.c"
++#line 6349 "Zend/zend_language_scanner.c"
  yy679:
                YYDEBUG(679, *YYCURSOR);
                yych = *++YYCURSOR;
@@@ -6378,11 -6403,11 +6379,11 @@@ yy681
  yy682:
                YYDEBUG(682, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1408 "Zend/zend_language_scanner.l"
 -#line 1433 "Zend/zend_language_scanner.l"
++#line 1409 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_FINAL);
  }
- #line 6386 "Zend/zend_language_scanner.c"
 -#line 6411 "Zend/zend_language_scanner.c"
++#line 6387 "Zend/zend_language_scanner.c"
  yy683:
                YYDEBUG(683, *YYCURSOR);
                yych = *++YYCURSOR;
@@@ -6396,11 -6421,11 +6397,11 @@@ yy684
                }
                YYDEBUG(685, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1146 "Zend/zend_language_scanner.l"
 -#line 1171 "Zend/zend_language_scanner.l"
++#line 1147 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_FINALLY);
  }
- #line 6404 "Zend/zend_language_scanner.c"
 -#line 6429 "Zend/zend_language_scanner.c"
++#line 6405 "Zend/zend_language_scanner.c"
  yy686:
                YYDEBUG(686, *YYCURSOR);
                yych = *++YYCURSOR;
@@@ -6431,11 -6456,11 +6432,11 @@@ yy688
                }
                YYDEBUG(689, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1178 "Zend/zend_language_scanner.l"
 -#line 1203 "Zend/zend_language_scanner.l"
++#line 1179 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_DO);
  }
- #line 6439 "Zend/zend_language_scanner.c"
 -#line 6464 "Zend/zend_language_scanner.c"
++#line 6440 "Zend/zend_language_scanner.c"
  yy690:
                YYDEBUG(690, *YYCURSOR);
                ++YYCURSOR;
@@@ -6448,7 -6473,7 +6449,7 @@@
                {
        RETURN_TOKEN(T_EXIT);
  }
- #line 6452 "Zend/zend_language_scanner.c"
 -#line 6477 "Zend/zend_language_scanner.c"
++#line 6453 "Zend/zend_language_scanner.c"
  yy692:
                YYDEBUG(692, *YYCURSOR);
                yych = *++YYCURSOR;
@@@ -6483,11 -6508,11 +6484,11 @@@ yy697
                }
                YYDEBUG(698, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1226 "Zend/zend_language_scanner.l"
 -#line 1251 "Zend/zend_language_scanner.l"
++#line 1227 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_DEFAULT);
  }
- #line 6491 "Zend/zend_language_scanner.c"
 -#line 6516 "Zend/zend_language_scanner.c"
++#line 6492 "Zend/zend_language_scanner.c"
  yy699:
                YYDEBUG(699, *YYCURSOR);
                yych = *++YYCURSOR;
@@@ -6511,11 -6536,11 +6512,11 @@@ yy702
                }
                YYDEBUG(703, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1198 "Zend/zend_language_scanner.l"
 -#line 1223 "Zend/zend_language_scanner.l"
++#line 1199 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_DECLARE);
  }
- #line 6519 "Zend/zend_language_scanner.c"
 -#line 6544 "Zend/zend_language_scanner.c"
++#line 6520 "Zend/zend_language_scanner.c"
  yy704:
                YYDEBUG(704, *YYCURSOR);
                yych = *++YYCURSOR;
@@@ -6595,11 -6620,11 +6596,11 @@@ yy715
                }
                YYDEBUG(716, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1262 "Zend/zend_language_scanner.l"
 -#line 1287 "Zend/zend_language_scanner.l"
++#line 1263 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_EXTENDS);
  }
- #line 6603 "Zend/zend_language_scanner.c"
 -#line 6628 "Zend/zend_language_scanner.c"
++#line 6604 "Zend/zend_language_scanner.c"
  yy717:
                YYDEBUG(717, *YYCURSOR);
                ++YYCURSOR;
@@@ -6612,7 -6637,7 +6613,7 @@@
                {
        RETURN_TOKEN(T_EXIT);
  }
- #line 6616 "Zend/zend_language_scanner.c"
 -#line 6641 "Zend/zend_language_scanner.c"
++#line 6617 "Zend/zend_language_scanner.c"
  yy719:
                YYDEBUG(719, *YYCURSOR);
                yych = *++YYCURSOR;
@@@ -6626,11 -6651,11 +6627,11 @@@ yy720
                }
                YYDEBUG(721, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1352 "Zend/zend_language_scanner.l"
 -#line 1377 "Zend/zend_language_scanner.l"
++#line 1353 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_EVAL);
  }
- #line 6634 "Zend/zend_language_scanner.c"
 -#line 6659 "Zend/zend_language_scanner.c"
++#line 6635 "Zend/zend_language_scanner.c"
  yy722:
                YYDEBUG(722, *YYCURSOR);
                yych = *++YYCURSOR;
@@@ -6700,11 -6725,11 +6701,11 @@@ yy731
                }
                YYDEBUG(732, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1174 "Zend/zend_language_scanner.l"
 -#line 1199 "Zend/zend_language_scanner.l"
++#line 1175 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_ENDWHILE);
  }
- #line 6708 "Zend/zend_language_scanner.c"
 -#line 6733 "Zend/zend_language_scanner.c"
++#line 6709 "Zend/zend_language_scanner.c"
  yy733:
                YYDEBUG(733, *YYCURSOR);
                yych = *++YYCURSOR;
@@@ -6733,11 -6758,11 +6734,11 @@@ yy737
                }
                YYDEBUG(738, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1218 "Zend/zend_language_scanner.l"
 -#line 1243 "Zend/zend_language_scanner.l"
++#line 1219 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_ENDSWITCH);
  }
- #line 6741 "Zend/zend_language_scanner.c"
 -#line 6766 "Zend/zend_language_scanner.c"
++#line 6742 "Zend/zend_language_scanner.c"
  yy739:
                YYDEBUG(739, *YYCURSOR);
                ++YYCURSOR;
@@@ -6746,11 -6771,11 +6747,11 @@@
                }
                YYDEBUG(740, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1162 "Zend/zend_language_scanner.l"
 -#line 1187 "Zend/zend_language_scanner.l"
++#line 1163 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_ENDIF);
  }
- #line 6754 "Zend/zend_language_scanner.c"
 -#line 6779 "Zend/zend_language_scanner.c"
++#line 6755 "Zend/zend_language_scanner.c"
  yy741:
                YYDEBUG(741, *YYCURSOR);
                yych = *++YYCURSOR;
@@@ -6779,11 -6804,11 +6780,11 @@@ yy742
  yy743:
                YYDEBUG(743, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1186 "Zend/zend_language_scanner.l"
 -#line 1211 "Zend/zend_language_scanner.l"
++#line 1187 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_ENDFOR);
  }
- #line 6787 "Zend/zend_language_scanner.c"
 -#line 6812 "Zend/zend_language_scanner.c"
++#line 6788 "Zend/zend_language_scanner.c"
  yy744:
                YYDEBUG(744, *YYCURSOR);
                yych = *++YYCURSOR;
@@@ -6807,11 -6832,11 +6808,11 @@@ yy747
                }
                YYDEBUG(748, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1194 "Zend/zend_language_scanner.l"
 -#line 1219 "Zend/zend_language_scanner.l"
++#line 1195 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_ENDFOREACH);
  }
- #line 6815 "Zend/zend_language_scanner.c"
 -#line 6840 "Zend/zend_language_scanner.c"
++#line 6816 "Zend/zend_language_scanner.c"
  yy749:
                YYDEBUG(749, *YYCURSOR);
                yych = *++YYCURSOR;
@@@ -6845,11 -6870,11 +6846,11 @@@ yy754
                }
                YYDEBUG(755, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1202 "Zend/zend_language_scanner.l"
 -#line 1227 "Zend/zend_language_scanner.l"
++#line 1203 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_ENDDECLARE);
  }
- #line 6853 "Zend/zend_language_scanner.c"
 -#line 6878 "Zend/zend_language_scanner.c"
++#line 6854 "Zend/zend_language_scanner.c"
  yy756:
                YYDEBUG(756, *YYCURSOR);
                yych = *++YYCURSOR;
@@@ -6868,11 -6893,11 +6869,11 @@@ yy758
                }
                YYDEBUG(759, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1392 "Zend/zend_language_scanner.l"
 -#line 1417 "Zend/zend_language_scanner.l"
++#line 1393 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_EMPTY);
  }
- #line 6876 "Zend/zend_language_scanner.c"
 -#line 6901 "Zend/zend_language_scanner.c"
++#line 6877 "Zend/zend_language_scanner.c"
  yy760:
                YYDEBUG(760, *YYCURSOR);
                yych = *++YYCURSOR;
@@@ -6901,11 -6926,11 +6902,11 @@@ yy761
  yy762:
                YYDEBUG(762, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1166 "Zend/zend_language_scanner.l"
 -#line 1191 "Zend/zend_language_scanner.l"
++#line 1167 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_ELSE);
  }
- #line 6909 "Zend/zend_language_scanner.c"
 -#line 6934 "Zend/zend_language_scanner.c"
++#line 6910 "Zend/zend_language_scanner.c"
  yy763:
                YYDEBUG(763, *YYCURSOR);
                yych = *++YYCURSOR;
@@@ -6919,11 -6944,11 +6920,11 @@@ yy764
                }
                YYDEBUG(765, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1158 "Zend/zend_language_scanner.l"
 -#line 1183 "Zend/zend_language_scanner.l"
++#line 1159 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_ELSEIF);
  }
- #line 6927 "Zend/zend_language_scanner.c"
 -#line 6952 "Zend/zend_language_scanner.c"
++#line 6928 "Zend/zend_language_scanner.c"
  yy766:
                YYDEBUG(766, *YYCURSOR);
                yych = *++YYCURSOR;
@@@ -6937,11 -6962,11 +6938,11 @@@ yy767
                }
                YYDEBUG(768, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1242 "Zend/zend_language_scanner.l"
 -#line 1267 "Zend/zend_language_scanner.l"
++#line 1243 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_ECHO);
  }
- #line 6945 "Zend/zend_language_scanner.c"
 -#line 6970 "Zend/zend_language_scanner.c"
++#line 6946 "Zend/zend_language_scanner.c"
        }
  /* *********************************** */
  yyc_ST_LOOKING_FOR_PROPERTY:
@@@ -7014,12 -7039,12 +7015,12 @@@ yy771
  yy772:
                YYDEBUG(772, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1275 "Zend/zend_language_scanner.l"
 -#line 1300 "Zend/zend_language_scanner.l"
++#line 1276 "Zend/zend_language_scanner.l"
                {
        HANDLE_NEWLINES(yytext, yyleng);
        RETURN_TOKEN(T_WHITESPACE);
  }
- #line 7023 "Zend/zend_language_scanner.c"
 -#line 7048 "Zend/zend_language_scanner.c"
++#line 7024 "Zend/zend_language_scanner.c"
  yy773:
                YYDEBUG(773, *YYCURSOR);
                ++YYCURSOR;
@@@ -7027,13 -7052,13 +7028,13 @@@
  yy774:
                YYDEBUG(774, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1290 "Zend/zend_language_scanner.l"
 -#line 1315 "Zend/zend_language_scanner.l"
++#line 1291 "Zend/zend_language_scanner.l"
                {
        yyless(0);
        yy_pop_state();
        goto restart;
  }
- #line 7037 "Zend/zend_language_scanner.c"
 -#line 7062 "Zend/zend_language_scanner.c"
++#line 7038 "Zend/zend_language_scanner.c"
  yy775:
                YYDEBUG(775, *YYCURSOR);
                ++YYCURSOR;
@@@ -7042,13 -7067,13 +7043,13 @@@
  yy776:
                YYDEBUG(776, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1284 "Zend/zend_language_scanner.l"
 -#line 1309 "Zend/zend_language_scanner.l"
++#line 1285 "Zend/zend_language_scanner.l"
                {
        yy_pop_state();
        zend_copy_value(zendlval, yytext, yyleng);
        RETURN_TOKEN(T_STRING);
  }
- #line 7052 "Zend/zend_language_scanner.c"
 -#line 7077 "Zend/zend_language_scanner.c"
++#line 7053 "Zend/zend_language_scanner.c"
  yy777:
                YYDEBUG(777, *YYCURSOR);
                yych = *++YYCURSOR;
@@@ -7069,11 -7094,11 +7070,11 @@@ yy780
                ++YYCURSOR;
                YYDEBUG(781, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1280 "Zend/zend_language_scanner.l"
 -#line 1305 "Zend/zend_language_scanner.l"
++#line 1281 "Zend/zend_language_scanner.l"
                {
        RETURN_TOKEN(T_OBJECT_OPERATOR);
  }
- #line 7077 "Zend/zend_language_scanner.c"
 -#line 7102 "Zend/zend_language_scanner.c"
++#line 7078 "Zend/zend_language_scanner.c"
  yy782:
                YYDEBUG(782, *YYCURSOR);
                ++YYCURSOR;
@@@ -7158,14 -7183,14 +7159,14 @@@ yy786
  yy787:
                YYDEBUG(787, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1595 "Zend/zend_language_scanner.l"
 -#line 1620 "Zend/zend_language_scanner.l"
++#line 1596 "Zend/zend_language_scanner.l"
                {
        yyless(0);
        yy_pop_state();
        yy_push_state(ST_IN_SCRIPTING);
        goto restart;
  }
- #line 7169 "Zend/zend_language_scanner.c"
 -#line 7194 "Zend/zend_language_scanner.c"
++#line 7170 "Zend/zend_language_scanner.c"
  yy788:
                YYDEBUG(788, *YYCURSOR);
                yych = *++YYCURSOR;
@@@ -7190,7 -7215,7 +7191,7 @@@ yy792
                ++YYCURSOR;
                YYDEBUG(793, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1586 "Zend/zend_language_scanner.l"
 -#line 1611 "Zend/zend_language_scanner.l"
++#line 1587 "Zend/zend_language_scanner.l"
                {
        yyless(yyleng - 1);
        zend_copy_value(zendlval, yytext, yyleng);
@@@ -7198,7 -7223,7 +7199,7 @@@
        yy_push_state(ST_IN_SCRIPTING);
        RETURN_TOKEN(T_STRING_VARNAME);
  }
- #line 7202 "Zend/zend_language_scanner.c"
 -#line 7227 "Zend/zend_language_scanner.c"
++#line 7203 "Zend/zend_language_scanner.c"
        }
  /* *********************************** */
  yyc_ST_NOWDOC:
@@@ -7209,7 -7234,7 +7210,7 @@@
        ++YYCURSOR;
        YYDEBUG(797, *YYCURSOR);
        yyleng = YYCURSOR - SCNG(yy_text);
- #line 2314 "Zend/zend_language_scanner.l"
 -#line 2339 "Zend/zend_language_scanner.l"
++#line 2315 "Zend/zend_language_scanner.l"
        {
        int newline = 0;
  
@@@ -7265,7 -7290,7 +7266,7 @@@ nowdoc_scan_done
        HANDLE_NEWLINES(yytext, yyleng - newline);
        RETURN_TOKEN(T_ENCAPSED_AND_WHITESPACE);
  }
- #line 7269 "Zend/zend_language_scanner.c"
 -#line 7294 "Zend/zend_language_scanner.c"
++#line 7270 "Zend/zend_language_scanner.c"
  /* *********************************** */
  yyc_ST_VAR_OFFSET:
        {
@@@ -7372,7 -7397,7 +7373,7 @@@ yy800
  yy801:
                YYDEBUG(801, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1703 "Zend/zend_language_scanner.l"
 -#line 1728 "Zend/zend_language_scanner.l"
++#line 1704 "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)) {
                char *end;
@@@ -7388,7 -7413,7 +7389,7 @@@ string
        }
        RETURN_TOKEN(T_NUM_STRING);
  }
- #line 7392 "Zend/zend_language_scanner.c"
 -#line 7417 "Zend/zend_language_scanner.c"
++#line 7393 "Zend/zend_language_scanner.c"
  yy802:
                YYDEBUG(802, *YYCURSOR);
                yych = *++YYCURSOR;
@@@ -7408,23 -7433,23 +7409,23 @@@ yy803
  yy804:
                YYDEBUG(804, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1863 "Zend/zend_language_scanner.l"
 -#line 1888 "Zend/zend_language_scanner.l"
++#line 1864 "Zend/zend_language_scanner.l"
                {
        /* Only '[' can be valid, but returning other tokens will allow a more explicit parse error */
        RETURN_TOKEN(yytext[0]);
  }
- #line 7417 "Zend/zend_language_scanner.c"
 -#line 7442 "Zend/zend_language_scanner.c"
++#line 7418 "Zend/zend_language_scanner.c"
  yy805:
                YYDEBUG(805, *YYCURSOR);
                ++YYCURSOR;
                YYDEBUG(806, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1858 "Zend/zend_language_scanner.l"
 -#line 1883 "Zend/zend_language_scanner.l"
++#line 1859 "Zend/zend_language_scanner.l"
                {
        yy_pop_state();
        RETURN_TOKEN(']');
  }
- #line 7428 "Zend/zend_language_scanner.c"
 -#line 7453 "Zend/zend_language_scanner.c"
++#line 7429 "Zend/zend_language_scanner.c"
  yy807:
                YYDEBUG(807, *YYCURSOR);
                yych = *++YYCURSOR;
@@@ -7434,7 -7459,7 +7435,7 @@@ yy808
                ++YYCURSOR;
                YYDEBUG(809, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1868 "Zend/zend_language_scanner.l"
 -#line 1893 "Zend/zend_language_scanner.l"
++#line 1869 "Zend/zend_language_scanner.l"
                {
        /* Invalid rule to return a more explicit parse error with proper line number */
        yyless(0);
@@@ -7442,7 -7467,7 +7443,7 @@@
        ZVAL_NULL(zendlval);
        RETURN_TOKEN(T_ENCAPSED_AND_WHITESPACE);
  }
- #line 7446 "Zend/zend_language_scanner.c"
 -#line 7471 "Zend/zend_language_scanner.c"
++#line 7447 "Zend/zend_language_scanner.c"
  yy810:
                YYDEBUG(810, *YYCURSOR);
                ++YYCURSOR;
@@@ -7451,18 -7476,18 +7452,18 @@@
  yy811:
                YYDEBUG(811, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1876 "Zend/zend_language_scanner.l"
 -#line 1901 "Zend/zend_language_scanner.l"
++#line 1877 "Zend/zend_language_scanner.l"
                {
        zend_copy_value(zendlval, yytext, yyleng);
        RETURN_TOKEN(T_STRING);
  }
- #line 7460 "Zend/zend_language_scanner.c"
 -#line 7485 "Zend/zend_language_scanner.c"
++#line 7461 "Zend/zend_language_scanner.c"
  yy812:
                YYDEBUG(812, *YYCURSOR);
                ++YYCURSOR;
                YYDEBUG(813, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 2371 "Zend/zend_language_scanner.l"
 -#line 2396 "Zend/zend_language_scanner.l"
++#line 2372 "Zend/zend_language_scanner.l"
                {
        if (YYCURSOR > YYLIMIT) {
                RETURN_TOKEN(END);
@@@ -7471,7 -7496,7 +7472,7 @@@
        zend_error(E_COMPILE_WARNING,"Unexpected character in input:  '%c' (ASCII=%d) state=%d", yytext[0], yytext[0], YYSTATE);
        goto restart;
  }
- #line 7475 "Zend/zend_language_scanner.c"
 -#line 7500 "Zend/zend_language_scanner.c"
++#line 7476 "Zend/zend_language_scanner.c"
  yy814:
                YYDEBUG(814, *YYCURSOR);
                ++YYCURSOR;
@@@ -7507,12 -7532,12 +7508,12 @@@ yy816
  yy818:
                YYDEBUG(818, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1853 "Zend/zend_language_scanner.l"
 -#line 1878 "Zend/zend_language_scanner.l"
++#line 1854 "Zend/zend_language_scanner.l"
                {
        zend_copy_value(zendlval, (yytext+1), (yyleng-1));
        RETURN_TOKEN(T_VARIABLE);
  }
- #line 7516 "Zend/zend_language_scanner.c"
 -#line 7541 "Zend/zend_language_scanner.c"
++#line 7517 "Zend/zend_language_scanner.c"
  yy819:
                YYDEBUG(819, *YYCURSOR);
                ++YYCURSOR;
@@@ -7552,12 -7577,12 +7553,12 @@@ yy824
  yy826:
                YYDEBUG(826, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
- #line 1719 "Zend/zend_language_scanner.l"
 -#line 1744 "Zend/zend_language_scanner.l"
++#line 1720 "Zend/zend_language_scanner.l"
                { /* Offset must be treated as a string */
        ZVAL_STRINGL(zendlval, yytext, yyleng);
        RETURN_TOKEN(T_NUM_STRING);
  }
- #line 7561 "Zend/zend_language_scanner.c"
 -#line 7586 "Zend/zend_language_scanner.c"
++#line 7562 "Zend/zend_language_scanner.c"
  yy827:
                YYDEBUG(827, *YYCURSOR);
                ++YYCURSOR;
@@@ -7580,6 -7605,6 +7581,6 @@@ yy829
                goto yy826;
        }
  }
- #line 2380 "Zend/zend_language_scanner.l"
 -#line 2405 "Zend/zend_language_scanner.l"
++#line 2381 "Zend/zend_language_scanner.l"
  
  }

diff --cc Zend/zend_language_scanner.l
Simple merge