]> granicus.if.org Git - php/commitdiff
. Added support for using static HEREDOCs to initialize static variables and class...
authorDmitry Stogov <dmitry@php.net>
Sat, 26 Jul 2008 15:30:28 +0000 (15:30 +0000)
committerDmitry Stogov <dmitry@php.net>
Sat, 26 Jul 2008 15:30:28 +0000 (15:30 +0000)
. Improved syntax highlighting and consistency for variables in double-quoted strings and literal text in HEREDOCs and backticks. (Matt)
. Optimized interpolated strings to use one less opcode. (Matt)

17 files changed:
NEWS
Zend/tests/bug35655.phpt
Zend/tests/heredoc_011.phpt
Zend/tests/nowdoc_013.phpt
Zend/tests/nowdoc_014.phpt
Zend/zend_compile.c
Zend/zend_compile.h
Zend/zend_highlight.c
Zend/zend_language_parser.y
Zend/zend_language_scanner.c
Zend/zend_language_scanner.l
Zend/zend_language_scanner_defs.h
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
ext/tokenizer/tokenizer.c
ext/tokenizer/tokenizer_data.c
tests/strings/bug26703.phpt

diff --git a/NEWS b/NEWS
index 7395f1b22f184e3d5abecb87eff2a4f29d261bb1..c9f5642f3319989f89cd8f7af5a68fd91b8163f3 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -24,6 +24,10 @@ PHP                                                                        NEWS
   . Added "jump label" operator (limited "goto"). (Dmitry, Sara)
   . Added NOWDOC syntax. (Gwynne Raskind, Stas, Dmitry)
   . Added HEREDOC syntax with double quotes. (Lars Strojny, Felipe)
+  . Added support for using static HEREDOCs to initialize static variables and
+    class members or constants. (Matt)
+  . Improved syntax highlighting and consistency for variables in double-quoted
+    strings and literal text in HEREDOCs and backticks. (Matt)
   . Added "?:" operator. (Marcus)
   . Added support for namespaces. (Dmitry, Stas, Gregory)
   . Added support for Late Static Binding. (Dmitry, Etienne Kneuss)
@@ -69,6 +73,7 @@ PHP                                                                        NEWS
     second usage. (Dmitry)
   . Optimized ZEND_FETCH_CLASS + ZEND_ADD_INTERFACE into single
     ZEND_ADD_INTERFACE opcode (Dmitry)
+  . Optimized interpolated strings to use one less opcode. (Matt)
 
 - Improved php.ini handling: (Jani)
   . Added ".htaccess" style user-defined php.ini files support for CGI/FastCGI
index e35764a60e5d7c68a80d5e4dad52ceaa8d53d09b..10d9c0c74678e9a6ec408a80abf620a4fdfcdba4 100755 (executable)
@@ -20,6 +20,6 @@ highlight_string($code);
 ?>
 --EXPECT--
 <code><span style="color: #000000">
-<br /><span style="color: #0000BB">&lt;?php<br />&nbsp;&nbsp;$x&nbsp;</span><span style="color: #007700">=&nbsp;&lt;&lt;&lt;EOT<br /></span><span style="color: #0000BB">some&nbsp;string&nbsp;&nbsp;&nbsp;&nbsp;<br /></span><span style="color: #007700">EOT<br />&nbsp;&nbsp;</span><span style="color: #0000BB">$y&nbsp;</span><span style="color: #007700">=&nbsp;</span><span style="color: #0000BB">2</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">?&gt;</span>
+<br /><span style="color: #0000BB">&lt;?php<br />&nbsp;&nbsp;$x&nbsp;</span><span style="color: #007700">=&nbsp;&lt;&lt;&lt;EOT<br /></span><span style="color: #DD0000">some&nbsp;string&nbsp;&nbsp;&nbsp;&nbsp;<br /></span><span style="color: #007700">EOT<br />&nbsp;&nbsp;</span><span style="color: #0000BB">$y&nbsp;</span><span style="color: #007700">=&nbsp;</span><span style="color: #0000BB">2</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">?&gt;</span>
 </span>
 </code>
index 6a1d5a00db95fd34e3a3cc5db3ed524b7bfdd3aa..d3b152ae62b186a7cbe983aa66465d9f0b0114af 100644 (file)
@@ -1,5 +1,5 @@
 --TEST--
-Heredocs can NOT be used as static scalars.
+STATIC heredocs CAN be used as static scalars.
 --FILE--
 <?php
 
@@ -7,14 +7,14 @@ require_once 'nowdoc.inc';
 
 class e {
     
-    const E = <<<THISMUSTERROR
-If you see this, something's wrong.
-THISMUSTERROR;
+    const E = <<<THISMUSTNOTERROR
+If you DON'T see this, something's wrong.
+THISMUSTNOTERROR;
 
 };
 
 print e::E . "\n";
 
 ?>
---EXPECTF--
-Parse error: syntax error, unexpected T_START_HEREDOC in %sheredoc_011.php on line 8
+--EXPECT--
+If you DON'T see this, something's wrong.
index 574d3d29a8777f37912c7a4b9cfba57bae39c99e..f4ee251749872d0ad91ead27bab2789b1a766e06 100644 (file)
@@ -21,6 +21,6 @@ highlight_string($code);
 ?>
 --EXPECT--
 <code><span style="color: #000000">
-<span style="color: #0000BB">&lt;?php<br />&nbsp;&nbsp;$x&nbsp;</span><span style="color: #007700">=&nbsp;&lt;&lt;&lt;'EOT'<br /></span><span style="color: #0000BB">some&nbsp;string&nbsp;&nbsp;&nbsp;&nbsp;<br /></span><span style="color: #007700">EOT<br />&nbsp;&nbsp;</span><span style="color: #0000BB">$y&nbsp;</span><span style="color: #007700">=&nbsp;</span><span style="color: #0000BB">2</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">?&gt;</span>
+<span style="color: #0000BB">&lt;?php<br />&nbsp;&nbsp;$x&nbsp;</span><span style="color: #007700">=&nbsp;&lt;&lt;&lt;'EOT'<br /></span><span style="color: #DD0000">some&nbsp;string&nbsp;&nbsp;&nbsp;&nbsp;<br /></span><span style="color: #007700">EOT<br />&nbsp;&nbsp;</span><span style="color: #0000BB">$y&nbsp;</span><span style="color: #007700">=&nbsp;</span><span style="color: #0000BB">2</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">?&gt;</span>
 </span>
 </code>
index 120a96f46a0a850c229ee55f24c2e4765c596389..b8948699f840cf32a50fe669ca8e756d0d64bed7 100644 (file)
@@ -1,5 +1,5 @@
 --TEST--
-Highliting empty nowdoc
+Highlighting empty nowdoc
 --INI--
 highlight.string  = #DD0000
 highlight.comment = #FF8000
@@ -20,6 +20,6 @@ highlight_string($code);
 ?>
 --EXPECT--
 <code><span style="color: #000000">
-<span style="color: #0000BB">&lt;?php<br />&nbsp;&nbsp;$x&nbsp;</span><span style="color: #007700">=&nbsp;&lt;&lt;&lt;'EOT'<br /></span><span style="color: #0000BB"></span><span style="color: #007700">EOT<br />&nbsp;&nbsp;</span><span style="color: #0000BB">$y&nbsp;</span><span style="color: #007700">=&nbsp;</span><span style="color: #0000BB">2</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">?&gt;</span>
+<span style="color: #0000BB">&lt;?php<br />&nbsp;&nbsp;$x&nbsp;</span><span style="color: #007700">=&nbsp;&lt;&lt;&lt;'EOT'<br />EOT<br />&nbsp;&nbsp;</span><span style="color: #0000BB">$y&nbsp;</span><span style="color: #007700">=&nbsp;</span><span style="color: #0000BB">2</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">?&gt;</span>
 </span>
 </code>
index afd0d851a7c14eb3bca28c2a0483fd463724918d..789b4f708484a73dac08333a2633466ed132afea 100644 (file)
@@ -1022,19 +1022,6 @@ void zend_do_end_variable_parse(znode *variable, int type, int arg_offset TSRMLS
 }
 
 
-void zend_do_init_string(znode *result TSRMLS_DC)
-{
-       zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC);
-
-       opline->opcode = ZEND_INIT_STRING;
-       opline->result.op_type = IS_TMP_VAR;
-       opline->result.u.var = get_temporary_variable(CG(active_op_array));
-       *result = opline->result;
-       SET_UNUSED(opline->op1);
-       SET_UNUSED(opline->op2);
-}
-
-
 void zend_do_add_string(znode *result, znode *op1, znode *op2 TSRMLS_DC)
 {
        zend_op *opline;
@@ -1054,45 +1041,34 @@ void zend_do_add_string(znode *result, znode *op1, znode *op2 TSRMLS_DC)
                efree(Z_STRVAL(op2->u.constant));
                return;
        }
-       opline->op1 = *op1;
+
+       if (op1) {
+               opline->op1 = *op1;
+               opline->result = *op1;
+       } else {
+               SET_UNUSED(opline->op1);
+               opline->result.op_type = IS_TMP_VAR;
+               opline->result.u.var = get_temporary_variable(CG(active_op_array));
+       }
        opline->op2 = *op2;
-       opline->op2.op_type = IS_CONST;
-       opline->result = opline->op1;
        *result = opline->result;
 }
 
 
 void zend_do_add_variable(znode *result, znode *op1, znode *op2 TSRMLS_DC)
 {
-       zend_op *opline;
+       zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC);
 
-       if (op1->op_type == IS_CONST) {
-               opline = get_next_op(CG(active_op_array) TSRMLS_CC);
-               opline->opcode = ZEND_INIT_STRING;
-               opline->result.op_type = IS_TMP_VAR;
-               opline->result.u.var = get_temporary_variable(CG(active_op_array));
-               *result = opline->result;
-               SET_UNUSED(opline->op1);
-               SET_UNUSED(opline->op2);
+       opline->opcode = ZEND_ADD_VAR;
 
-               if (Z_STRLEN(op1->u.constant)>0) {
-                       opline = get_next_op(CG(active_op_array) TSRMLS_CC);
-                       opline->opcode = ZEND_ADD_STRING;
-                       opline->result = *result;
-                       opline->op1 = *result;
-                       opline->op2 = *op1;
-                       opline->result = opline->op1;
-               } else {
-                       zval_dtor(&op1->u.constant);
-               }
+       if (op1) {
+               opline->op1 = *op1;
+               opline->result = *op1;
        } else {
-               *result = *op1;
+               SET_UNUSED(opline->op1);
+               opline->result.op_type = IS_TMP_VAR;
+               opline->result.u.var = get_temporary_variable(CG(active_op_array));
        }
-
-       opline = get_next_op(CG(active_op_array) TSRMLS_CC);
-       opline->opcode = ZEND_ADD_VAR;
-       opline->result = *result;
-       opline->op1 = *result;
        opline->op2 = *op2;
        *result = opline->result;
 }
@@ -3949,6 +3925,7 @@ void zend_do_shell_exec(znode *result, znode *cmd TSRMLS_DC)
        zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC);
 
        switch (cmd->op_type) {
+               case IS_CONST:
                case IS_TMP_VAR:
                        opline->opcode = ZEND_SEND_VAL;
                        break;
@@ -4925,7 +4902,6 @@ again:
                        retval = T_ECHO;
                        break;
                case T_END_HEREDOC:
-               case T_END_NOWDOC:
                        efree(Z_STRVAL(zendlval->u.constant));
                        break;
        }
index 9b0b4502361e1412f37eeec953f28f1cdae33dec..da53bb0ddfcf975873ede2a2b1d7bd9f9b6f742e 100644 (file)
@@ -414,7 +414,6 @@ void zend_check_writable_variable(znode *variable);
 
 void zend_do_free(znode *op1 TSRMLS_DC);
 
-void zend_do_init_string(znode *result TSRMLS_DC);
 void zend_do_add_string(znode *result, znode *op1, znode *op2 TSRMLS_DC);
 void zend_do_add_variable(znode *result, znode *op1, znode *op2 TSRMLS_DC);
 
index a6bc552eab6709c5989c10a5919e4a66c7808fc7..809252fbc90b63ebdb84940f50d8a39963016e51 100644 (file)
@@ -93,7 +93,6 @@ ZEND_API void zend_highlight(zend_syntax_highlighter_ini *syntax_highlighter_ini
        int token_type;
        char *last_color = syntax_highlighter_ini->highlight_html;
        char *next_color;
-       int in_string=0;
 
        zend_printf("<code>");
        zend_printf("<span style=\"color: %s\">\n", last_color);
@@ -115,22 +114,18 @@ ZEND_API void zend_highlight(zend_syntax_highlighter_ini *syntax_highlighter_ini
                        case T_CLOSE_TAG:
                                next_color = syntax_highlighter_ini->highlight_default;
                                break;
+                       case '"':
+                       case T_ENCAPSED_AND_WHITESPACE:
                        case T_CONSTANT_ENCAPSED_STRING:
                                next_color = syntax_highlighter_ini->highlight_string;
                                break;
-                       case '"':
-                               next_color = syntax_highlighter_ini->highlight_string;
-                               in_string = !in_string;
-                               break;                          
                        case T_WHITESPACE:
                                zend_html_puts(LANG_SCNG(yy_text), LANG_SCNG(yy_leng) TSRMLS_CC);  /* no color needed */
                                token.type = 0;
                                continue;
                                break;
                        default:
-                               if (in_string) {
-                                       next_color = syntax_highlighter_ini->highlight_string;
-                               } else if (token.type == 0) {
+                               if (token.type == 0) {
                                        next_color = syntax_highlighter_ini->highlight_keyword;
                                } else {
                                        next_color = syntax_highlighter_ini->highlight_default;
@@ -149,7 +144,6 @@ ZEND_API void zend_highlight(zend_syntax_highlighter_ini *syntax_highlighter_ini
                }
                switch (token_type) {
                        case T_END_HEREDOC:
-                       case T_END_NOWDOC:
                                zend_html_puts(token.value.str.val, token.value.str.len TSRMLS_CC);
                                break;
                        default:
@@ -159,8 +153,6 @@ ZEND_API void zend_highlight(zend_syntax_highlighter_ini *syntax_highlighter_ini
 
                if (token.type == IS_STRING) {
                        switch (token_type) {
-                               case EOF:
-                                       goto done;
                                case T_OPEN_TAG:
                                case T_OPEN_TAG_WITH_ECHO:
                                case T_CLOSE_TAG:
@@ -172,7 +164,7 @@ ZEND_API void zend_highlight(zend_syntax_highlighter_ini *syntax_highlighter_ini
                                        efree(token.value.str.val);
                                        break;
                        }
-               } else if (token_type == T_END_HEREDOC || token_type == T_END_NOWDOC) {
+               } else if (token_type == T_END_HEREDOC) {
                        efree(token.value.str.val);
                }
                token.type = 0;
@@ -190,7 +182,7 @@ ZEND_API void zend_highlight(zend_syntax_highlighter_ini *syntax_highlighter_ini
                }
                zend_html_puts(LANG_SCNG(yy_text), (LANG_SCNG(yy_limit) - LANG_SCNG(yy_text)) TSRMLS_CC);
        }
-done:
+
        if (last_color != syntax_highlighter_ini->highlight_html) {
                zend_printf("</span>\n");
        }
@@ -217,12 +209,8 @@ ZEND_API void zend_strip(TSRMLS_D)
                        case T_DOC_COMMENT:
                                token.type = 0;
                                continue;
-
-                       case EOF:
-                               return;
                        
                        case T_END_HEREDOC:
-                       case T_END_NOWDOC:
                                zend_write(LANG_SCNG(yy_text), LANG_SCNG(yy_leng));
                                efree(token.value.str.val);
                                /* read the following character, either newline or ; */
index 197f09ddaa669f52ef7d9d1202783e7e8bfdf3cf..ca5f39bef1c9fb36255cb12e2bc527744ca4426a 100644 (file)
@@ -23,7 +23,7 @@
 /*
  * LALR shift/reduce conflicts and how they are resolved:
  *
- * - 2 shift/reduce conflicts due to the dangeling elseif/else ambiguity.  Solved by shift.
+ * - 2 shift/reduce conflicts due to the dangling elseif/else ambiguity. Solved by shift.
  *
  */
 
 %token T_NAMESPACE
 %token T_NS_C
 %token T_DIR
-%token T_START_NOWDOC
-%token T_END_NOWDOC
 
 %% /* Rules */
 
@@ -641,7 +639,7 @@ expr_without_variable:
        |       '@' { zend_do_begin_silence(&$1 TSRMLS_CC); } expr { zend_do_end_silence(&$1 TSRMLS_CC); $$ = $3; }
        |       scalar                          { $$ = $1; }
        |       T_ARRAY '(' array_pair_list ')' { $$ = $3; }
-       |       '`' encaps_list '`' { zend_do_shell_exec(&$$, &$2 TSRMLS_CC); }
+       |       '`' backticks_expr '`' { zend_do_shell_exec(&$$, &$2 TSRMLS_CC); }
        |       T_PRINT expr  { zend_do_print(&$$, &$2 TSRMLS_CC); }
        |       function is_reference '(' { zend_do_begin_lambda_function_declaration(&$$, &$1, $2.op_type, 0 TSRMLS_CC); }
                        parameter_list ')' lexical_vars '{' inner_statement_list '}' {  zend_do_end_function_declaration(&$1 TSRMLS_CC); $$ = $4; }
@@ -736,6 +734,12 @@ exit_expr:
        |       '(' expr ')'    { $$ = $2; }
 ;
 
+backticks_expr:
+               /* empty */     { ZVAL_EMPTY_STRING(&$$.u.constant); INIT_PZVAL(&$$.u.constant); $$.op_type = IS_CONST; }
+       |       T_ENCAPSED_AND_WHITESPACE       { $$ = $1; }
+       |       encaps_list     { $$ = $1; }
+;
+
 
 ctor_arguments:
                /* empty */     { Z_LVAL($$.u.constant)=0; }
@@ -754,7 +758,8 @@ common_scalar:
        |       T_METHOD_C                                      { $$ = $1; }
        |       T_FUNC_C                                        { $$ = $1; }
        |       T_NS_C                                          { $$ = $1; }
-       |       T_START_NOWDOC T_ENCAPSED_AND_WHITESPACE T_END_NOWDOC   { $$ = $2; }
+       |       T_START_HEREDOC T_ENCAPSED_AND_WHITESPACE T_END_HEREDOC { $$ = $2; }
+       |       T_START_HEREDOC T_END_HEREDOC { ZVAL_EMPTY_STRING(&$$.u.constant); INIT_PZVAL(&$$.u.constant); $$.op_type = IS_CONST; }
 ;
 
 
@@ -944,8 +949,8 @@ non_empty_array_pair_list:
 encaps_list:
                encaps_list encaps_var { zend_do_end_variable_parse(&$2, BP_VAR_R, 0 TSRMLS_CC);  zend_do_add_variable(&$$, &$1, &$2 TSRMLS_CC); }
        |       encaps_list T_ENCAPSED_AND_WHITESPACE   { zend_do_add_string(&$$, &$1, &$2 TSRMLS_CC); }
-       |       /* empty */                     { zend_do_init_string(&$$ TSRMLS_CC); }
-
+       |       encaps_var { zend_do_end_variable_parse(&$1, BP_VAR_R, 0 TSRMLS_CC); zend_do_add_variable(&$$, NULL, &$1 TSRMLS_CC); }
+       |       T_ENCAPSED_AND_WHITESPACE encaps_var    { zend_do_add_string(&$$, NULL, &$1 TSRMLS_CC); zend_do_end_variable_parse(&$2, BP_VAR_R, 0 TSRMLS_CC); zend_do_add_variable(&$$, &$$, &$2 TSRMLS_CC); }
 ;
 
 
index 5e3ea747b5900f720b5a918a06ec37b51bfbadca..ac20a08d3dcd3a104d05153799ca3f9aa071b6cd 100644 (file)
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Fri Jul 25 08:52:54 2008 */
+/* Generated by re2c 0.13.5 on Sat Jul 26 18:30:43 2008 */
 #line 1 "Zend/zend_language_scanner.l"
 /*
    +----------------------------------------------------------------------+
@@ -861,63 +861,51 @@ yymore_restart:
 {
        YYCTYPE yych;
        unsigned int yyaccept = 0;
-       if (YYGETCONDITION() < 8) {
-               if (YYGETCONDITION() < 4) {
-                       if (YYGETCONDITION() < 2) {
-                               if (YYGETCONDITION() < 1) {
-                                       goto yyc_ST_IN_SCRIPTING;
-                               } else {
-                                       goto yyc_ST_LOOKING_FOR_PROPERTY;
-                               }
+       if (YYGETCONDITION() < 6) {
+               if (YYGETCONDITION() < 3) {
+                       if (YYGETCONDITION() < 1) {
+                               goto yyc_ST_IN_SCRIPTING;
                        } else {
-                               if (YYGETCONDITION() < 3) {
-                                       goto yyc_ST_BACKQUOTE;
+                               if (YYGETCONDITION() < 2) {
+                                       goto yyc_ST_LOOKING_FOR_PROPERTY;
                                } else {
-                                       goto yyc_ST_DOUBLE_QUOTES;
+                                       goto yyc_ST_BACKQUOTE;
                                }
                        }
                } else {
-                       if (YYGETCONDITION() < 6) {
+                       if (YYGETCONDITION() < 4) {
+                               goto yyc_ST_DOUBLE_QUOTES;
+                       } else {
                                if (YYGETCONDITION() < 5) {
                                        goto yyc_ST_HEREDOC;
                                } else {
                                        goto yyc_ST_LOOKING_FOR_VARNAME;
                                }
-                       } else {
-                               if (YYGETCONDITION() < 7) {
-                                       goto yyc_ST_VAR_OFFSET;
-                               } else {
-                                       goto yyc_INITIAL;
-                               }
                        }
                }
        } else {
-               if (YYGETCONDITION() < 12) {
-                       if (YYGETCONDITION() < 10) {
-                               if (YYGETCONDITION() < 9) {
-                                       goto yyc_ST_ONE_LINE_COMMENT;
-                               } else {
-                                       goto yyc_ST_COMMENT;
-                               }
+               if (YYGETCONDITION() < 9) {
+                       if (YYGETCONDITION() < 7) {
+                               goto yyc_ST_VAR_OFFSET;
                        } else {
-                               if (YYGETCONDITION() < 11) {
-                                       goto yyc_ST_DOC_COMMENT;
+                               if (YYGETCONDITION() < 8) {
+                                       goto yyc_INITIAL;
                                } else {
-                                       goto yyc_ST_START_HEREDOC;
+                                       goto yyc_ST_ONE_LINE_COMMENT;
                                }
                        }
                } else {
-                       if (YYGETCONDITION() < 14) {
-                               if (YYGETCONDITION() < 13) {
-                                       goto yyc_ST_END_HEREDOC;
+                       if (YYGETCONDITION() < 11) {
+                               if (YYGETCONDITION() < 10) {
+                                       goto yyc_ST_COMMENT;
                                } else {
-                                       goto yyc_ST_START_NOWDOC;
+                                       goto yyc_ST_DOC_COMMENT;
                                }
                        } else {
-                               if (YYGETCONDITION() < 15) {
-                                       goto yyc_ST_NOWDOC;
+                               if (YYGETCONDITION() < 12) {
+                                       goto yyc_ST_END_HEREDOC;
                                } else {
-                                       goto yyc_ST_END_NOWDOC;
+                                       goto yyc_ST_NOWDOC;
                                }
                        }
                }
@@ -1026,7 +1014,7 @@ inline_char_handler:
        HANDLE_NEWLINES(yytext, yyleng);
        return T_INLINE_HTML;
 }
-#line 1030 "Zend/zend_language_scanner.c"
+#line 1018 "Zend/zend_language_scanner.c"
 yy4:
                YYDEBUG(4, *YYCURSOR);
                yych = *++YYCURSOR;
@@ -1056,7 +1044,7 @@ yy6:
                goto inline_char_handler;
        }
 }
-#line 1060 "Zend/zend_language_scanner.c"
+#line 1048 "Zend/zend_language_scanner.c"
 yy7:
                YYDEBUG(7, *YYCURSOR);
                ++YYCURSOR;
@@ -1075,7 +1063,7 @@ yy7:
                goto inline_char_handler;
        }
 }
-#line 1079 "Zend/zend_language_scanner.c"
+#line 1067 "Zend/zend_language_scanner.c"
 yy9:
                YYDEBUG(9, *YYCURSOR);
                yych = *++YYCURSOR;
@@ -1270,7 +1258,7 @@ yy35:
        BEGIN(ST_IN_SCRIPTING);
        return T_OPEN_TAG;
 }
-#line 1274 "Zend/zend_language_scanner.c"
+#line 1262 "Zend/zend_language_scanner.c"
 yy39:
                YYDEBUG(39, *YYCURSOR);
                yych = *++YYCURSOR;
@@ -1309,7 +1297,7 @@ yy43:
                goto inline_char_handler;
        }
 }
-#line 1313 "Zend/zend_language_scanner.c"
+#line 1301 "Zend/zend_language_scanner.c"
 yy45:
                YYDEBUG(45, *YYCURSOR);
                ++YYCURSOR;
@@ -1327,7 +1315,7 @@ yy45:
                goto inline_char_handler;
        }
 }
-#line 1331 "Zend/zend_language_scanner.c"
+#line 1319 "Zend/zend_language_scanner.c"
 yy47:
                YYDEBUG(47, *YYCURSOR);
                yych = *++YYCURSOR;
@@ -1363,7 +1351,7 @@ yy51:
        BEGIN(ST_IN_SCRIPTING);
        return T_OPEN_TAG;
 }
-#line 1367 "Zend/zend_language_scanner.c"
+#line 1355 "Zend/zend_language_scanner.c"
 yy52:
                YYDEBUG(52, *YYCURSOR);
                ++YYCURSOR;
@@ -1454,13 +1442,13 @@ yy56:
 yy57:
                YYDEBUG(57, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2012 "Zend/zend_language_scanner.l"
+#line 2007 "Zend/zend_language_scanner.l"
                {
        zendlval->value.lval = (long) '{';
        yy_push_state(ST_IN_SCRIPTING TSRMLS_CC);
        return T_CURLY_OPEN;
 }
-#line 1464 "Zend/zend_language_scanner.c"
+#line 1452 "Zend/zend_language_scanner.c"
 yy58:
                YYDEBUG(58, *YYCURSOR);
                yyaccept = 1;
@@ -1478,12 +1466,12 @@ yy59:
 yy60:
                YYDEBUG(60, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2037 "Zend/zend_language_scanner.l"
+#line 2032 "Zend/zend_language_scanner.l"
                {
        zend_scan_escape_string(zendlval, yytext, yyleng, '`' TSRMLS_CC);
        return T_ENCAPSED_AND_WHITESPACE;
 }
-#line 1487 "Zend/zend_language_scanner.c"
+#line 1475 "Zend/zend_language_scanner.c"
 yy61:
                YYDEBUG(61, *YYCURSOR);
                ++YYCURSOR;
@@ -1495,12 +1483,12 @@ yy62:
                ++YYCURSOR;
                YYDEBUG(63, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2173 "Zend/zend_language_scanner.l"
+#line 2110 "Zend/zend_language_scanner.l"
                {
        BEGIN(ST_IN_SCRIPTING);
        return '`';
 }
-#line 1504 "Zend/zend_language_scanner.c"
+#line 1492 "Zend/zend_language_scanner.c"
 yy64:
                YYDEBUG(64, *YYCURSOR);
                ++YYCURSOR;
@@ -1588,13 +1576,13 @@ yy68:
 yy70:
                YYDEBUG(70, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2042 "Zend/zend_language_scanner.l"
+#line 2037 "Zend/zend_language_scanner.l"
                {
        yyless(yyleng - 1);
        zend_scan_escape_string(zendlval, yytext, yyleng, '`' TSRMLS_CC);
        return T_ENCAPSED_AND_WHITESPACE;
 }
-#line 1598 "Zend/zend_language_scanner.c"
+#line 1586 "Zend/zend_language_scanner.c"
 yy71:
                YYDEBUG(71, *YYCURSOR);
                yych = *++YYCURSOR;
@@ -1634,7 +1622,7 @@ yy76:
        zendlval->type = IS_STRING;
        return T_VARIABLE;
 }
-#line 1638 "Zend/zend_language_scanner.c"
+#line 1626 "Zend/zend_language_scanner.c"
 yy77:
                YYDEBUG(77, *YYCURSOR);
                ++YYCURSOR;
@@ -1645,7 +1633,7 @@ yy77:
        yy_push_state(ST_LOOKING_FOR_VARNAME TSRMLS_CC);
        return T_DOLLAR_OPEN_CURLY_BRACES;
 }
-#line 1649 "Zend/zend_language_scanner.c"
+#line 1637 "Zend/zend_language_scanner.c"
 yy79:
                YYDEBUG(79, *YYCURSOR);
                yych = *++YYCURSOR;
@@ -1664,7 +1652,7 @@ yy80:
        zendlval->type = IS_STRING;
        return T_VARIABLE;
 }
-#line 1668 "Zend/zend_language_scanner.c"
+#line 1656 "Zend/zend_language_scanner.c"
 yy82:
                YYDEBUG(82, *YYCURSOR);
                yych = *++YYCURSOR;
@@ -1690,7 +1678,7 @@ yy83:
        zendlval->type = IS_STRING;
        return T_VARIABLE;
 }
-#line 1694 "Zend/zend_language_scanner.c"
+#line 1682 "Zend/zend_language_scanner.c"
        }
 /* *********************************** */
 yyc_ST_COMMENT:
@@ -1751,7 +1739,7 @@ yy87:
                {
        yymore();
 }
-#line 1755 "Zend/zend_language_scanner.c"
+#line 1743 "Zend/zend_language_scanner.c"
 yy90:
                YYDEBUG(90, *YYCURSOR);
                ++YYCURSOR;
@@ -1762,7 +1750,7 @@ yy90:
                {
        yymore();
 }
-#line 1766 "Zend/zend_language_scanner.c"
+#line 1754 "Zend/zend_language_scanner.c"
 yy92:
                YYDEBUG(92, *YYCURSOR);
                ++YYCURSOR;
@@ -1774,7 +1762,7 @@ yy92:
        BEGIN(ST_IN_SCRIPTING);
        return T_COMMENT;
 }
-#line 1778 "Zend/zend_language_scanner.c"
+#line 1766 "Zend/zend_language_scanner.c"
        }
 /* *********************************** */
 yyc_ST_DOC_COMMENT:
@@ -1835,7 +1823,7 @@ yy96:
                {
        yymore();
 }
-#line 1839 "Zend/zend_language_scanner.c"
+#line 1827 "Zend/zend_language_scanner.c"
 yy99:
                YYDEBUG(99, *YYCURSOR);
                ++YYCURSOR;
@@ -1846,7 +1834,7 @@ yy99:
                {
        yymore();
 }
-#line 1850 "Zend/zend_language_scanner.c"
+#line 1838 "Zend/zend_language_scanner.c"
 yy101:
                YYDEBUG(101, *YYCURSOR);
                ++YYCURSOR;
@@ -1860,7 +1848,7 @@ yy101:
        BEGIN(ST_IN_SCRIPTING);
        return T_DOC_COMMENT;
 }
-#line 1864 "Zend/zend_language_scanner.c"
+#line 1852 "Zend/zend_language_scanner.c"
        }
 /* *********************************** */
 yyc_ST_DOUBLE_QUOTES:
@@ -1947,13 +1935,13 @@ yy106:
 yy107:
                YYDEBUG(107, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2012 "Zend/zend_language_scanner.l"
+#line 2007 "Zend/zend_language_scanner.l"
                {
        zendlval->value.lval = (long) '{';
        yy_push_state(ST_IN_SCRIPTING TSRMLS_CC);
        return T_CURLY_OPEN;
 }
-#line 1957 "Zend/zend_language_scanner.c"
+#line 1945 "Zend/zend_language_scanner.c"
 yy108:
                YYDEBUG(108, *YYCURSOR);
                yyaccept = 1;
@@ -1972,12 +1960,12 @@ yy109:
 yy110:
                YYDEBUG(110, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2019 "Zend/zend_language_scanner.l"
+#line 2014 "Zend/zend_language_scanner.l"
                {
        zend_scan_escape_string(zendlval, yytext, yyleng, '"' TSRMLS_CC);
        return T_ENCAPSED_AND_WHITESPACE;
 }
-#line 1981 "Zend/zend_language_scanner.c"
+#line 1969 "Zend/zend_language_scanner.c"
 yy111:
                YYDEBUG(111, *YYCURSOR);
                ++YYCURSOR;
@@ -1989,12 +1977,12 @@ yy112:
                ++YYCURSOR;
                YYDEBUG(113, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2167 "Zend/zend_language_scanner.l"
+#line 2104 "Zend/zend_language_scanner.l"
                {
        BEGIN(ST_IN_SCRIPTING);
        return '"';
 }
-#line 1998 "Zend/zend_language_scanner.c"
+#line 1986 "Zend/zend_language_scanner.c"
 yy114:
                YYDEBUG(114, *YYCURSOR);
                ++YYCURSOR;
@@ -2085,13 +2073,13 @@ yy118:
 yy120:
                YYDEBUG(120, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2030 "Zend/zend_language_scanner.l"
+#line 2025 "Zend/zend_language_scanner.l"
                {
        yyless(yyleng - 1);
        zend_scan_escape_string(zendlval, yytext, yyleng, '"' TSRMLS_CC);
        return T_ENCAPSED_AND_WHITESPACE;
 }
-#line 2095 "Zend/zend_language_scanner.c"
+#line 2083 "Zend/zend_language_scanner.c"
 yy121:
                YYDEBUG(121, *YYCURSOR);
                yych = *++YYCURSOR;
@@ -2131,7 +2119,7 @@ yy126:
        zendlval->type = IS_STRING;
        return T_VARIABLE;
 }
-#line 2135 "Zend/zend_language_scanner.c"
+#line 2123 "Zend/zend_language_scanner.c"
 yy127:
                YYDEBUG(127, *YYCURSOR);
                ++YYCURSOR;
@@ -2142,7 +2130,7 @@ yy127:
        yy_push_state(ST_LOOKING_FOR_VARNAME TSRMLS_CC);
        return T_DOLLAR_OPEN_CURLY_BRACES;
 }
-#line 2146 "Zend/zend_language_scanner.c"
+#line 2134 "Zend/zend_language_scanner.c"
 yy129:
                YYDEBUG(129, *YYCURSOR);
                yych = *++YYCURSOR;
@@ -2161,7 +2149,7 @@ yy130:
        zendlval->type = IS_STRING;
        return T_VARIABLE;
 }
-#line 2165 "Zend/zend_language_scanner.c"
+#line 2153 "Zend/zend_language_scanner.c"
 yy132:
                YYDEBUG(132, *YYCURSOR);
                yych = *++YYCURSOR;
@@ -2187,7 +2175,7 @@ yy133:
        zendlval->type = IS_STRING;
        return T_VARIABLE;
 }
-#line 2191 "Zend/zend_language_scanner.c"
+#line 2179 "Zend/zend_language_scanner.c"
        }
 /* *********************************** */
 yyc_ST_END_HEREDOC:
@@ -2198,35 +2186,19 @@ yyc_ST_END_HEREDOC:
        ++YYCURSOR;
        YYDEBUG(138, *YYCURSOR);
        yyleng = YYCURSOR - SCNG(yy_text);
-#line 2001 "Zend/zend_language_scanner.l"
+#line 1993 "Zend/zend_language_scanner.l"
        {
-       SCNG(yy_text) = (unsigned char *)(Z_STRVAL_P(zendlval) = CG(heredoc));
-       SCNG(yy_leng) = Z_STRLEN_P(zendlval) = CG(heredoc_len);
+       YYCURSOR += CG(heredoc_len) - 1;
+       yyleng = CG(heredoc_len);
+
+       Z_STRVAL_P(zendlval) = CG(heredoc);
+       Z_STRLEN_P(zendlval) = CG(heredoc_len);
        CG(heredoc) = NULL;
        CG(heredoc_len) = 0;
        BEGIN(ST_IN_SCRIPTING);
        return T_END_HEREDOC;
 }
-#line 2211 "Zend/zend_language_scanner.c"
-/* *********************************** */
-yyc_ST_END_NOWDOC:
-       YYDEBUG(139, *YYCURSOR);
-       YYFILL(1);
-       yych = *YYCURSOR;
-       YYDEBUG(141, *YYCURSOR);
-       ++YYCURSOR;
-       YYDEBUG(142, *YYCURSOR);
-       yyleng = YYCURSOR - SCNG(yy_text);
-#line 2156 "Zend/zend_language_scanner.l"
-       {
-       SCNG(yy_text) = (unsigned char*)(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 2230 "Zend/zend_language_scanner.c"
+#line 2202 "Zend/zend_language_scanner.c"
 /* *********************************** */
 yyc_ST_HEREDOC:
        {
@@ -2264,439 +2236,439 @@ yyc_ST_HEREDOC:
                          8,   8,   8,   8,   8,   8,   8,   8, 
                          8,   8,   8,   8,   8,   8,   8,   8, 
                };
-               YYDEBUG(143, *YYCURSOR);
+               YYDEBUG(139, *YYCURSOR);
                YYFILL(2);
                yych = *(YYMARKER = YYCURSOR);
                if (yybm[0+yych] & 4) {
-                       goto yy149;
+                       goto yy145;
                }
                if (yych <= '[') {
-                       if (yych <= '\f') goto yy154;
-                       if (yych <= '\r') goto yy156;
-                       if (yych <= '@') goto yy146;
-                       goto yy151;
+                       if (yych <= '\f') goto yy150;
+                       if (yych <= '\r') goto yy152;
+                       if (yych <= '@') goto yy142;
+                       goto yy147;
                } else {
-                       if (yych <= '\\') goto yy153;
-                       if (yych == '{') goto yy147;
-                       goto yy151;
+                       if (yych <= '\\') goto yy149;
+                       if (yych == '{') goto yy143;
+                       goto yy147;
                }
-yy145:
-               YYDEBUG(145, *YYCURSOR);
+yy141:
+               YYDEBUG(141, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2056 "Zend/zend_language_scanner.l"
+#line 2051 "Zend/zend_language_scanner.l"
                {
        zend_scan_escape_string(zendlval, yytext, yyleng, 0 TSRMLS_CC);
        return T_ENCAPSED_AND_WHITESPACE;
 }
-#line 2292 "Zend/zend_language_scanner.c"
-yy146:
-               YYDEBUG(146, *YYCURSOR);
+#line 2264 "Zend/zend_language_scanner.c"
+yy142:
+               YYDEBUG(142, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych <= '\\') {
                        if (yych <= '@') {
-                               if (yych == '$') goto yy191;
-                               goto yy150;
+                               if (yych == '$') goto yy187;
+                               goto yy146;
                        } else {
-                               if (yych <= 'Z') goto yy195;
-                               if (yych <= '[') goto yy150;
-                               goto yy184;
+                               if (yych <= 'Z') goto yy191;
+                               if (yych <= '[') goto yy146;
+                               goto yy180;
                        }
                } else {
                        if (yych <= '`') {
-                               if (yych == '_') goto yy195;
-                               goto yy150;
+                               if (yych == '_') goto yy191;
+                               goto yy146;
                        } else {
-                               if (yych <= 'z') goto yy195;
-                               if (yych <= '{') goto yy198;
-                               if (yych <= '~') goto yy150;
-                               goto yy195;
+                               if (yych <= 'z') goto yy191;
+                               if (yych <= '{') goto yy194;
+                               if (yych <= '~') goto yy146;
+                               goto yy191;
                        }
                }
-yy147:
-               YYDEBUG(147, *YYCURSOR);
+yy143:
+               YYDEBUG(143, *YYCURSOR);
                yyaccept = 1;
                yych = *(YYMARKER = ++YYCURSOR);
                if (yybm[0+yych] & 16) {
-                       goto yy154;
+                       goto yy150;
                }
                if (yych <= '$') {
-                       if (yych == '\r') goto yy156;
-                       if (yych <= '#') goto yy149;
+                       if (yych == '\r') goto yy152;
+                       if (yych <= '#') goto yy145;
                } else {
                        if (yych <= '\\') {
-                               if (yych <= '[') goto yy149;
-                               goto yy153;
-                       } else {
-                               if (yych == '{') goto yy193;
+                               if (yych <= '[') goto yy145;
                                goto yy149;
+                       } else {
+                               if (yych == '{') goto yy189;
+                               goto yy145;
                        }
                }
-yy148:
-               YYDEBUG(148, *YYCURSOR);
+yy144:
+               YYDEBUG(144, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2012 "Zend/zend_language_scanner.l"
+#line 2007 "Zend/zend_language_scanner.l"
                {
        zendlval->value.lval = (long) '{';
        yy_push_state(ST_IN_SCRIPTING TSRMLS_CC);
        return T_CURLY_OPEN;
 }
-#line 2344 "Zend/zend_language_scanner.c"
-yy149:
-               YYDEBUG(149, *YYCURSOR);
+#line 2316 "Zend/zend_language_scanner.c"
+yy145:
+               YYDEBUG(145, *YYCURSOR);
                yyaccept = 0;
                YYMARKER = ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-yy150:
-               YYDEBUG(150, *YYCURSOR);
+yy146:
+               YYDEBUG(146, *YYCURSOR);
                if (yybm[0+yych] & 4) {
-                       goto yy149;
+                       goto yy145;
                }
                if (yych <= '[') {
-                       if (yych <= '\f') goto yy154;
-                       if (yych <= '\r') goto yy156;
-                       if (yych <= '@') goto yy190;
+                       if (yych <= '\f') goto yy150;
+                       if (yych <= '\r') goto yy152;
+                       if (yych <= '@') goto yy186;
                } else {
-                       if (yych <= '\\') goto yy153;
-                       if (yych == '{') goto yy189;
+                       if (yych <= '\\') goto yy149;
+                       if (yych == '{') goto yy185;
                }
-yy151:
-               YYDEBUG(151, *YYCURSOR);
+yy147:
+               YYDEBUG(147, *YYCURSOR);
                yyaccept = 0;
                YYMARKER = ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(152, *YYCURSOR);
+               YYDEBUG(148, *YYCURSOR);
                if (yybm[0+yych] & 16) {
-                       goto yy154;
+                       goto yy150;
                }
                if (yych <= '@') {
                        if (yych <= '$') {
-                               if (yych == '\r') goto yy156;
-                               if (yych <= '#') goto yy149;
-                               goto yy183;
+                               if (yych == '\r') goto yy152;
+                               if (yych <= '#') goto yy145;
+                               goto yy179;
                        } else {
                                if (yych <= '9') {
-                                       if (yych <= '/') goto yy149;
-                                       goto yy151;
+                                       if (yych <= '/') goto yy145;
+                                       goto yy147;
                                } else {
-                                       if (yych == ';') goto yy181;
-                                       goto yy149;
+                                       if (yych == ';') goto yy177;
+                                       goto yy145;
                                }
                        }
                } else {
                        if (yych <= '_') {
                                if (yych <= '[') {
-                                       if (yych <= 'Z') goto yy151;
-                                       goto yy149;
+                                       if (yych <= 'Z') goto yy147;
+                                       goto yy145;
                                } else {
-                                       if (yych <= '\\') goto yy153;
-                                       if (yych <= '^') goto yy149;
-                                       goto yy151;
+                                       if (yych <= '\\') goto yy149;
+                                       if (yych <= '^') goto yy145;
+                                       goto yy147;
                                }
                        } else {
                                if (yych <= 'z') {
-                                       if (yych <= '`') goto yy149;
-                                       goto yy151;
+                                       if (yych <= '`') goto yy145;
+                                       goto yy147;
                                } else {
-                                       if (yych <= '{') goto yy182;
-                                       if (yych <= '~') goto yy149;
-                                       goto yy151;
+                                       if (yych <= '{') goto yy178;
+                                       if (yych <= '~') goto yy145;
+                                       goto yy147;
                                }
                        }
                }
-yy153:
-               YYDEBUG(153, *YYCURSOR);
+yy149:
+               YYDEBUG(149, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
                if (yybm[0+yych] & 16) {
-                       goto yy154;
+                       goto yy150;
                }
-               if (yych == '\r') goto yy156;
-               goto yy149;
-yy154:
-               YYDEBUG(154, *YYCURSOR);
+               if (yych == '\r') goto yy152;
+               goto yy145;
+yy150:
+               YYDEBUG(150, *YYCURSOR);
                yyaccept = 0;
                YYMARKER = ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(155, *YYCURSOR);
+               YYDEBUG(151, *YYCURSOR);
                if (yybm[0+yych] & 4) {
-                       goto yy149;
+                       goto yy145;
                }
                if (yych <= '[') {
-                       if (yych <= '\f') goto yy154;
-                       if (yych <= '\r') goto yy156;
-                       if (yych <= '@') goto yy162;
-                       goto yy158;
+                       if (yych <= '\f') goto yy150;
+                       if (yych <= '\r') goto yy152;
+                       if (yych <= '@') goto yy158;
+                       goto yy154;
                } else {
-                       if (yych <= '\\') goto yy163;
-                       if (yych == '{') goto yy160;
-                       goto yy158;
+                       if (yych <= '\\') goto yy159;
+                       if (yych == '{') goto yy156;
+                       goto yy154;
                }
-yy156:
-               YYDEBUG(156, *YYCURSOR);
+yy152:
+               YYDEBUG(152, *YYCURSOR);
                yyaccept = 0;
                YYMARKER = ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(157, *YYCURSOR);
+               YYDEBUG(153, *YYCURSOR);
                if (yybm[0+yych] & 4) {
-                       goto yy149;
+                       goto yy145;
                }
                if (yych <= '[') {
-                       if (yych <= '\f') goto yy154;
-                       if (yych <= '\r') goto yy156;
-                       if (yych <= '@') goto yy162;
+                       if (yych <= '\f') goto yy150;
+                       if (yych <= '\r') goto yy152;
+                       if (yych <= '@') goto yy158;
                } else {
-                       if (yych <= '\\') goto yy163;
-                       if (yych == '{') goto yy160;
+                       if (yych <= '\\') goto yy159;
+                       if (yych == '{') goto yy156;
                }
-yy158:
-               YYDEBUG(158, *YYCURSOR);
+yy154:
+               YYDEBUG(154, *YYCURSOR);
                yyaccept = 0;
                YYMARKER = ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(159, *YYCURSOR);
+               YYDEBUG(155, *YYCURSOR);
                if (yych <= ';') {
                        if (yych <= '#') {
                                if (yych <= '\n') {
-                                       if (yych <= '\t') goto yy149;
-                                       goto yy174;
+                                       if (yych <= '\t') goto yy145;
+                                       goto yy170;
                                } else {
-                                       if (yych == '\r') goto yy174;
-                                       goto yy149;
+                                       if (yych == '\r') goto yy170;
+                                       goto yy145;
                                }
                        } else {
                                if (yych <= '/') {
-                                       if (yych <= '$') goto yy173;
-                                       goto yy149;
+                                       if (yych <= '$') goto yy169;
+                                       goto yy145;
                                } else {
-                                       if (yych <= '9') goto yy158;
-                                       if (yych <= ':') goto yy149;
-                                       goto yy170;
+                                       if (yych <= '9') goto yy154;
+                                       if (yych <= ':') goto yy145;
+                                       goto yy166;
                                }
                        }
                } else {
                        if (yych <= '^') {
                                if (yych <= 'Z') {
-                                       if (yych <= '@') goto yy149;
-                                       goto yy158;
+                                       if (yych <= '@') goto yy145;
+                                       goto yy154;
                                } else {
-                                       if (yych == '\\') goto yy171;
-                                       goto yy149;
+                                       if (yych == '\\') goto yy167;
+                                       goto yy145;
                                }
                        } else {
                                if (yych <= 'z') {
-                                       if (yych == '`') goto yy149;
-                                       goto yy158;
+                                       if (yych == '`') goto yy145;
+                                       goto yy154;
                                } else {
-                                       if (yych <= '{') goto yy172;
-                                       if (yych <= '~') goto yy149;
-                                       goto yy158;
+                                       if (yych <= '{') goto yy168;
+                                       if (yych <= '~') goto yy145;
+                                       goto yy154;
                                }
                        }
                }
-yy160:
-               YYDEBUG(160, *YYCURSOR);
+yy156:
+               YYDEBUG(156, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
                if (yybm[0+yych] & 16) {
-                       goto yy154;
+                       goto yy150;
                }
                if (yych <= '$') {
-                       if (yych == '\r') goto yy156;
-                       if (yych <= '#') goto yy149;
+                       if (yych == '\r') goto yy152;
+                       if (yych <= '#') goto yy145;
                } else {
                        if (yych <= '\\') {
-                               if (yych <= '[') goto yy149;
-                               goto yy163;
+                               if (yych <= '[') goto yy145;
+                               goto yy159;
                        } else {
-                               if (yych == '{') goto yy168;
-                               goto yy149;
+                               if (yych == '{') goto yy164;
+                               goto yy145;
                        }
                }
-yy161:
-               YYDEBUG(161, *YYCURSOR);
+yy157:
+               YYDEBUG(157, *YYCURSOR);
                YYCURSOR = YYMARKER;
                if (yyaccept <= 1) {
                        if (yyaccept <= 0) {
-                               goto yy145;
+                               goto yy141;
                        } else {
-                               goto yy148;
+                               goto yy144;
                        }
                } else {
                        if (yyaccept <= 2) {
-                               goto yy167;
+                               goto yy163;
                        } else {
-                               goto yy197;
+                               goto yy193;
                        }
                }
-yy162:
-               YYDEBUG(162, *YYCURSOR);
+yy158:
+               YYDEBUG(158, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
                if (yybm[0+yych] & 4) {
-                       goto yy149;
+                       goto yy145;
                }
                if (yych <= '@') {
-                       if (yych <= '\f') goto yy154;
-                       if (yych <= '\r') goto yy156;
-                       goto yy165;
-               } else {
-                       if (yych == '\\') goto yy164;
+                       if (yych <= '\f') goto yy150;
+                       if (yych <= '\r') goto yy152;
                        goto yy161;
+               } else {
+                       if (yych == '\\') goto yy160;
+                       goto yy157;
                }
-yy163:
-               YYDEBUG(163, *YYCURSOR);
+yy159:
+               YYDEBUG(159, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
                if (yybm[0+yych] & 16) {
-                       goto yy154;
+                       goto yy150;
                }
-               if (yych == '\r') goto yy156;
-               goto yy149;
-yy164:
-               YYDEBUG(164, *YYCURSOR);
+               if (yych == '\r') goto yy152;
+               goto yy145;
+yy160:
+               YYDEBUG(160, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
                if (yybm[0+yych] & 16) {
-                       goto yy154;
+                       goto yy150;
                }
-               if (yych == '\r') goto yy156;
-               goto yy149;
-yy165:
-               YYDEBUG(165, *YYCURSOR);
+               if (yych == '\r') goto yy152;
+               goto yy145;
+yy161:
+               YYDEBUG(161, *YYCURSOR);
                yyaccept = 2;
                YYMARKER = ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(166, *YYCURSOR);
+               YYDEBUG(162, *YYCURSOR);
                if (yybm[0+yych] & 4) {
-                       goto yy149;
+                       goto yy145;
                }
                if (yych <= '@') {
-                       if (yych <= '\f') goto yy154;
-                       if (yych <= '\r') goto yy156;
-                       goto yy165;
+                       if (yych <= '\f') goto yy150;
+                       if (yych <= '\r') goto yy152;
+                       goto yy161;
                } else {
-                       if (yych == '\\') goto yy164;
+                       if (yych == '\\') goto yy160;
                }
-yy167:
-               YYDEBUG(167, *YYCURSOR);
+yy163:
+               YYDEBUG(163, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2061 "Zend/zend_language_scanner.l"
+#line 2056 "Zend/zend_language_scanner.l"
                {
        yyless(yyleng - 1);
        zend_scan_escape_string(zendlval, yytext, yyleng, 0 TSRMLS_CC);
        return T_ENCAPSED_AND_WHITESPACE;
 }
-#line 2601 "Zend/zend_language_scanner.c"
-yy168:
-               YYDEBUG(168, *YYCURSOR);
+#line 2573 "Zend/zend_language_scanner.c"
+yy164:
+               YYDEBUG(164, *YYCURSOR);
                yyaccept = 2;
                YYMARKER = ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(169, *YYCURSOR);
+               YYDEBUG(165, *YYCURSOR);
                if (yybm[0+yych] & 16) {
-                       goto yy154;
+                       goto yy150;
                }
                if (yych <= '$') {
-                       if (yych == '\r') goto yy156;
-                       if (yych <= '#') goto yy149;
-                       goto yy167;
+                       if (yych == '\r') goto yy152;
+                       if (yych <= '#') goto yy145;
+                       goto yy163;
                } else {
                        if (yych <= '\\') {
-                               if (yych <= '[') goto yy149;
-                               goto yy163;
+                               if (yych <= '[') goto yy145;
+                               goto yy159;
                        } else {
-                               if (yych == '{') goto yy168;
-                               goto yy149;
+                               if (yych == '{') goto yy164;
+                               goto yy145;
                        }
                }
-yy170:
-               YYDEBUG(170, *YYCURSOR);
+yy166:
+               YYDEBUG(166, *YYCURSOR);
                yyaccept = 0;
                YYMARKER = ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
                if (yych <= '#') {
                        if (yych <= '\n') {
-                               if (yych <= '\t') goto yy149;
-                               goto yy174;
+                               if (yych <= '\t') goto yy145;
+                               goto yy170;
                        } else {
-                               if (yych == '\r') goto yy174;
-                               goto yy149;
+                               if (yych == '\r') goto yy170;
+                               goto yy145;
                        }
                } else {
                        if (yych <= '\\') {
-                               if (yych <= '$') goto yy173;
-                               if (yych <= '[') goto yy149;
+                               if (yych <= '$') goto yy169;
+                               if (yych <= '[') goto yy145;
                        } else {
-                               if (yych == '{') goto yy172;
-                               goto yy149;
+                               if (yych == '{') goto yy168;
+                               goto yy145;
                        }
                }
-yy171:
-               YYDEBUG(171, *YYCURSOR);
+yy167:
+               YYDEBUG(167, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
                if (yybm[0+yych] & 16) {
-                       goto yy154;
+                       goto yy150;
                }
-               if (yych == '\r') goto yy156;
-               goto yy149;
-yy172:
-               YYDEBUG(172, *YYCURSOR);
+               if (yych == '\r') goto yy152;
+               goto yy145;
+yy168:
+               YYDEBUG(168, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
                if (yybm[0+yych] & 16) {
-                       goto yy154;
+                       goto yy150;
                }
                if (yych <= '$') {
-                       if (yych == '\r') goto yy156;
-                       if (yych <= '#') goto yy149;
-                       goto yy161;
+                       if (yych == '\r') goto yy152;
+                       if (yych <= '#') goto yy145;
+                       goto yy157;
                } else {
                        if (yych <= '\\') {
-                               if (yych <= '[') goto yy149;
-                               goto yy171;
+                               if (yych <= '[') goto yy145;
+                               goto yy167;
                        } else {
-                               if (yych == '{') goto yy179;
-                               goto yy149;
+                               if (yych == '{') goto yy175;
+                               goto yy145;
                        }
                }
-yy173:
-               YYDEBUG(173, *YYCURSOR);
+yy169:
+               YYDEBUG(169, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
                if (yybm[0+yych] & 4) {
-                       goto yy149;
+                       goto yy145;
                }
                if (yych <= '@') {
-                       if (yych <= '\f') goto yy154;
-                       if (yych <= '\r') goto yy156;
-                       goto yy176;
+                       if (yych <= '\f') goto yy150;
+                       if (yych <= '\r') goto yy152;
+                       goto yy172;
                } else {
-                       if (yych == '\\') goto yy178;
-                       goto yy161;
+                       if (yych == '\\') goto yy174;
+                       goto yy157;
                }
-yy174:
-               YYDEBUG(174, *YYCURSOR);
+yy170:
+               YYDEBUG(170, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(175, *YYCURSOR);
+               YYDEBUG(171, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1961 "Zend/zend_language_scanner.l"
+#line 1956 "Zend/zend_language_scanner.l"
                {
        char *end = yytext + yyleng - 1;
 
@@ -2718,12 +2690,9 @@ yy174:
                        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
-                * before label, for zend_highlight/strip, tokenizer, etc. */
-               yyleng -= CG(heredoc_len) - 1;
+               /* Go back before label, to match in ST_END_HEREDOC state. yytext will include
+                * newline before label, for zend_highlight/strip, tokenizer, etc. */
+               yyless(yyleng - CG(heredoc_len) - 1); /* 1 for newline after label */
 
                CG(increment_lineno) = 1; /* For newline before label */
                BEGIN(ST_END_HEREDOC);
@@ -2736,265 +2705,265 @@ yy174:
                yymore();
        }
 }
-#line 2740 "Zend/zend_language_scanner.c"
-yy176:
-               YYDEBUG(176, *YYCURSOR);
+#line 2709 "Zend/zend_language_scanner.c"
+yy172:
+               YYDEBUG(172, *YYCURSOR);
                yyaccept = 2;
                YYMARKER = ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(177, *YYCURSOR);
+               YYDEBUG(173, *YYCURSOR);
                if (yybm[0+yych] & 4) {
-                       goto yy149;
+                       goto yy145;
                }
                if (yych <= '@') {
-                       if (yych <= '\f') goto yy154;
-                       if (yych <= '\r') goto yy156;
-                       goto yy176;
+                       if (yych <= '\f') goto yy150;
+                       if (yych <= '\r') goto yy152;
+                       goto yy172;
                } else {
-                       if (yych != '\\') goto yy167;
+                       if (yych != '\\') goto yy163;
                }
-yy178:
-               YYDEBUG(178, *YYCURSOR);
+yy174:
+               YYDEBUG(174, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
                if (yybm[0+yych] & 16) {
-                       goto yy154;
+                       goto yy150;
                }
-               if (yych == '\r') goto yy156;
-               goto yy149;
-yy179:
-               YYDEBUG(179, *YYCURSOR);
+               if (yych == '\r') goto yy152;
+               goto yy145;
+yy175:
+               YYDEBUG(175, *YYCURSOR);
                yyaccept = 2;
                YYMARKER = ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(180, *YYCURSOR);
+               YYDEBUG(176, *YYCURSOR);
                if (yybm[0+yych] & 16) {
-                       goto yy154;
+                       goto yy150;
                }
                if (yych <= '$') {
-                       if (yych == '\r') goto yy156;
-                       if (yych <= '#') goto yy149;
-                       goto yy167;
+                       if (yych == '\r') goto yy152;
+                       if (yych <= '#') goto yy145;
+                       goto yy163;
                } else {
                        if (yych <= '\\') {
-                               if (yych <= '[') goto yy149;
-                               goto yy171;
+                               if (yych <= '[') goto yy145;
+                               goto yy167;
                        } else {
-                               if (yych == '{') goto yy179;
-                               goto yy149;
+                               if (yych == '{') goto yy175;
+                               goto yy145;
                        }
                }
-yy181:
-               YYDEBUG(181, *YYCURSOR);
+yy177:
+               YYDEBUG(177, *YYCURSOR);
                yyaccept = 0;
                YYMARKER = ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
                if (yybm[0+yych] & 4) {
-                       goto yy149;
+                       goto yy145;
                }
                if (yych <= '[') {
-                       if (yych <= '\f') goto yy154;
-                       if (yych <= '\r') goto yy156;
-                       if (yych <= '@') goto yy183;
-                       goto yy151;
+                       if (yych <= '\f') goto yy150;
+                       if (yych <= '\r') goto yy152;
+                       if (yych <= '@') goto yy179;
+                       goto yy147;
                } else {
-                       if (yych <= '\\') goto yy153;
-                       if (yych != '{') goto yy151;
+                       if (yych <= '\\') goto yy149;
+                       if (yych != '{') goto yy147;
                }
-yy182:
-               YYDEBUG(182, *YYCURSOR);
+yy178:
+               YYDEBUG(178, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
                if (yybm[0+yych] & 16) {
-                       goto yy154;
+                       goto yy150;
                }
                if (yych <= '$') {
-                       if (yych == '\r') goto yy156;
-                       if (yych <= '#') goto yy149;
-                       goto yy161;
+                       if (yych == '\r') goto yy152;
+                       if (yych <= '#') goto yy145;
+                       goto yy157;
                } else {
                        if (yych <= '\\') {
-                               if (yych <= '[') goto yy149;
-                               goto yy153;
-                       } else {
-                               if (yych == '{') goto yy187;
+                               if (yych <= '[') goto yy145;
                                goto yy149;
+                       } else {
+                               if (yych == '{') goto yy183;
+                               goto yy145;
                        }
                }
-yy183:
-               YYDEBUG(183, *YYCURSOR);
+yy179:
+               YYDEBUG(179, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
                if (yybm[0+yych] & 4) {
-                       goto yy149;
+                       goto yy145;
                }
                if (yych <= '@') {
-                       if (yych <= '\f') goto yy154;
-                       if (yych <= '\r') goto yy156;
-                       goto yy185;
+                       if (yych <= '\f') goto yy150;
+                       if (yych <= '\r') goto yy152;
+                       goto yy181;
                } else {
-                       if (yych != '\\') goto yy161;
+                       if (yych != '\\') goto yy157;
                }
-yy184:
-               YYDEBUG(184, *YYCURSOR);
+yy180:
+               YYDEBUG(180, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
                if (yybm[0+yych] & 16) {
-                       goto yy154;
+                       goto yy150;
                }
-               if (yych == '\r') goto yy156;
-               goto yy149;
-yy185:
-               YYDEBUG(185, *YYCURSOR);
+               if (yych == '\r') goto yy152;
+               goto yy145;
+yy181:
+               YYDEBUG(181, *YYCURSOR);
                yyaccept = 2;
                YYMARKER = ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(186, *YYCURSOR);
+               YYDEBUG(182, *YYCURSOR);
                if (yybm[0+yych] & 4) {
-                       goto yy149;
+                       goto yy145;
                }
                if (yych <= '@') {
-                       if (yych <= '\f') goto yy154;
-                       if (yych <= '\r') goto yy156;
-                       goto yy185;
+                       if (yych <= '\f') goto yy150;
+                       if (yych <= '\r') goto yy152;
+                       goto yy181;
                } else {
-                       if (yych == '\\') goto yy184;
-                       goto yy167;
+                       if (yych == '\\') goto yy180;
+                       goto yy163;
                }
-yy187:
-               YYDEBUG(187, *YYCURSOR);
+yy183:
+               YYDEBUG(183, *YYCURSOR);
                yyaccept = 2;
                YYMARKER = ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(188, *YYCURSOR);
+               YYDEBUG(184, *YYCURSOR);
                if (yybm[0+yych] & 16) {
-                       goto yy154;
+                       goto yy150;
                }
                if (yych <= '$') {
-                       if (yych == '\r') goto yy156;
-                       if (yych <= '#') goto yy149;
-                       goto yy167;
+                       if (yych == '\r') goto yy152;
+                       if (yych <= '#') goto yy145;
+                       goto yy163;
                } else {
                        if (yych <= '\\') {
-                               if (yych <= '[') goto yy149;
-                               goto yy153;
-                       } else {
-                               if (yych == '{') goto yy187;
+                               if (yych <= '[') goto yy145;
                                goto yy149;
+                       } else {
+                               if (yych == '{') goto yy183;
+                               goto yy145;
                        }
                }
-yy189:
-               YYDEBUG(189, *YYCURSOR);
+yy185:
+               YYDEBUG(185, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
                if (yybm[0+yych] & 16) {
-                       goto yy154;
+                       goto yy150;
                }
                if (yych <= '$') {
-                       if (yych == '\r') goto yy156;
-                       if (yych <= '#') goto yy149;
-                       goto yy161;
+                       if (yych == '\r') goto yy152;
+                       if (yych <= '#') goto yy145;
+                       goto yy157;
                } else {
                        if (yych <= '\\') {
-                               if (yych <= '[') goto yy149;
-                               goto yy153;
-                       } else {
-                               if (yych == '{') goto yy193;
+                               if (yych <= '[') goto yy145;
                                goto yy149;
+                       } else {
+                               if (yych == '{') goto yy189;
+                               goto yy145;
                        }
                }
-yy190:
-               YYDEBUG(190, *YYCURSOR);
+yy186:
+               YYDEBUG(186, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
                if (yybm[0+yych] & 4) {
-                       goto yy149;
+                       goto yy145;
                }
                if (yych <= '@') {
-                       if (yych <= '\f') goto yy154;
-                       if (yych <= '\r') goto yy156;
+                       if (yych <= '\f') goto yy150;
+                       if (yych <= '\r') goto yy152;
                } else {
-                       if (yych == '\\') goto yy184;
-                       goto yy161;
+                       if (yych == '\\') goto yy180;
+                       goto yy157;
                }
-yy191:
-               YYDEBUG(191, *YYCURSOR);
+yy187:
+               YYDEBUG(187, *YYCURSOR);
                yyaccept = 2;
                YYMARKER = ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(192, *YYCURSOR);
+               YYDEBUG(188, *YYCURSOR);
                if (yybm[0+yych] & 4) {
-                       goto yy149;
+                       goto yy145;
                }
                if (yych <= '@') {
-                       if (yych <= '\f') goto yy154;
-                       if (yych <= '\r') goto yy156;
-                       goto yy191;
+                       if (yych <= '\f') goto yy150;
+                       if (yych <= '\r') goto yy152;
+                       goto yy187;
                } else {
-                       if (yych == '\\') goto yy184;
-                       goto yy167;
+                       if (yych == '\\') goto yy180;
+                       goto yy163;
                }
-yy193:
-               YYDEBUG(193, *YYCURSOR);
+yy189:
+               YYDEBUG(189, *YYCURSOR);
                yyaccept = 2;
                YYMARKER = ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(194, *YYCURSOR);
+               YYDEBUG(190, *YYCURSOR);
                if (yybm[0+yych] & 16) {
-                       goto yy154;
+                       goto yy150;
                }
                if (yych <= '$') {
-                       if (yych == '\r') goto yy156;
-                       if (yych <= '#') goto yy149;
-                       goto yy167;
+                       if (yych == '\r') goto yy152;
+                       if (yych <= '#') goto yy145;
+                       goto yy163;
                } else {
                        if (yych <= '\\') {
-                               if (yych <= '[') goto yy149;
-                               goto yy153;
-                       } else {
-                               if (yych == '{') goto yy193;
+                               if (yych <= '[') goto yy145;
                                goto yy149;
+                       } else {
+                               if (yych == '{') goto yy189;
+                               goto yy145;
                        }
                }
-yy195:
-               YYDEBUG(195, *YYCURSOR);
+yy191:
+               YYDEBUG(191, *YYCURSOR);
                yyaccept = 3;
                YYMARKER = ++YYCURSOR;
                YYFILL(3);
                yych = *YYCURSOR;
-               YYDEBUG(196, *YYCURSOR);
+               YYDEBUG(192, *YYCURSOR);
                if (yych <= 'Z') {
                        if (yych <= '/') {
-                               if (yych == '-') goto yy200;
+                               if (yych == '-') goto yy196;
                        } else {
-                               if (yych <= '9') goto yy195;
-                               if (yych >= 'A') goto yy195;
+                               if (yych <= '9') goto yy191;
+                               if (yych >= 'A') goto yy191;
                        }
                } else {
                        if (yych <= '_') {
-                               if (yych <= '[') goto yy201;
-                               if (yych >= '_') goto yy195;
+                               if (yych <= '[') goto yy197;
+                               if (yych >= '_') goto yy191;
                        } else {
-                               if (yych <= '`') goto yy197;
-                               if (yych <= 'z') goto yy195;
-                               if (yych >= 0x7F) goto yy195;
+                               if (yych <= '`') goto yy193;
+                               if (yych <= 'z') goto yy191;
+                               if (yych >= 0x7F) goto yy191;
                        }
                }
-yy197:
-               YYDEBUG(197, *YYCURSOR);
+yy193:
+               YYDEBUG(193, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1695 "Zend/zend_language_scanner.l"
                {
@@ -3002,27 +2971,27 @@ yy197:
        zendlval->type = IS_STRING;
        return T_VARIABLE;
 }
-#line 3006 "Zend/zend_language_scanner.c"
-yy198:
-               YYDEBUG(198, *YYCURSOR);
+#line 2975 "Zend/zend_language_scanner.c"
+yy194:
+               YYDEBUG(194, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(199, *YYCURSOR);
+               YYDEBUG(195, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1349 "Zend/zend_language_scanner.l"
                {
        yy_push_state(ST_LOOKING_FOR_VARNAME TSRMLS_CC);
        return T_DOLLAR_OPEN_CURLY_BRACES;
 }
-#line 3017 "Zend/zend_language_scanner.c"
-yy200:
-               YYDEBUG(200, *YYCURSOR);
+#line 2986 "Zend/zend_language_scanner.c"
+yy196:
+               YYDEBUG(196, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == '>') goto yy203;
-               goto yy161;
-yy201:
-               YYDEBUG(201, *YYCURSOR);
+               if (yych == '>') goto yy199;
+               goto yy157;
+yy197:
+               YYDEBUG(197, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(202, *YYCURSOR);
+               YYDEBUG(198, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1687 "Zend/zend_language_scanner.l"
                {
@@ -3032,23 +3001,23 @@ yy201:
        zendlval->type = IS_STRING;
        return T_VARIABLE;
 }
-#line 3036 "Zend/zend_language_scanner.c"
-yy203:
-               YYDEBUG(203, *YYCURSOR);
+#line 3005 "Zend/zend_language_scanner.c"
+yy199:
+               YYDEBUG(199, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych <= '_') {
-                       if (yych <= '@') goto yy161;
-                       if (yych <= 'Z') goto yy204;
-                       if (yych <= '^') goto yy161;
+                       if (yych <= '@') goto yy157;
+                       if (yych <= 'Z') goto yy200;
+                       if (yych <= '^') goto yy157;
                } else {
-                       if (yych <= '`') goto yy161;
-                       if (yych <= 'z') goto yy204;
-                       if (yych <= '~') goto yy161;
+                       if (yych <= '`') goto yy157;
+                       if (yych <= 'z') goto yy200;
+                       if (yych <= '~') goto yy157;
                }
-yy204:
-               YYDEBUG(204, *YYCURSOR);
+yy200:
+               YYDEBUG(200, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(205, *YYCURSOR);
+               YYDEBUG(201, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1677 "Zend/zend_language_scanner.l"
                {
@@ -3058,7 +3027,7 @@ yy204:
        zendlval->type = IS_STRING;
        return T_VARIABLE;
 }
-#line 3062 "Zend/zend_language_scanner.c"
+#line 3031 "Zend/zend_language_scanner.c"
        }
 /* *********************************** */
 yyc_ST_IN_SCRIPTING:
@@ -3131,7 +3100,7 @@ yyc_ST_IN_SCRIPTING:
                        128, 128, 128, 128, 128, 128, 128, 128, 
                        128, 128, 128, 128, 128, 128, 128, 128, 
                };
-               YYDEBUG(206, *YYCURSOR);
+               YYDEBUG(202, *YYCURSOR);
                YYFILL(16);
                yych = *YYCURSOR;
                YYDEBUG(-1, yych);
@@ -3165,32 +3134,32 @@ yyc_ST_IN_SCRIPTING:
                case 0x1D:
                case 0x1E:
                case 0x1F:
-               case '\\':      goto yy266;
+               case '\\':      goto yy262;
                case '\t':
                case '\n':
                case '\r':
-               case ' ':       goto yy224;
-               case '!':       goto yy235;
-               case '"':       goto yy260;
-               case '#':       goto yy258;
-               case '$':       goto yy247;
-               case '%':       goto yy241;
-               case '&':       goto yy242;
-               case '\'':      goto yy262;
-               case '(':       goto yy229;
+               case ' ':       goto yy220;
+               case '!':       goto yy231;
+               case '"':       goto yy256;
+               case '#':       goto yy254;
+               case '$':       goto yy243;
+               case '%':       goto yy237;
+               case '&':       goto yy238;
+               case '\'':      goto yy258;
+               case '(':       goto yy225;
                case ')':
                case ',':
                case ';':
                case '@':
                case '[':
                case ']':
-               case '~':       goto yy248;
-               case '*':       goto yy238;
-               case '+':       goto yy234;
-               case '-':       goto yy222;
-               case '.':       goto yy240;
-               case '/':       goto yy239;
-               case '0':       goto yy254;
+               case '~':       goto yy244;
+               case '*':       goto yy234;
+               case '+':       goto yy230;
+               case '-':       goto yy218;
+               case '.':       goto yy236;
+               case '/':       goto yy235;
+               case '0':       goto yy250;
                case '1':
                case '2':
                case '3':
@@ -3199,79 +3168,79 @@ yyc_ST_IN_SCRIPTING:
                case '6':
                case '7':
                case '8':
-               case '9':       goto yy256;
-               case ':':       goto yy226;
-               case '<':       goto yy236;
-               case '=':       goto yy232;
-               case '>':       goto yy237;
-               case '?':       goto yy249;
+               case '9':       goto yy252;
+               case ':':       goto yy222;
+               case '<':       goto yy232;
+               case '=':       goto yy228;
+               case '>':       goto yy233;
+               case '?':       goto yy245;
                case 'A':
-               case 'a':       goto yy217;
+               case 'a':       goto yy213;
                case 'B':
-               case 'b':       goto yy219;
+               case 'b':       goto yy215;
                case 'C':
-               case 'c':       goto yy212;
+               case 'c':       goto yy208;
                case 'D':
-               case 'd':       goto yy210;
+               case 'd':       goto yy206;
                case 'E':
-               case 'e':       goto yy208;
+               case 'e':       goto yy204;
                case 'F':
-               case 'f':       goto yy211;
+               case 'f':       goto yy207;
                case 'G':
-               case 'g':       goto yy220;
+               case 'g':       goto yy216;
                case 'I':
-               case 'i':       goto yy215;
+               case 'i':       goto yy211;
                case 'L':
-               case 'l':       goto yy233;
+               case 'l':       goto yy229;
                case 'N':
-               case 'n':       goto yy227;
+               case 'n':       goto yy223;
                case 'O':
-               case 'o':       goto yy245;
+               case 'o':       goto yy241;
                case 'P':
-               case 'p':       goto yy221;
+               case 'p':       goto yy217;
                case 'R':
-               case 'r':       goto yy213;
+               case 'r':       goto yy209;
                case 'S':
-               case 's':       goto yy218;
+               case 's':       goto yy214;
                case 'T':
-               case 't':       goto yy214;
+               case 't':       goto yy210;
                case 'U':
-               case 'u':       goto yy230;
+               case 'u':       goto yy226;
                case 'V':
-               case 'v':       goto yy228;
+               case 'v':       goto yy224;
                case 'W':
-               case 'w':       goto yy216;
+               case 'w':       goto yy212;
                case 'X':
-               case 'x':       goto yy246;
-               case '^':       goto yy244;
-               case '_':       goto yy231;
-               case '`':       goto yy264;
-               case '{':       goto yy250;
-               case '|':       goto yy243;
-               case '}':       goto yy252;
-               default:        goto yy257;
+               case 'x':       goto yy242;
+               case '^':       goto yy240;
+               case '_':       goto yy227;
+               case '`':       goto yy260;
+               case '{':       goto yy246;
+               case '|':       goto yy239;
+               case '}':       goto yy248;
+               default:        goto yy253;
                }
-yy208:
-               YYDEBUG(208, *YYCURSOR);
+yy204:
+               YYDEBUG(204, *YYCURSOR);
                ++YYCURSOR;
                YYDEBUG(-1, yych);
                switch ((yych = *YYCURSOR)) {
                case 'C':
-               case 'c':       goto yy802;
+               case 'c':       goto yy794;
                case 'L':
-               case 'l':       goto yy803;
+               case 'l':       goto yy795;
                case 'M':
-               case 'm':       goto yy804;
+               case 'm':       goto yy796;
                case 'N':
-               case 'n':       goto yy805;
+               case 'n':       goto yy797;
                case 'V':
-               case 'v':       goto yy806;
+               case 'v':       goto yy798;
                case 'X':
-               case 'x':       goto yy807;
-               default:        goto yy284;
+               case 'x':       goto yy799;
+               default:        goto yy280;
                }
-yy209:
-               YYDEBUG(209, *YYCURSOR);
+yy205:
+               YYDEBUG(205, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1719 "Zend/zend_language_scanner.l"
                {
@@ -3279,265 +3248,265 @@ yy209:
        zendlval->type = IS_STRING;
        return T_STRING;
 }
-#line 3283 "Zend/zend_language_scanner.c"
-yy210:
-               YYDEBUG(210, *YYCURSOR);
+#line 3252 "Zend/zend_language_scanner.c"
+yy206:
+               YYDEBUG(206, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych <= 'O') {
                        if (yych <= 'H') {
-                               if (yych == 'E') goto yy784;
-                               goto yy284;
+                               if (yych == 'E') goto yy776;
+                               goto yy280;
                        } else {
-                               if (yych <= 'I') goto yy785;
-                               if (yych <= 'N') goto yy284;
-                               goto yy786;
+                               if (yych <= 'I') goto yy777;
+                               if (yych <= 'N') goto yy280;
+                               goto yy778;
                        }
                } else {
                        if (yych <= 'h') {
-                               if (yych == 'e') goto yy784;
-                               goto yy284;
+                               if (yych == 'e') goto yy776;
+                               goto yy280;
                        } else {
-                               if (yych <= 'i') goto yy785;
-                               if (yych == 'o') goto yy786;
-                               goto yy284;
+                               if (yych <= 'i') goto yy777;
+                               if (yych == 'o') goto yy778;
+                               goto yy280;
                        }
                }
-yy211:
-               YYDEBUG(211, *YYCURSOR);
+yy207:
+               YYDEBUG(207, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych <= 'U') {
                        if (yych <= 'N') {
-                               if (yych == 'I') goto yy763;
-                               goto yy284;
+                               if (yych == 'I') goto yy755;
+                               goto yy280;
                        } else {
-                               if (yych <= 'O') goto yy764;
-                               if (yych <= 'T') goto yy284;
-                               goto yy765;
+                               if (yych <= 'O') goto yy756;
+                               if (yych <= 'T') goto yy280;
+                               goto yy757;
                        }
                } else {
                        if (yych <= 'n') {
-                               if (yych == 'i') goto yy763;
-                               goto yy284;
+                               if (yych == 'i') goto yy755;
+                               goto yy280;
                        } else {
-                               if (yych <= 'o') goto yy764;
-                               if (yych == 'u') goto yy765;
-                               goto yy284;
+                               if (yych <= 'o') goto yy756;
+                               if (yych == 'u') goto yy757;
+                               goto yy280;
                        }
                }
-yy212:
-               YYDEBUG(212, *YYCURSOR);
+yy208:
+               YYDEBUG(208, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych <= 'O') {
                        if (yych <= 'K') {
-                               if (yych == 'A') goto yy735;
-                               goto yy284;
+                               if (yych == 'A') goto yy727;
+                               goto yy280;
                        } else {
-                               if (yych <= 'L') goto yy736;
-                               if (yych <= 'N') goto yy284;
-                               goto yy737;
+                               if (yych <= 'L') goto yy728;
+                               if (yych <= 'N') goto yy280;
+                               goto yy729;
                        }
                } else {
                        if (yych <= 'k') {
-                               if (yych == 'a') goto yy735;
-                               goto yy284;
+                               if (yych == 'a') goto yy727;
+                               goto yy280;
                        } else {
-                               if (yych <= 'l') goto yy736;
-                               if (yych == 'o') goto yy737;
-                               goto yy284;
+                               if (yych <= 'l') goto yy728;
+                               if (yych == 'o') goto yy729;
+                               goto yy280;
                        }
                }
-yy213:
-               YYDEBUG(213, *YYCURSOR);
+yy209:
+               YYDEBUG(209, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'E') goto yy717;
-               if (yych == 'e') goto yy717;
-               goto yy284;
-yy214:
-               YYDEBUG(214, *YYCURSOR);
+               if (yych == 'E') goto yy709;
+               if (yych == 'e') goto yy709;
+               goto yy280;
+yy210:
+               YYDEBUG(210, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych <= 'R') {
-                       if (yych == 'H') goto yy709;
-                       if (yych <= 'Q') goto yy284;
-                       goto yy710;
+                       if (yych == 'H') goto yy701;
+                       if (yych <= 'Q') goto yy280;
+                       goto yy702;
                } else {
                        if (yych <= 'h') {
-                               if (yych <= 'g') goto yy284;
-                               goto yy709;
+                               if (yych <= 'g') goto yy280;
+                               goto yy701;
                        } else {
-                               if (yych == 'r') goto yy710;
-                               goto yy284;
+                               if (yych == 'r') goto yy702;
+                               goto yy280;
                        }
                }
-yy215:
-               YYDEBUG(215, *YYCURSOR);
+yy211:
+               YYDEBUG(211, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych <= 'S') {
                        if (yych <= 'L') {
-                               if (yych == 'F') goto yy662;
-                               goto yy284;
+                               if (yych == 'F') goto yy654;
+                               goto yy280;
                        } else {
-                               if (yych <= 'M') goto yy664;
-                               if (yych <= 'N') goto yy665;
-                               if (yych <= 'R') goto yy284;
-                               goto yy666;
+                               if (yych <= 'M') goto yy656;
+                               if (yych <= 'N') goto yy657;
+                               if (yych <= 'R') goto yy280;
+                               goto yy658;
                        }
                } else {
                        if (yych <= 'm') {
-                               if (yych == 'f') goto yy662;
-                               if (yych <= 'l') goto yy284;
-                               goto yy664;
+                               if (yych == 'f') goto yy654;
+                               if (yych <= 'l') goto yy280;
+                               goto yy656;
                        } else {
-                               if (yych <= 'n') goto yy665;
-                               if (yych == 's') goto yy666;
-                               goto yy284;
+                               if (yych <= 'n') goto yy657;
+                               if (yych == 's') goto yy658;
+                               goto yy280;
                        }
                }
-yy216:
-               YYDEBUG(216, *YYCURSOR);
+yy212:
+               YYDEBUG(212, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'H') goto yy657;
-               if (yych == 'h') goto yy657;
-               goto yy284;
-yy217:
-               YYDEBUG(217, *YYCURSOR);
+               if (yych == 'H') goto yy649;
+               if (yych == 'h') goto yy649;
+               goto yy280;
+yy213:
+               YYDEBUG(213, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych <= 'S') {
                        if (yych <= 'M') {
-                               if (yych == 'B') goto yy639;
-                               goto yy284;
+                               if (yych == 'B') goto yy631;
+                               goto yy280;
                        } else {
-                               if (yych <= 'N') goto yy640;
-                               if (yych <= 'Q') goto yy284;
-                               if (yych <= 'R') goto yy641;
-                               goto yy642;
+                               if (yych <= 'N') goto yy632;
+                               if (yych <= 'Q') goto yy280;
+                               if (yych <= 'R') goto yy633;
+                               goto yy634;
                        }
                } else {
                        if (yych <= 'n') {
-                               if (yych == 'b') goto yy639;
-                               if (yych <= 'm') goto yy284;
-                               goto yy640;
+                               if (yych == 'b') goto yy631;
+                               if (yych <= 'm') goto yy280;
+                               goto yy632;
                        } else {
-                               if (yych <= 'q') goto yy284;
-                               if (yych <= 'r') goto yy641;
-                               if (yych <= 's') goto yy642;
-                               goto yy284;
+                               if (yych <= 'q') goto yy280;
+                               if (yych <= 'r') goto yy633;
+                               if (yych <= 's') goto yy634;
+                               goto yy280;
                        }
                }
-yy218:
-               YYDEBUG(218, *YYCURSOR);
+yy214:
+               YYDEBUG(214, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych <= 'W') {
-                       if (yych == 'T') goto yy627;
-                       if (yych <= 'V') goto yy284;
-                       goto yy628;
+                       if (yych == 'T') goto yy619;
+                       if (yych <= 'V') goto yy280;
+                       goto yy620;
                } else {
                        if (yych <= 't') {
-                               if (yych <= 's') goto yy284;
-                               goto yy627;
+                               if (yych <= 's') goto yy280;
+                               goto yy619;
                        } else {
-                               if (yych == 'w') goto yy628;
-                               goto yy284;
+                               if (yych == 'w') goto yy620;
+                               goto yy280;
                        }
                }
-yy219:
-               YYDEBUG(219, *YYCURSOR);
+yy215:
+               YYDEBUG(215, *YYCURSOR);
                yyaccept = 0;
                yych = *(YYMARKER = ++YYCURSOR);
                if (yych <= 'Q') {
                        if (yych <= '/') {
                                if (yych <= '"') {
-                                       if (yych <= '!') goto yy209;
-                                       goto yy620;
+                                       if (yych <= '!') goto yy205;
+                                       goto yy612;
                                } else {
-                                       if (yych == '\'') goto yy267;
-                                       goto yy209;
+                                       if (yych == '\'') goto yy263;
+                                       goto yy205;
                                }
                        } else {
                                if (yych <= ';') {
-                                       if (yych <= '9') goto yy283;
-                                       goto yy209;
+                                       if (yych <= '9') goto yy279;
+                                       goto yy205;
                                } else {
-                                       if (yych <= '<') goto yy619;
-                                       if (yych <= '@') goto yy209;
-                                       goto yy283;
+                                       if (yych <= '<') goto yy611;
+                                       if (yych <= '@') goto yy205;
+                                       goto yy279;
                                }
                        }
                } else {
                        if (yych <= '`') {
                                if (yych <= 'Z') {
-                                       if (yych <= 'R') goto yy621;
-                                       goto yy283;
+                                       if (yych <= 'R') goto yy613;
+                                       goto yy279;
                                } else {
-                                       if (yych == '_') goto yy283;
-                                       goto yy209;
+                                       if (yych == '_') goto yy279;
+                                       goto yy205;
                                }
                        } else {
                                if (yych <= 'r') {
-                                       if (yych <= 'q') goto yy283;
-                                       goto yy621;
+                                       if (yych <= 'q') goto yy279;
+                                       goto yy613;
                                } else {
-                                       if (yych <= 'z') goto yy283;
-                                       if (yych <= '~') goto yy209;
-                                       goto yy283;
+                                       if (yych <= 'z') goto yy279;
+                                       if (yych <= '~') goto yy205;
+                                       goto yy279;
                                }
                        }
                }
-yy220:
-               YYDEBUG(220, *YYCURSOR);
+yy216:
+               YYDEBUG(216, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych <= 'O') {
-                       if (yych == 'L') goto yy609;
-                       if (yych <= 'N') goto yy284;
-                       goto yy610;
+                       if (yych == 'L') goto yy601;
+                       if (yych <= 'N') goto yy280;
+                       goto yy602;
                } else {
                        if (yych <= 'l') {
-                               if (yych <= 'k') goto yy284;
-                               goto yy609;
+                               if (yych <= 'k') goto yy280;
+                               goto yy601;
                        } else {
-                               if (yych == 'o') goto yy610;
-                               goto yy284;
+                               if (yych == 'o') goto yy602;
+                               goto yy280;
                        }
                }
-yy221:
-               YYDEBUG(221, *YYCURSOR);
+yy217:
+               YYDEBUG(217, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych <= 'U') {
-                       if (yych == 'R') goto yy585;
-                       if (yych <= 'T') goto yy284;
-                       goto yy586;
+                       if (yych == 'R') goto yy577;
+                       if (yych <= 'T') goto yy280;
+                       goto yy578;
                } else {
                        if (yych <= 'r') {
-                               if (yych <= 'q') goto yy284;
-                               goto yy585;
+                               if (yych <= 'q') goto yy280;
+                               goto yy577;
                        } else {
-                               if (yych == 'u') goto yy586;
-                               goto yy284;
+                               if (yych == 'u') goto yy578;
+                               goto yy280;
                        }
                }
-yy222:
-               YYDEBUG(222, *YYCURSOR);
+yy218:
+               YYDEBUG(218, *YYCURSOR);
                ++YYCURSOR;
                if ((yych = *YYCURSOR) <= '<') {
-                       if (yych == '-') goto yy581;
+                       if (yych == '-') goto yy573;
                } else {
-                       if (yych <= '=') goto yy579;
-                       if (yych <= '>') goto yy583;
+                       if (yych <= '=') goto yy571;
+                       if (yych <= '>') goto yy575;
                }
-yy223:
-               YYDEBUG(223, *YYCURSOR);
+yy219:
+               YYDEBUG(219, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1338 "Zend/zend_language_scanner.l"
                {
        return yytext[0];
 }
-#line 3534 "Zend/zend_language_scanner.c"
-yy224:
-               YYDEBUG(224, *YYCURSOR);
+#line 3503 "Zend/zend_language_scanner.c"
+yy220:
+               YYDEBUG(220, *YYCURSOR);
                ++YYCURSOR;
                yych = *YYCURSOR;
-               goto yy578;
-yy225:
-               YYDEBUG(225, *YYCURSOR);
+               goto yy570;
+yy221:
+               YYDEBUG(221, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1077 "Zend/zend_language_scanner.l"
                {
@@ -3547,249 +3516,249 @@ yy225:
        HANDLE_NEWLINES(yytext, yyleng);
        return T_WHITESPACE;
 }
-#line 3551 "Zend/zend_language_scanner.c"
-yy226:
-               YYDEBUG(226, *YYCURSOR);
+#line 3520 "Zend/zend_language_scanner.c"
+yy222:
+               YYDEBUG(222, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == ':') goto yy575;
-               goto yy223;
-yy227:
-               YYDEBUG(227, *YYCURSOR);
+               if (yych == ':') goto yy567;
+               goto yy219;
+yy223:
+               YYDEBUG(223, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych <= 'E') {
-                       if (yych == 'A') goto yy563;
-                       if (yych <= 'D') goto yy284;
-                       goto yy564;
+                       if (yych == 'A') goto yy555;
+                       if (yych <= 'D') goto yy280;
+                       goto yy556;
                } else {
                        if (yych <= 'a') {
-                               if (yych <= '`') goto yy284;
-                               goto yy563;
+                               if (yych <= '`') goto yy280;
+                               goto yy555;
                        } else {
-                               if (yych == 'e') goto yy564;
-                               goto yy284;
+                               if (yych == 'e') goto yy556;
+                               goto yy280;
                        }
                }
-yy228:
-               YYDEBUG(228, *YYCURSOR);
+yy224:
+               YYDEBUG(224, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'A') goto yy560;
-               if (yych == 'a') goto yy560;
-               goto yy284;
-yy229:
-               YYDEBUG(229, *YYCURSOR);
+               if (yych == 'A') goto yy552;
+               if (yych == 'a') goto yy552;
+               goto yy280;
+yy225:
+               YYDEBUG(225, *YYCURSOR);
                yyaccept = 1;
                yych = *(YYMARKER = ++YYCURSOR);
                if (yych <= 'S') {
                        if (yych <= 'D') {
                                if (yych <= ' ') {
-                                       if (yych == '\t') goto yy481;
-                                       if (yych <= 0x1F) goto yy223;
-                                       goto yy481;
+                                       if (yych == '\t') goto yy473;
+                                       if (yych <= 0x1F) goto yy219;
+                                       goto yy473;
                                } else {
-                                       if (yych <= '@') goto yy223;
-                                       if (yych == 'C') goto yy223;
-                                       goto yy481;
+                                       if (yych <= '@') goto yy219;
+                                       if (yych == 'C') goto yy219;
+                                       goto yy473;
                                }
                        } else {
                                if (yych <= 'I') {
-                                       if (yych == 'F') goto yy481;
-                                       if (yych <= 'H') goto yy223;
-                                       goto yy481;
+                                       if (yych == 'F') goto yy473;
+                                       if (yych <= 'H') goto yy219;
+                                       goto yy473;
                                } else {
-                                       if (yych == 'O') goto yy481;
-                                       if (yych <= 'Q') goto yy223;
-                                       goto yy481;
+                                       if (yych == 'O') goto yy473;
+                                       if (yych <= 'Q') goto yy219;
+                                       goto yy473;
                                }
                        }
                } else {
                        if (yych <= 'f') {
                                if (yych <= 'b') {
-                                       if (yych == 'U') goto yy481;
-                                       if (yych <= '`') goto yy223;
-                                       goto yy481;
+                                       if (yych == 'U') goto yy473;
+                                       if (yych <= '`') goto yy219;
+                                       goto yy473;
                                } else {
-                                       if (yych == 'd') goto yy481;
-                                       if (yych <= 'e') goto yy223;
-                                       goto yy481;
+                                       if (yych == 'd') goto yy473;
+                                       if (yych <= 'e') goto yy219;
+                                       goto yy473;
                                }
                        } else {
                                if (yych <= 'o') {
-                                       if (yych == 'i') goto yy481;
-                                       if (yych <= 'n') goto yy223;
-                                       goto yy481;
+                                       if (yych == 'i') goto yy473;
+                                       if (yych <= 'n') goto yy219;
+                                       goto yy473;
                                } else {
                                        if (yych <= 's') {
-                                               if (yych <= 'q') goto yy223;
-                                               goto yy481;
+                                               if (yych <= 'q') goto yy219;
+                                               goto yy473;
                                        } else {
-                                               if (yych == 'u') goto yy481;
-                                               goto yy223;
+                                               if (yych == 'u') goto yy473;
+                                               goto yy219;
                                        }
                                }
                        }
                }
-yy230:
-               YYDEBUG(230, *YYCURSOR);
+yy226:
+               YYDEBUG(226, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych <= 'S') {
-                       if (yych == 'N') goto yy472;
-                       if (yych <= 'R') goto yy284;
-                       goto yy473;
+                       if (yych == 'N') goto yy464;
+                       if (yych <= 'R') goto yy280;
+                       goto yy465;
                } else {
                        if (yych <= 'n') {
-                               if (yych <= 'm') goto yy284;
-                               goto yy472;
+                               if (yych <= 'm') goto yy280;
+                               goto yy464;
                        } else {
-                               if (yych == 's') goto yy473;
-                               goto yy284;
+                               if (yych == 's') goto yy465;
+                               goto yy280;
                        }
                }
+yy227:
+               YYDEBUG(227, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == '_') goto yy390;
+               goto yy280;
+yy228:
+               YYDEBUG(228, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych <= '<') goto yy219;
+               if (yych <= '=') goto yy384;
+               if (yych <= '>') goto yy386;
+               goto yy219;
+yy229:
+               YYDEBUG(229, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'I') goto yy380;
+               if (yych == 'i') goto yy380;
+               goto yy280;
+yy230:
+               YYDEBUG(230, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == '+') goto yy378;
+               if (yych == '=') goto yy376;
+               goto yy219;
 yy231:
                YYDEBUG(231, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == '_') goto yy398;
-               goto yy284;
+               if (yych == '=') goto yy373;
+               goto yy219;
 yy232:
                YYDEBUG(232, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych <= '<') goto yy223;
-               if (yych <= '=') goto yy392;
-               if (yych <= '>') goto yy394;
-               goto yy223;
+               yyaccept = 1;
+               yych = *(YYMARKER = ++YYCURSOR);
+               if (yych <= ';') {
+                       if (yych == '/') goto yy345;
+                       goto yy219;
+               } else {
+                       if (yych <= '<') goto yy343;
+                       if (yych <= '=') goto yy346;
+                       if (yych <= '>') goto yy348;
+                       goto yy219;
+               }
 yy233:
                YYDEBUG(233, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'I') goto yy388;
-               if (yych == 'i') goto yy388;
-               goto yy284;
+               if (yych <= '<') goto yy219;
+               if (yych <= '=') goto yy339;
+               if (yych <= '>') goto yy337;
+               goto yy219;
 yy234:
                YYDEBUG(234, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == '+') goto yy386;
-               if (yych == '=') goto yy384;
-               goto yy223;
+               if (yych == '=') goto yy335;
+               goto yy219;
 yy235:
                YYDEBUG(235, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == '=') goto yy381;
-               goto yy223;
-yy236:
-               YYDEBUG(236, *YYCURSOR);
-               yyaccept = 1;
-               yych = *(YYMARKER = ++YYCURSOR);
-               if (yych <= ';') {
-                       if (yych == '/') goto yy349;
-                       goto yy223;
+               if (yych <= '.') {
+                       if (yych == '*') goto yy326;
+                       goto yy219;
                } else {
-                       if (yych <= '<') goto yy347;
-                       if (yych <= '=') goto yy350;
-                       if (yych <= '>') goto yy352;
-                       goto yy223;
+                       if (yych <= '/') goto yy328;
+                       if (yych == '=') goto yy329;
+                       goto yy219;
                }
+yy236:
+               YYDEBUG(236, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych <= '/') goto yy219;
+               if (yych <= '9') goto yy322;
+               if (yych == '=') goto yy324;
+               goto yy219;
 yy237:
                YYDEBUG(237, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych <= '<') goto yy223;
-               if (yych <= '=') goto yy343;
-               if (yych <= '>') goto yy341;
-               goto yy223;
+               if (yych <= '<') goto yy219;
+               if (yych <= '=') goto yy318;
+               if (yych <= '>') goto yy316;
+               goto yy219;
 yy238:
                YYDEBUG(238, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == '=') goto yy339;
-               goto yy223;
+               if (yych == '&') goto yy312;
+               if (yych == '=') goto yy314;
+               goto yy219;
 yy239:
                YYDEBUG(239, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych <= '.') {
-                       if (yych == '*') goto yy330;
-                       goto yy223;
-               } else {
-                       if (yych <= '/') goto yy332;
-                       if (yych == '=') goto yy333;
-                       goto yy223;
-               }
+               if (yych == '=') goto yy310;
+               if (yych == '|') goto yy308;
+               goto yy219;
 yy240:
                YYDEBUG(240, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych <= '/') goto yy223;
-               if (yych <= '9') goto yy326;
-               if (yych == '=') goto yy328;
-               goto yy223;
+               if (yych == '=') goto yy306;
+               goto yy219;
 yy241:
                YYDEBUG(241, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych <= '<') goto yy223;
-               if (yych <= '=') goto yy322;
-               if (yych <= '>') goto yy320;
-               goto yy223;
+               if (yych == 'R') goto yy304;
+               if (yych == 'r') goto yy304;
+               goto yy280;
 yy242:
                YYDEBUG(242, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == '&') goto yy316;
-               if (yych == '=') goto yy318;
-               goto yy223;
+               if (yych == 'O') goto yy301;
+               if (yych == 'o') goto yy301;
+               goto yy280;
 yy243:
                YYDEBUG(243, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == '=') goto yy314;
-               if (yych == '|') goto yy312;
-               goto yy223;
+               if (yych <= '_') {
+                       if (yych <= '@') goto yy219;
+                       if (yych <= 'Z') goto yy298;
+                       if (yych <= '^') goto yy219;
+                       goto yy298;
+               } else {
+                       if (yych <= '`') goto yy219;
+                       if (yych <= 'z') goto yy298;
+                       if (yych <= '~') goto yy219;
+                       goto yy298;
+               }
 yy244:
                YYDEBUG(244, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == '=') goto yy310;
-               goto yy223;
+               goto yy219;
 yy245:
                YYDEBUG(245, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'R') goto yy308;
-               if (yych == 'r') goto yy308;
-               goto yy284;
+               if (yych == '>') goto yy294;
+               goto yy219;
 yy246:
                YYDEBUG(246, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'O') goto yy305;
-               if (yych == 'o') goto yy305;
-               goto yy284;
-yy247:
-               YYDEBUG(247, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych <= '_') {
-                       if (yych <= '@') goto yy223;
-                       if (yych <= 'Z') goto yy302;
-                       if (yych <= '^') goto yy223;
-                       goto yy302;
-               } else {
-                       if (yych <= '`') goto yy223;
-                       if (yych <= 'z') goto yy302;
-                       if (yych <= '~') goto yy223;
-                       goto yy302;
-               }
-yy248:
-               YYDEBUG(248, *YYCURSOR);
-               yych = *++YYCURSOR;
-               goto yy223;
-yy249:
-               YYDEBUG(249, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == '>') goto yy298;
-               goto yy223;
-yy250:
-               YYDEBUG(250, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(251, *YYCURSOR);
+               YYDEBUG(247, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1343 "Zend/zend_language_scanner.l"
                {
        yy_push_state(ST_IN_SCRIPTING TSRMLS_CC);
        return '{';
 }
-#line 3789 "Zend/zend_language_scanner.c"
-yy252:
-               YYDEBUG(252, *YYCURSOR);
+#line 3758 "Zend/zend_language_scanner.c"
+yy248:
+               YYDEBUG(248, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(253, *YYCURSOR);
+               YYDEBUG(249, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1355 "Zend/zend_language_scanner.l"
                {
@@ -3799,28 +3768,28 @@ yy252:
        }
        return '}';
 }
-#line 3803 "Zend/zend_language_scanner.c"
-yy254:
-               YYDEBUG(254, *YYCURSOR);
+#line 3772 "Zend/zend_language_scanner.c"
+yy250:
+               YYDEBUG(250, *YYCURSOR);
                yyaccept = 2;
                yych = *(YYMARKER = ++YYCURSOR);
                if (yych <= 'E') {
                        if (yych <= '/') {
-                               if (yych == '.') goto yy285;
+                               if (yych == '.') goto yy281;
                        } else {
-                               if (yych <= '9') goto yy288;
-                               if (yych >= 'E') goto yy290;
+                               if (yych <= '9') goto yy284;
+                               if (yych >= 'E') goto yy286;
                        }
                } else {
                        if (yych <= 'd') {
-                               if (yych == 'X') goto yy294;
+                               if (yych == 'X') goto yy290;
                        } else {
-                               if (yych <= 'e') goto yy290;
-                               if (yych == 'x') goto yy294;
+                               if (yych <= 'e') goto yy286;
+                               if (yych == 'x') goto yy290;
                        }
                }
-yy255:
-               YYDEBUG(255, *YYCURSOR);
+yy251:
+               YYDEBUG(251, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1381 "Zend/zend_language_scanner.l"
                {
@@ -3843,103 +3812,103 @@ yy255:
        zendlval->type = IS_LONG;
        return T_LNUMBER;
 }
-#line 3847 "Zend/zend_language_scanner.c"
-yy256:
-               YYDEBUG(256, *YYCURSOR);
+#line 3816 "Zend/zend_language_scanner.c"
+yy252:
+               YYDEBUG(252, *YYCURSOR);
                yyaccept = 2;
                yych = *(YYMARKER = ++YYCURSOR);
                if (yych <= '9') {
-                       if (yych == '.') goto yy285;
-                       if (yych <= '/') goto yy255;
-                       goto yy288;
+                       if (yych == '.') goto yy281;
+                       if (yych <= '/') goto yy251;
+                       goto yy284;
                } else {
                        if (yych <= 'E') {
-                               if (yych <= 'D') goto yy255;
-                               goto yy290;
+                               if (yych <= 'D') goto yy251;
+                               goto yy286;
                        } else {
-                               if (yych == 'e') goto yy290;
-                               goto yy255;
+                               if (yych == 'e') goto yy286;
+                               goto yy251;
                        }
                }
-yy257:
-               YYDEBUG(257, *YYCURSOR);
+yy253:
+               YYDEBUG(253, *YYCURSOR);
                yych = *++YYCURSOR;
-               goto yy284;
-yy258:
-               YYDEBUG(258, *YYCURSOR);
+               goto yy280;
+yy254:
+               YYDEBUG(254, *YYCURSOR);
                ++YYCURSOR;
-yy259:
-               YYDEBUG(259, *YYCURSOR);
+yy255:
+               YYDEBUG(255, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1726 "Zend/zend_language_scanner.l"
                {
        BEGIN(ST_ONE_LINE_COMMENT);
        yymore();
 }
-#line 3880 "Zend/zend_language_scanner.c"
-yy260:
-               YYDEBUG(260, *YYCURSOR);
+#line 3849 "Zend/zend_language_scanner.c"
+yy256:
+               YYDEBUG(256, *YYCURSOR);
                yyaccept = 3;
                yych = *(YYMARKER = ++YYCURSOR);
-               goto yy276;
-yy261:
-               YYDEBUG(261, *YYCURSOR);
+               goto yy272;
+yy257:
+               YYDEBUG(257, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1893 "Zend/zend_language_scanner.l"
                {
        BEGIN(ST_DOUBLE_QUOTES);
        return '"';
 }
-#line 3894 "Zend/zend_language_scanner.c"
-yy262:
-               YYDEBUG(262, *YYCURSOR);
+#line 3863 "Zend/zend_language_scanner.c"
+yy258:
+               YYDEBUG(258, *YYCURSOR);
                yyaccept = 4;
                yych = *(YYMARKER = ++YYCURSOR);
-               goto yy268;
-yy263:
-               YYDEBUG(263, *YYCURSOR);
+               goto yy264;
+yy259:
+               YYDEBUG(259, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2179 "Zend/zend_language_scanner.l"
+#line 2116 "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 3908 "Zend/zend_language_scanner.c"
-yy264:
-               YYDEBUG(264, *YYCURSOR);
+#line 3877 "Zend/zend_language_scanner.c"
+yy260:
+               YYDEBUG(260, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(265, *YYCURSOR);
+               YYDEBUG(261, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1921 "Zend/zend_language_scanner.l"
+#line 1944 "Zend/zend_language_scanner.l"
                {
        BEGIN(ST_BACKQUOTE);
        return '`';
 }
-#line 3919 "Zend/zend_language_scanner.c"
-yy266:
-               YYDEBUG(266, *YYCURSOR);
+#line 3888 "Zend/zend_language_scanner.c"
+yy262:
+               YYDEBUG(262, *YYCURSOR);
                yych = *++YYCURSOR;
-               goto yy263;
-yy267:
-               YYDEBUG(267, *YYCURSOR);
+               goto yy259;
+yy263:
+               YYDEBUG(263, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-yy268:
-               YYDEBUG(268, *YYCURSOR);
+yy264:
+               YYDEBUG(264, *YYCURSOR);
                if (yybm[256+yych] & 128) {
-                       goto yy267;
+                       goto yy263;
                }
-               if (yych <= '[') goto yy270;
-               YYDEBUG(269, *YYCURSOR);
+               if (yych <= '[') goto yy266;
+               YYDEBUG(265, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               goto yy267;
-yy270:
-               YYDEBUG(270, *YYCURSOR);
+               goto yy263;
+yy266:
+               YYDEBUG(266, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(271, *YYCURSOR);
+               YYDEBUG(267, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1842 "Zend/zend_language_scanner.l"
                {
@@ -3991,102 +3960,102 @@ yy270:
 #endif /* ZEND_MULTIBYTE */
        return T_CONSTANT_ENCAPSED_STRING;
 }
-#line 3995 "Zend/zend_language_scanner.c"
-yy272:
-               YYDEBUG(272, *YYCURSOR);
+#line 3964 "Zend/zend_language_scanner.c"
+yy268:
+               YYDEBUG(268, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(273, *YYCURSOR);
+               YYDEBUG(269, *YYCURSOR);
                if (yybm[0+yych] & 2) {
-                       goto yy275;
+                       goto yy271;
                }
-               if (yych <= '#') goto yy280;
-               if (yych <= '$') goto yy274;
-               if (yych <= 'z') goto yy277;
-               goto yy272;
-yy274:
-               YYDEBUG(274, *YYCURSOR);
+               if (yych <= '#') goto yy276;
+               if (yych <= '$') goto yy270;
+               if (yych <= 'z') goto yy273;
+               goto yy268;
+yy270:
+               YYDEBUG(270, *YYCURSOR);
                YYCURSOR = YYMARKER;
                if (yyaccept <= 3) {
                        if (yyaccept <= 1) {
                                if (yyaccept <= 0) {
-                                       goto yy209;
+                                       goto yy205;
                                } else {
-                                       goto yy223;
+                                       goto yy219;
                                }
                        } else {
                                if (yyaccept <= 2) {
-                                       goto yy255;
+                                       goto yy251;
                                } else {
-                                       goto yy261;
+                                       goto yy257;
                                }
                        }
                } else {
                        if (yyaccept <= 5) {
                                if (yyaccept <= 4) {
-                                       goto yy263;
+                                       goto yy259;
                                } else {
-                                       goto yy287;
+                                       goto yy283;
                                }
                        } else {
                                if (yyaccept <= 6) {
-                                       goto yy331;
+                                       goto yy327;
                                } else {
-                                       goto yy348;
+                                       goto yy344;
                                }
                        }
                }
-yy275:
-               YYDEBUG(275, *YYCURSOR);
+yy271:
+               YYDEBUG(271, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-yy276:
-               YYDEBUG(276, *YYCURSOR);
+yy272:
+               YYDEBUG(272, *YYCURSOR);
                if (yybm[0+yych] & 2) {
-                       goto yy275;
+                       goto yy271;
                }
-               if (yych <= '#') goto yy280;
-               if (yych <= '$') goto yy278;
-               if (yych >= '{') goto yy272;
-yy277:
-               YYDEBUG(277, *YYCURSOR);
+               if (yych <= '#') goto yy276;
+               if (yych <= '$') goto yy274;
+               if (yych >= '{') goto yy268;
+yy273:
+               YYDEBUG(273, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               goto yy275;
-yy278:
-               YYDEBUG(278, *YYCURSOR);
+               goto yy271;
+yy274:
+               YYDEBUG(274, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(279, *YYCURSOR);
+               YYDEBUG(275, *YYCURSOR);
                if (yybm[0+yych] & 4) {
-                       goto yy278;
+                       goto yy274;
                }
                if (yych <= '\\') {
                        if (yych <= '@') {
-                               if (yych != '"') goto yy275;
+                               if (yych != '"') goto yy271;
                        } else {
-                               if (yych <= 'Z') goto yy274;
-                               if (yych <= '[') goto yy275;
-                               goto yy282;
+                               if (yych <= 'Z') goto yy270;
+                               if (yych <= '[') goto yy271;
+                               goto yy278;
                        }
                } else {
                        if (yych <= '`') {
-                               if (yych == '_') goto yy274;
-                               goto yy275;
+                               if (yych == '_') goto yy270;
+                               goto yy271;
                        } else {
-                               if (yych <= '{') goto yy274;
-                               if (yych <= '~') goto yy275;
-                               goto yy274;
+                               if (yych <= '{') goto yy270;
+                               if (yych <= '~') goto yy271;
+                               goto yy270;
                        }
                }
-yy280:
-               YYDEBUG(280, *YYCURSOR);
+yy276:
+               YYDEBUG(276, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(281, *YYCURSOR);
+               YYDEBUG(277, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1834 "Zend/zend_language_scanner.l"
                {
@@ -4095,38 +4064,38 @@ yy280:
        zend_scan_escape_string(zendlval, yytext+bprefix+1, yyleng-bprefix-2, '"' TSRMLS_CC);
        return T_CONSTANT_ENCAPSED_STRING;
 }
-#line 4099 "Zend/zend_language_scanner.c"
-yy282:
-               YYDEBUG(282, *YYCURSOR);
+#line 4068 "Zend/zend_language_scanner.c"
+yy278:
+               YYDEBUG(278, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               goto yy275;
-yy283:
-               YYDEBUG(283, *YYCURSOR);
+               goto yy271;
+yy279:
+               YYDEBUG(279, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-yy284:
-               YYDEBUG(284, *YYCURSOR);
+yy280:
+               YYDEBUG(280, *YYCURSOR);
                if (yybm[0+yych] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
-               goto yy209;
-yy285:
-               YYDEBUG(285, *YYCURSOR);
+               goto yy205;
+yy281:
+               YYDEBUG(281, *YYCURSOR);
                yyaccept = 5;
                YYMARKER = ++YYCURSOR;
                YYFILL(3);
                yych = *YYCURSOR;
-               YYDEBUG(286, *YYCURSOR);
+               YYDEBUG(282, *YYCURSOR);
                if (yybm[0+yych] & 16) {
-                       goto yy285;
+                       goto yy281;
                }
-               if (yych == 'E') goto yy290;
-               if (yych == 'e') goto yy290;
-yy287:
-               YYDEBUG(287, *YYCURSOR);
+               if (yych == 'E') goto yy286;
+               if (yych == 'e') goto yy286;
+yy283:
+               YYDEBUG(283, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1442 "Zend/zend_language_scanner.l"
                {
@@ -4134,67 +4103,67 @@ yy287:
        zendlval->type = IS_DOUBLE;
        return T_DNUMBER;
 }
-#line 4138 "Zend/zend_language_scanner.c"
-yy288:
-               YYDEBUG(288, *YYCURSOR);
+#line 4107 "Zend/zend_language_scanner.c"
+yy284:
+               YYDEBUG(284, *YYCURSOR);
                yyaccept = 2;
                YYMARKER = ++YYCURSOR;
                YYFILL(3);
                yych = *YYCURSOR;
-               YYDEBUG(289, *YYCURSOR);
+               YYDEBUG(285, *YYCURSOR);
                if (yych <= '9') {
-                       if (yych == '.') goto yy285;
-                       if (yych <= '/') goto yy255;
-                       goto yy288;
+                       if (yych == '.') goto yy281;
+                       if (yych <= '/') goto yy251;
+                       goto yy284;
                } else {
                        if (yych <= 'E') {
-                               if (yych <= 'D') goto yy255;
+                               if (yych <= 'D') goto yy251;
                        } else {
-                               if (yych != 'e') goto yy255;
+                               if (yych != 'e') goto yy251;
                        }
                }
-yy290:
-               YYDEBUG(290, *YYCURSOR);
+yy286:
+               YYDEBUG(286, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych <= ',') {
-                       if (yych != '+') goto yy274;
+                       if (yych != '+') goto yy270;
                } else {
-                       if (yych <= '-') goto yy291;
-                       if (yych <= '/') goto yy274;
-                       if (yych <= '9') goto yy292;
-                       goto yy274;
+                       if (yych <= '-') goto yy287;
+                       if (yych <= '/') goto yy270;
+                       if (yych <= '9') goto yy288;
+                       goto yy270;
                }
-yy291:
-               YYDEBUG(291, *YYCURSOR);
+yy287:
+               YYDEBUG(287, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych <= '/') goto yy274;
-               if (yych >= ':') goto yy274;
-yy292:
-               YYDEBUG(292, *YYCURSOR);
+               if (yych <= '/') goto yy270;
+               if (yych >= ':') goto yy270;
+yy288:
+               YYDEBUG(288, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(293, *YYCURSOR);
-               if (yych <= '/') goto yy287;
-               if (yych <= '9') goto yy292;
-               goto yy287;
-yy294:
-               YYDEBUG(294, *YYCURSOR);
+               YYDEBUG(289, *YYCURSOR);
+               if (yych <= '/') goto yy283;
+               if (yych <= '9') goto yy288;
+               goto yy283;
+yy290:
+               YYDEBUG(290, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yybm[0+yych] & 32) {
-                       goto yy295;
+                       goto yy291;
                }
-               goto yy274;
-yy295:
-               YYDEBUG(295, *YYCURSOR);
+               goto yy270;
+yy291:
+               YYDEBUG(291, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(296, *YYCURSOR);
+               YYDEBUG(292, *YYCURSOR);
                if (yybm[0+yych] & 32) {
-                       goto yy295;
+                       goto yy291;
                }
-               YYDEBUG(297, *YYCURSOR);
+               YYDEBUG(293, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1402 "Zend/zend_language_scanner.l"
                {
@@ -4217,14 +4186,14 @@ yy295:
                return T_DNUMBER;
        }
 }
-#line 4221 "Zend/zend_language_scanner.c"
-yy298:
-               YYDEBUG(298, *YYCURSOR);
+#line 4190 "Zend/zend_language_scanner.c"
+yy294:
+               YYDEBUG(294, *YYCURSOR);
                ++YYCURSOR;
-               if ((yych = *YYCURSOR) == '\n') goto yy300;
-               if (yych == '\r') goto yy301;
-yy299:
-               YYDEBUG(299, *YYCURSOR);
+               if ((yych = *YYCURSOR) == '\n') goto yy296;
+               if (yych == '\r') goto yy297;
+yy295:
+               YYDEBUG(295, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1809 "Zend/zend_language_scanner.l"
                {
@@ -4234,39 +4203,39 @@ yy299:
        BEGIN(INITIAL);
        return T_CLOSE_TAG;  /* implicit ';' at php-end tag */
 }
-#line 4238 "Zend/zend_language_scanner.c"
-yy300:
-               YYDEBUG(300, *YYCURSOR);
+#line 4207 "Zend/zend_language_scanner.c"
+yy296:
+               YYDEBUG(296, *YYCURSOR);
                yych = *++YYCURSOR;
-               goto yy299;
-yy301:
-               YYDEBUG(301, *YYCURSOR);
+               goto yy295;
+yy297:
+               YYDEBUG(297, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == '\n') goto yy300;
-               goto yy299;
-yy302:
-               YYDEBUG(302, *YYCURSOR);
+               if (yych == '\n') goto yy296;
+               goto yy295;
+yy298:
+               YYDEBUG(298, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(303, *YYCURSOR);
+               YYDEBUG(299, *YYCURSOR);
                if (yych <= '^') {
                        if (yych <= '9') {
-                               if (yych >= '0') goto yy302;
+                               if (yych >= '0') goto yy298;
                        } else {
-                               if (yych <= '@') goto yy304;
-                               if (yych <= 'Z') goto yy302;
+                               if (yych <= '@') goto yy300;
+                               if (yych <= 'Z') goto yy298;
                        }
                } else {
                        if (yych <= '`') {
-                               if (yych <= '_') goto yy302;
+                               if (yych <= '_') goto yy298;
                        } else {
-                               if (yych <= 'z') goto yy302;
-                               if (yych >= 0x7F) goto yy302;
+                               if (yych <= 'z') goto yy298;
+                               if (yych >= 0x7F) goto yy298;
                        }
                }
-yy304:
-               YYDEBUG(304, *YYCURSOR);
+yy300:
+               YYDEBUG(300, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1695 "Zend/zend_language_scanner.l"
                {
@@ -4274,95 +4243,95 @@ yy304:
        zendlval->type = IS_STRING;
        return T_VARIABLE;
 }
-#line 4278 "Zend/zend_language_scanner.c"
-yy305:
-               YYDEBUG(305, *YYCURSOR);
+#line 4247 "Zend/zend_language_scanner.c"
+yy301:
+               YYDEBUG(301, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'R') goto yy306;
-               if (yych != 'r') goto yy284;
-yy306:
-               YYDEBUG(306, *YYCURSOR);
+               if (yych == 'R') goto yy302;
+               if (yych != 'r') goto yy280;
+yy302:
+               YYDEBUG(302, *YYCURSOR);
                ++YYCURSOR;
                if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
-               YYDEBUG(307, *YYCURSOR);
+               YYDEBUG(303, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1326 "Zend/zend_language_scanner.l"
                {
        return T_LOGICAL_XOR;
 }
-#line 4296 "Zend/zend_language_scanner.c"
-yy308:
-               YYDEBUG(308, *YYCURSOR);
+#line 4265 "Zend/zend_language_scanner.c"
+yy304:
+               YYDEBUG(304, *YYCURSOR);
                ++YYCURSOR;
                if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
-               YYDEBUG(309, *YYCURSOR);
+               YYDEBUG(305, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1318 "Zend/zend_language_scanner.l"
                {
        return T_LOGICAL_OR;
 }
-#line 4309 "Zend/zend_language_scanner.c"
-yy310:
-               YYDEBUG(310, *YYCURSOR);
+#line 4278 "Zend/zend_language_scanner.c"
+yy306:
+               YYDEBUG(306, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(311, *YYCURSOR);
+               YYDEBUG(307, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1306 "Zend/zend_language_scanner.l"
                {
        return T_XOR_EQUAL;
 }
-#line 4319 "Zend/zend_language_scanner.c"
-yy312:
-               YYDEBUG(312, *YYCURSOR);
+#line 4288 "Zend/zend_language_scanner.c"
+yy308:
+               YYDEBUG(308, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(313, *YYCURSOR);
+               YYDEBUG(309, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1310 "Zend/zend_language_scanner.l"
                {
        return T_BOOLEAN_OR;
 }
-#line 4329 "Zend/zend_language_scanner.c"
-yy314:
-               YYDEBUG(314, *YYCURSOR);
+#line 4298 "Zend/zend_language_scanner.c"
+yy310:
+               YYDEBUG(310, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(315, *YYCURSOR);
+               YYDEBUG(311, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1302 "Zend/zend_language_scanner.l"
                {
        return T_OR_EQUAL;
 }
-#line 4339 "Zend/zend_language_scanner.c"
-yy316:
-               YYDEBUG(316, *YYCURSOR);
+#line 4308 "Zend/zend_language_scanner.c"
+yy312:
+               YYDEBUG(312, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(317, *YYCURSOR);
+               YYDEBUG(313, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1314 "Zend/zend_language_scanner.l"
                {
        return T_BOOLEAN_AND;
 }
-#line 4349 "Zend/zend_language_scanner.c"
-yy318:
-               YYDEBUG(318, *YYCURSOR);
+#line 4318 "Zend/zend_language_scanner.c"
+yy314:
+               YYDEBUG(314, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(319, *YYCURSOR);
+               YYDEBUG(315, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1298 "Zend/zend_language_scanner.l"
                {
        return T_AND_EQUAL;
 }
-#line 4359 "Zend/zend_language_scanner.c"
-yy320:
-               YYDEBUG(320, *YYCURSOR);
+#line 4328 "Zend/zend_language_scanner.c"
+yy316:
+               YYDEBUG(316, *YYCURSOR);
                ++YYCURSOR;
-               if ((yych = *YYCURSOR) == '\n') goto yy324;
-               if (yych == '\r') goto yy325;
-yy321:
-               YYDEBUG(321, *YYCURSOR);
+               if ((yych = *YYCURSOR) == '\n') goto yy320;
+               if (yych == '\r') goto yy321;
+yy317:
+               YYDEBUG(317, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1818 "Zend/zend_language_scanner.l"
                {
@@ -4377,97 +4346,97 @@ yy321:
                return yytext[0];
        }
 }
-#line 4381 "Zend/zend_language_scanner.c"
-yy322:
-               YYDEBUG(322, *YYCURSOR);
+#line 4350 "Zend/zend_language_scanner.c"
+yy318:
+               YYDEBUG(318, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(323, *YYCURSOR);
+               YYDEBUG(319, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1286 "Zend/zend_language_scanner.l"
                {
        return T_MOD_EQUAL;
 }
-#line 4391 "Zend/zend_language_scanner.c"
-yy324:
-               YYDEBUG(324, *YYCURSOR);
+#line 4360 "Zend/zend_language_scanner.c"
+yy320:
+               YYDEBUG(320, *YYCURSOR);
                yych = *++YYCURSOR;
-               goto yy321;
-yy325:
-               YYDEBUG(325, *YYCURSOR);
+               goto yy317;
+yy321:
+               YYDEBUG(321, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == '\n') goto yy324;
-               goto yy321;
-yy326:
-               YYDEBUG(326, *YYCURSOR);
+               if (yych == '\n') goto yy320;
+               goto yy317;
+yy322:
+               YYDEBUG(322, *YYCURSOR);
                yyaccept = 5;
                YYMARKER = ++YYCURSOR;
                YYFILL(3);
                yych = *YYCURSOR;
-               YYDEBUG(327, *YYCURSOR);
+               YYDEBUG(323, *YYCURSOR);
                if (yych <= 'D') {
-                       if (yych <= '/') goto yy287;
-                       if (yych <= '9') goto yy326;
-                       goto yy287;
+                       if (yych <= '/') goto yy283;
+                       if (yych <= '9') goto yy322;
+                       goto yy283;
                } else {
-                       if (yych <= 'E') goto yy290;
-                       if (yych == 'e') goto yy290;
-                       goto yy287;
+                       if (yych <= 'E') goto yy286;
+                       if (yych == 'e') goto yy286;
+                       goto yy283;
                }
-yy328:
-               YYDEBUG(328, *YYCURSOR);
+yy324:
+               YYDEBUG(324, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(329, *YYCURSOR);
+               YYDEBUG(325, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1282 "Zend/zend_language_scanner.l"
                {
        return T_CONCAT_EQUAL;
 }
-#line 4426 "Zend/zend_language_scanner.c"
-yy330:
-               YYDEBUG(330, *YYCURSOR);
+#line 4395 "Zend/zend_language_scanner.c"
+yy326:
+               YYDEBUG(326, *YYCURSOR);
                yyaccept = 6;
                yych = *(YYMARKER = ++YYCURSOR);
-               if (yych == '*') goto yy335;
-yy331:
-               YYDEBUG(331, *YYCURSOR);
+               if (yych == '*') goto yy331;
+yy327:
+               YYDEBUG(327, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1781 "Zend/zend_language_scanner.l"
                {
        BEGIN(ST_COMMENT);
        yymore();
 }
-#line 4440 "Zend/zend_language_scanner.c"
-yy332:
-               YYDEBUG(332, *YYCURSOR);
+#line 4409 "Zend/zend_language_scanner.c"
+yy328:
+               YYDEBUG(328, *YYCURSOR);
                yych = *++YYCURSOR;
-               goto yy259;
-yy333:
-               YYDEBUG(333, *YYCURSOR);
+               goto yy255;
+yy329:
+               YYDEBUG(329, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(334, *YYCURSOR);
+               YYDEBUG(330, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1278 "Zend/zend_language_scanner.l"
                {
        return T_DIV_EQUAL;
 }
-#line 4454 "Zend/zend_language_scanner.c"
-yy335:
-               YYDEBUG(335, *YYCURSOR);
+#line 4423 "Zend/zend_language_scanner.c"
+yy331:
+               YYDEBUG(331, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yybm[0+yych] & 64) {
-                       goto yy336;
+                       goto yy332;
                }
-               goto yy274;
-yy336:
-               YYDEBUG(336, *YYCURSOR);
+               goto yy270;
+yy332:
+               YYDEBUG(332, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(337, *YYCURSOR);
+               YYDEBUG(333, *YYCURSOR);
                if (yybm[0+yych] & 64) {
-                       goto yy336;
+                       goto yy332;
                }
-               YYDEBUG(338, *YYCURSOR);
+               YYDEBUG(334, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1775 "Zend/zend_language_scanner.l"
                {
@@ -4475,250 +4444,248 @@ yy336:
        BEGIN(ST_DOC_COMMENT);
        yymore();
 }
-#line 4479 "Zend/zend_language_scanner.c"
-yy339:
-               YYDEBUG(339, *YYCURSOR);
+#line 4448 "Zend/zend_language_scanner.c"
+yy335:
+               YYDEBUG(335, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(340, *YYCURSOR);
+               YYDEBUG(336, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1274 "Zend/zend_language_scanner.l"
                {
        return T_MUL_EQUAL;
 }
-#line 4489 "Zend/zend_language_scanner.c"
-yy341:
-               YYDEBUG(341, *YYCURSOR);
+#line 4458 "Zend/zend_language_scanner.c"
+yy337:
+               YYDEBUG(337, *YYCURSOR);
                ++YYCURSOR;
-               if ((yych = *YYCURSOR) == '=') goto yy345;
-               YYDEBUG(342, *YYCURSOR);
+               if ((yych = *YYCURSOR) == '=') goto yy341;
+               YYDEBUG(338, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1334 "Zend/zend_language_scanner.l"
                {
        return T_SR;
 }
-#line 4500 "Zend/zend_language_scanner.c"
-yy343:
-               YYDEBUG(343, *YYCURSOR);
+#line 4469 "Zend/zend_language_scanner.c"
+yy339:
+               YYDEBUG(339, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(344, *YYCURSOR);
+               YYDEBUG(340, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1262 "Zend/zend_language_scanner.l"
                {
        return T_IS_GREATER_OR_EQUAL;
 }
-#line 4510 "Zend/zend_language_scanner.c"
-yy345:
-               YYDEBUG(345, *YYCURSOR);
+#line 4479 "Zend/zend_language_scanner.c"
+yy341:
+               YYDEBUG(341, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(346, *YYCURSOR);
+               YYDEBUG(342, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1294 "Zend/zend_language_scanner.l"
                {
        return T_SR_EQUAL;
 }
-#line 4520 "Zend/zend_language_scanner.c"
-yy347:
-               YYDEBUG(347, *YYCURSOR);
+#line 4489 "Zend/zend_language_scanner.c"
+yy343:
+               YYDEBUG(343, *YYCURSOR);
                yyaccept = 7;
                yych = *(YYMARKER = ++YYCURSOR);
-               if (yych <= ';') goto yy348;
-               if (yych <= '<') goto yy363;
-               if (yych <= '=') goto yy361;
-yy348:
-               YYDEBUG(348, *YYCURSOR);
+               if (yych <= ';') goto yy344;
+               if (yych <= '<') goto yy359;
+               if (yych <= '=') goto yy357;
+yy344:
+               YYDEBUG(344, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1330 "Zend/zend_language_scanner.l"
                {
        return T_SL;
 }
-#line 4535 "Zend/zend_language_scanner.c"
-yy349:
-               YYDEBUG(349, *YYCURSOR);
+#line 4504 "Zend/zend_language_scanner.c"
+yy345:
+               YYDEBUG(345, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'S') goto yy354;
-               if (yych == 's') goto yy354;
-               goto yy274;
-yy350:
-               YYDEBUG(350, *YYCURSOR);
+               if (yych == 'S') goto yy350;
+               if (yych == 's') goto yy350;
+               goto yy270;
+yy346:
+               YYDEBUG(346, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(351, *YYCURSOR);
+               YYDEBUG(347, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1258 "Zend/zend_language_scanner.l"
                {
        return T_IS_SMALLER_OR_EQUAL;
 }
-#line 4551 "Zend/zend_language_scanner.c"
-yy352:
-               YYDEBUG(352, *YYCURSOR);
+#line 4520 "Zend/zend_language_scanner.c"
+yy348:
+               YYDEBUG(348, *YYCURSOR);
                ++YYCURSOR;
-yy353:
-               YYDEBUG(353, *YYCURSOR);
+yy349:
+               YYDEBUG(349, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1254 "Zend/zend_language_scanner.l"
                {
        return T_IS_NOT_EQUAL;
 }
-#line 4562 "Zend/zend_language_scanner.c"
-yy354:
-               YYDEBUG(354, *YYCURSOR);
+#line 4531 "Zend/zend_language_scanner.c"
+yy350:
+               YYDEBUG(350, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'C') goto yy355;
-               if (yych != 'c') goto yy274;
-yy355:
-               YYDEBUG(355, *YYCURSOR);
+               if (yych == 'C') goto yy351;
+               if (yych != 'c') goto yy270;
+yy351:
+               YYDEBUG(351, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'R') goto yy356;
-               if (yych != 'r') goto yy274;
-yy356:
-               YYDEBUG(356, *YYCURSOR);
+               if (yych == 'R') goto yy352;
+               if (yych != 'r') goto yy270;
+yy352:
+               YYDEBUG(352, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'I') goto yy357;
-               if (yych != 'i') goto yy274;
-yy357:
-               YYDEBUG(357, *YYCURSOR);
+               if (yych == 'I') goto yy353;
+               if (yych != 'i') goto yy270;
+yy353:
+               YYDEBUG(353, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'P') goto yy358;
-               if (yych != 'p') goto yy274;
-yy358:
-               YYDEBUG(358, *YYCURSOR);
+               if (yych == 'P') goto yy354;
+               if (yych != 'p') goto yy270;
+yy354:
+               YYDEBUG(354, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'T') goto yy359;
-               if (yych != 't') goto yy274;
-yy359:
-               YYDEBUG(359, *YYCURSOR);
+               if (yych == 'T') goto yy355;
+               if (yych != 't') goto yy270;
+yy355:
+               YYDEBUG(355, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(3);
                yych = *YYCURSOR;
-               YYDEBUG(360, *YYCURSOR);
+               YYDEBUG(356, *YYCURSOR);
                if (yych <= '\r') {
-                       if (yych <= 0x08) goto yy274;
-                       if (yych <= '\n') goto yy359;
-                       if (yych <= '\f') goto yy274;
-                       goto yy359;
+                       if (yych <= 0x08) goto yy270;
+                       if (yych <= '\n') goto yy355;
+                       if (yych <= '\f') goto yy270;
+                       goto yy355;
                } else {
                        if (yych <= ' ') {
-                               if (yych <= 0x1F) goto yy274;
-                               goto yy359;
+                               if (yych <= 0x1F) goto yy270;
+                               goto yy355;
                        } else {
-                               if (yych == '>') goto yy298;
-                               goto yy274;
+                               if (yych == '>') goto yy294;
+                               goto yy270;
                        }
                }
-yy361:
-               YYDEBUG(361, *YYCURSOR);
+yy357:
+               YYDEBUG(357, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(362, *YYCURSOR);
+               YYDEBUG(358, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1290 "Zend/zend_language_scanner.l"
                {
        return T_SL_EQUAL;
 }
-#line 4617 "Zend/zend_language_scanner.c"
-yy363:
-               YYDEBUG(363, *YYCURSOR);
+#line 4586 "Zend/zend_language_scanner.c"
+yy359:
+               YYDEBUG(359, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(2);
                yych = *YYCURSOR;
-               YYDEBUG(364, *YYCURSOR);
+               YYDEBUG(360, *YYCURSOR);
                if (yybm[0+yych] & 128) {
-                       goto yy363;
+                       goto yy359;
                }
                if (yych <= 'Z') {
                        if (yych <= '&') {
-                               if (yych == '"') goto yy368;
-                               goto yy274;
+                               if (yych == '"') goto yy364;
+                               goto yy270;
                        } else {
-                               if (yych <= '\'') goto yy365;
-                               if (yych <= '@') goto yy274;
-                               goto yy366;
+                               if (yych <= '\'') goto yy363;
+                               if (yych <= '@') goto yy270;
                        }
                } else {
                        if (yych <= '`') {
-                               if (yych == '_') goto yy366;
-                               goto yy274;
+                               if (yych != '_') goto yy270;
                        } else {
-                               if (yych <= 'z') goto yy366;
-                               if (yych <= '~') goto yy274;
-                               goto yy366;
+                               if (yych <= 'z') goto yy361;
+                               if (yych <= '~') goto yy270;
                        }
                }
-yy365:
-               YYDEBUG(365, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == '\'') goto yy274;
-               if (yych <= '/') goto yy376;
-               if (yych <= '9') goto yy274;
-               goto yy376;
-yy366:
-               YYDEBUG(366, *YYCURSOR);
+yy361:
+               YYDEBUG(361, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(2);
                yych = *YYCURSOR;
-               YYDEBUG(367, *YYCURSOR);
+               YYDEBUG(362, *YYCURSOR);
                if (yych <= '@') {
                        if (yych <= '\f') {
-                               if (yych == '\n') goto yy372;
-                               goto yy274;
+                               if (yych == '\n') goto yy368;
+                               goto yy270;
                        } else {
-                               if (yych <= '\r') goto yy374;
-                               if (yych <= '/') goto yy274;
-                               if (yych <= '9') goto yy366;
-                               goto yy274;
+                               if (yych <= '\r') goto yy370;
+                               if (yych <= '/') goto yy270;
+                               if (yych <= '9') goto yy361;
+                               goto yy270;
                        }
                } else {
                        if (yych <= '_') {
-                               if (yych <= 'Z') goto yy366;
-                               if (yych <= '^') goto yy274;
-                               goto yy366;
+                               if (yych <= 'Z') goto yy361;
+                               if (yych <= '^') goto yy270;
+                               goto yy361;
                        } else {
-                               if (yych <= '`') goto yy274;
-                               if (yych <= 'z') goto yy366;
-                               if (yych <= '~') goto yy274;
-                               goto yy366;
+                               if (yych <= '`') goto yy270;
+                               if (yych <= 'z') goto yy361;
+                               if (yych <= '~') goto yy270;
+                               goto yy361;
                        }
                }
-yy368:
-               YYDEBUG(368, *YYCURSOR);
+yy363:
+               YYDEBUG(363, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == '"') goto yy274;
-               if (yych <= '/') goto yy370;
-               if (yych <= '9') goto yy274;
-               goto yy370;
-yy369:
-               YYDEBUG(369, *YYCURSOR);
+               if (yych == '\'') goto yy270;
+               if (yych <= '/') goto yy372;
+               if (yych <= '9') goto yy270;
+               goto yy372;
+yy364:
+               YYDEBUG(364, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == '"') goto yy270;
+               if (yych <= '/') goto yy366;
+               if (yych <= '9') goto yy270;
+               goto yy366;
+yy365:
+               YYDEBUG(365, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(3);
                yych = *YYCURSOR;
-yy370:
-               YYDEBUG(370, *YYCURSOR);
+yy366:
+               YYDEBUG(366, *YYCURSOR);
                if (yych <= 'Z') {
                        if (yych <= '/') {
-                               if (yych != '"') goto yy274;
+                               if (yych != '"') goto yy270;
                        } else {
-                               if (yych <= '9') goto yy369;
-                               if (yych <= '@') goto yy274;
-                               goto yy369;
+                               if (yych <= '9') goto yy365;
+                               if (yych <= '@') goto yy270;
+                               goto yy365;
                        }
                } else {
                        if (yych <= '`') {
-                               if (yych == '_') goto yy369;
-                               goto yy274;
+                               if (yych == '_') goto yy365;
+                               goto yy270;
                        } else {
-                               if (yych <= 'z') goto yy369;
-                               if (yych <= '~') goto yy274;
-                               goto yy369;
+                               if (yych <= 'z') goto yy365;
+                               if (yych <= '~') goto yy270;
+                               goto yy365;
                        }
                }
-               YYDEBUG(371, *YYCURSOR);
+yy367:
+               YYDEBUG(367, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == '\n') goto yy372;
-               if (yych == '\r') goto yy374;
-               goto yy274;
-yy372:
-               YYDEBUG(372, *YYCURSOR);
+               if (yych == '\n') goto yy368;
+               if (yych == '\r') goto yy370;
+               goto yy270;
+yy368:
+               YYDEBUG(368, *YYCURSOR);
                ++YYCURSOR;
-yy373:
-               YYDEBUG(373, *YYCURSOR);
+yy369:
+               YYDEBUG(369, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1899 "Zend/zend_language_scanner.l"
                {
@@ -4733,256 +4700,246 @@ yy373:
                CG(heredoc_len)--;
        }
 
-       if (*s == '"') {
+       if (*s == '\'') {
                s++;
                CG(heredoc_len) -= 2;
+
+               BEGIN(ST_NOWDOC);
+       } else {
+               if (*s == '"') {
+                       s++;
+                       CG(heredoc_len) -= 2;
+               }
+
+               BEGIN(ST_HEREDOC);
        }
+
        CG(heredoc) = estrndup(s, CG(heredoc_len));
-       BEGIN(ST_START_HEREDOC);
+
+       /* Check for ending label on the next line */
+       if (CG(heredoc_len) < YYLIMIT - YYCURSOR && !memcmp(YYCURSOR, s, CG(heredoc_len))) {
+               char *end = YYCURSOR + CG(heredoc_len);
+
+               if (*end == ';') {
+                       end++;
+               }
+
+               if (*end == '\n' || *end == '\r') {
+                       BEGIN(ST_END_HEREDOC);
+               }
+       }
+
        return T_START_HEREDOC;
 }
-#line 4745 "Zend/zend_language_scanner.c"
-yy374:
-               YYDEBUG(374, *YYCURSOR);
+#line 4735 "Zend/zend_language_scanner.c"
+yy370:
+               YYDEBUG(370, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == '\n') goto yy372;
-               goto yy373;
-yy375:
-               YYDEBUG(375, *YYCURSOR);
+               if (yych == '\n') goto yy368;
+               goto yy369;
+yy371:
+               YYDEBUG(371, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(3);
                yych = *YYCURSOR;
-yy376:
-               YYDEBUG(376, *YYCURSOR);
+yy372:
+               YYDEBUG(372, *YYCURSOR);
                if (yych <= 'Z') {
                        if (yych <= '/') {
-                               if (yych != '\'') goto yy274;
+                               if (yych == '\'') goto yy367;
+                               goto yy270;
                        } else {
-                               if (yych <= '9') goto yy375;
-                               if (yych <= '@') goto yy274;
-                               goto yy375;
+                               if (yych <= '9') goto yy371;
+                               if (yych <= '@') goto yy270;
+                               goto yy371;
                        }
                } else {
                        if (yych <= '`') {
-                               if (yych == '_') goto yy375;
-                               goto yy274;
+                               if (yych == '_') goto yy371;
+                               goto yy270;
                        } else {
-                               if (yych <= 'z') goto yy375;
-                               if (yych <= '~') goto yy274;
-                               goto yy375;
+                               if (yych <= 'z') goto yy371;
+                               if (yych <= '~') goto yy270;
+                               goto yy371;
                        }
                }
-               YYDEBUG(377, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == '\n') goto yy378;
-               if (yych == '\r') goto yy380;
-               goto yy274;
-yy378:
-               YYDEBUG(378, *YYCURSOR);
-               ++YYCURSOR;
-yy379:
-               YYDEBUG(379, *YYCURSOR);
-               yyleng = YYCURSOR - SCNG(yy_text);
-#line 2070 "Zend/zend_language_scanner.l"
-               {
-       int bprefix = (yytext[0] != '<') ? 1 : 0;
-       char *s;
-       CG(zend_lineno)++;
-       /* 3 is <<<, 2 is quotes, 1 is newline */
-       CG(heredoc_len) = yyleng-bprefix-3-2-1-(yytext[yyleng-2]=='\r'?1:0);
-       s = yytext+bprefix+3;
-       while ((*s == ' ') || (*s == '\t')) {
-               s++;
-               CG(heredoc_len)--;
-       }
-       s++; /* first quote */
-       CG(heredoc) = estrndup(s, CG(heredoc_len));
-       BEGIN(ST_START_NOWDOC);
-       return T_START_NOWDOC;
-}
-#line 4804 "Zend/zend_language_scanner.c"
-yy380:
-               YYDEBUG(380, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == '\n') goto yy378;
-               goto yy379;
-yy381:
-               YYDEBUG(381, *YYCURSOR);
+yy373:
+               YYDEBUG(373, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != '=') goto yy353;
-               YYDEBUG(382, *YYCURSOR);
+               if (yych != '=') goto yy349;
+               YYDEBUG(374, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(383, *YYCURSOR);
+               YYDEBUG(375, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1246 "Zend/zend_language_scanner.l"
                {
        return T_IS_NOT_IDENTICAL;
 }
-#line 4822 "Zend/zend_language_scanner.c"
-yy384:
-               YYDEBUG(384, *YYCURSOR);
+#line 4779 "Zend/zend_language_scanner.c"
+yy376:
+               YYDEBUG(376, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(385, *YYCURSOR);
+               YYDEBUG(377, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1266 "Zend/zend_language_scanner.l"
                {
        return T_PLUS_EQUAL;
 }
-#line 4832 "Zend/zend_language_scanner.c"
-yy386:
-               YYDEBUG(386, *YYCURSOR);
+#line 4789 "Zend/zend_language_scanner.c"
+yy378:
+               YYDEBUG(378, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(387, *YYCURSOR);
+               YYDEBUG(379, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1234 "Zend/zend_language_scanner.l"
                {
        return T_INC;
 }
-#line 4842 "Zend/zend_language_scanner.c"
-yy388:
-               YYDEBUG(388, *YYCURSOR);
+#line 4799 "Zend/zend_language_scanner.c"
+yy380:
+               YYDEBUG(380, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'S') goto yy389;
-               if (yych != 's') goto yy284;
-yy389:
-               YYDEBUG(389, *YYCURSOR);
+               if (yych == 'S') goto yy381;
+               if (yych != 's') goto yy280;
+yy381:
+               YYDEBUG(381, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'T') goto yy390;
-               if (yych != 't') goto yy284;
-yy390:
-               YYDEBUG(390, *YYCURSOR);
+               if (yych == 'T') goto yy382;
+               if (yych != 't') goto yy280;
+yy382:
+               YYDEBUG(382, *YYCURSOR);
                ++YYCURSOR;
                if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
-               YYDEBUG(391, *YYCURSOR);
+               YYDEBUG(383, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1226 "Zend/zend_language_scanner.l"
                {
        return T_LIST;
 }
-#line 4865 "Zend/zend_language_scanner.c"
-yy392:
-               YYDEBUG(392, *YYCURSOR);
+#line 4822 "Zend/zend_language_scanner.c"
+yy384:
+               YYDEBUG(384, *YYCURSOR);
                ++YYCURSOR;
-               if ((yych = *YYCURSOR) == '=') goto yy396;
-               YYDEBUG(393, *YYCURSOR);
+               if ((yych = *YYCURSOR) == '=') goto yy388;
+               YYDEBUG(385, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1250 "Zend/zend_language_scanner.l"
                {
        return T_IS_EQUAL;
 }
-#line 4876 "Zend/zend_language_scanner.c"
-yy394:
-               YYDEBUG(394, *YYCURSOR);
+#line 4833 "Zend/zend_language_scanner.c"
+yy386:
+               YYDEBUG(386, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(395, *YYCURSOR);
+               YYDEBUG(387, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1222 "Zend/zend_language_scanner.l"
                {
        return T_DOUBLE_ARROW;
 }
-#line 4886 "Zend/zend_language_scanner.c"
-yy396:
-               YYDEBUG(396, *YYCURSOR);
+#line 4843 "Zend/zend_language_scanner.c"
+yy388:
+               YYDEBUG(388, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(397, *YYCURSOR);
+               YYDEBUG(389, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1242 "Zend/zend_language_scanner.l"
                {
        return T_IS_IDENTICAL;
 }
-#line 4896 "Zend/zend_language_scanner.c"
-yy398:
-               YYDEBUG(398, *YYCURSOR);
+#line 4853 "Zend/zend_language_scanner.c"
+yy390:
+               YYDEBUG(390, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych <= 'H') {
                        if (yych <= 'D') {
-                               if (yych <= 'B') goto yy284;
-                               if (yych <= 'C') goto yy400;
-                               goto yy404;
+                               if (yych <= 'B') goto yy280;
+                               if (yych <= 'C') goto yy392;
+                               goto yy396;
                        } else {
-                               if (yych == 'F') goto yy401;
-                               if (yych <= 'G') goto yy284;
+                               if (yych == 'F') goto yy393;
+                               if (yych <= 'G') goto yy280;
                        }
                } else {
                        if (yych <= 'M') {
-                               if (yych <= 'K') goto yy284;
-                               if (yych <= 'L') goto yy403;
-                               goto yy402;
+                               if (yych <= 'K') goto yy280;
+                               if (yych <= 'L') goto yy395;
+                               goto yy394;
                        } else {
-                               if (yych <= 'N') goto yy405;
-                               if (yych != 'h') goto yy284;
+                               if (yych <= 'N') goto yy397;
+                               if (yych != 'h') goto yy280;
                        }
                }
+               YYDEBUG(391, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'A') goto yy451;
+               if (yych == 'a') goto yy451;
+               goto yy280;
+yy392:
+               YYDEBUG(392, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'L') goto yy444;
+               goto yy280;
+yy393:
+               YYDEBUG(393, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'I') goto yy428;
+               if (yych == 'U') goto yy429;
+               goto yy280;
+yy394:
+               YYDEBUG(394, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'E') goto yy420;
+               goto yy280;
+yy395:
+               YYDEBUG(395, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'I') goto yy414;
+               goto yy280;
+yy396:
+               YYDEBUG(396, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'I') goto yy409;
+               goto yy280;
+yy397:
+               YYDEBUG(397, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych != 'A') goto yy280;
+               YYDEBUG(398, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych != 'M') goto yy280;
                YYDEBUG(399, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'A') goto yy459;
-               if (yych == 'a') goto yy459;
-               goto yy284;
-yy400:
+               if (yych != 'E') goto yy280;
                YYDEBUG(400, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'L') goto yy452;
-               goto yy284;
-yy401:
+               if (yych != 'S') goto yy280;
                YYDEBUG(401, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'I') goto yy436;
-               if (yych == 'U') goto yy437;
-               goto yy284;
-yy402:
+               if (yych != 'P') goto yy280;
                YYDEBUG(402, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'E') goto yy428;
-               goto yy284;
-yy403:
+               if (yych != 'A') goto yy280;
                YYDEBUG(403, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'I') goto yy422;
-               goto yy284;
-yy404:
+               if (yych != 'C') goto yy280;
                YYDEBUG(404, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'I') goto yy417;
-               goto yy284;
-yy405:
+               if (yych != 'E') goto yy280;
                YYDEBUG(405, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != 'A') goto yy284;
+               if (yych != '_') goto yy280;
                YYDEBUG(406, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != 'M') goto yy284;
+               if (yych != '_') goto yy280;
                YYDEBUG(407, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych != 'E') goto yy284;
-               YYDEBUG(408, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych != 'S') goto yy284;
-               YYDEBUG(409, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych != 'P') goto yy284;
-               YYDEBUG(410, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych != 'A') goto yy284;
-               YYDEBUG(411, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych != 'C') goto yy284;
-               YYDEBUG(412, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych != 'E') goto yy284;
-               YYDEBUG(413, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych != '_') goto yy284;
-               YYDEBUG(414, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych != '_') goto yy284;
-               YYDEBUG(415, *YYCURSOR);
                ++YYCURSOR;
                if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
-               YYDEBUG(416, *YYCURSOR);
+               YYDEBUG(408, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1546 "Zend/zend_language_scanner.l"
                {
@@ -4994,23 +4951,23 @@ yy405:
        }
        return T_NS_C;
 }
-#line 4998 "Zend/zend_language_scanner.c"
-yy417:
-               YYDEBUG(417, *YYCURSOR);
+#line 4955 "Zend/zend_language_scanner.c"
+yy409:
+               YYDEBUG(409, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != 'R') goto yy284;
-               YYDEBUG(418, *YYCURSOR);
+               if (yych != 'R') goto yy280;
+               YYDEBUG(410, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != '_') goto yy284;
-               YYDEBUG(419, *YYCURSOR);
+               if (yych != '_') goto yy280;
+               YYDEBUG(411, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != '_') goto yy284;
-               YYDEBUG(420, *YYCURSOR);
+               if (yych != '_') goto yy280;
+               YYDEBUG(412, *YYCURSOR);
                ++YYCURSOR;
                if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
-               YYDEBUG(421, *YYCURSOR);
+               YYDEBUG(413, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1519 "Zend/zend_language_scanner.l"
                {
@@ -5039,26 +4996,26 @@ yy417:
        zendlval->type = IS_STRING;
        return T_DIR;
 }
-#line 5043 "Zend/zend_language_scanner.c"
-yy422:
-               YYDEBUG(422, *YYCURSOR);
+#line 5000 "Zend/zend_language_scanner.c"
+yy414:
+               YYDEBUG(414, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != 'N') goto yy284;
-               YYDEBUG(423, *YYCURSOR);
+               if (yych != 'N') goto yy280;
+               YYDEBUG(415, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != 'E') goto yy284;
-               YYDEBUG(424, *YYCURSOR);
+               if (yych != 'E') goto yy280;
+               YYDEBUG(416, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != '_') goto yy284;
-               YYDEBUG(425, *YYCURSOR);
+               if (yych != '_') goto yy280;
+               YYDEBUG(417, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != '_') goto yy284;
-               YYDEBUG(426, *YYCURSOR);
+               if (yych != '_') goto yy280;
+               YYDEBUG(418, *YYCURSOR);
                ++YYCURSOR;
                if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
-               YYDEBUG(427, *YYCURSOR);
+               YYDEBUG(419, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1501 "Zend/zend_language_scanner.l"
                {
@@ -5066,32 +5023,32 @@ yy422:
        zendlval->type = IS_LONG;
        return T_LINE;
 }
-#line 5070 "Zend/zend_language_scanner.c"
-yy428:
-               YYDEBUG(428, *YYCURSOR);
+#line 5027 "Zend/zend_language_scanner.c"
+yy420:
+               YYDEBUG(420, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != 'T') goto yy284;
-               YYDEBUG(429, *YYCURSOR);
+               if (yych != 'T') goto yy280;
+               YYDEBUG(421, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != 'H') goto yy284;
-               YYDEBUG(430, *YYCURSOR);
+               if (yych != 'H') goto yy280;
+               YYDEBUG(422, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != 'O') goto yy284;
-               YYDEBUG(431, *YYCURSOR);
+               if (yych != 'O') goto yy280;
+               YYDEBUG(423, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != 'D') goto yy284;
-               YYDEBUG(432, *YYCURSOR);
+               if (yych != 'D') goto yy280;
+               YYDEBUG(424, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != '_') goto yy284;
-               YYDEBUG(433, *YYCURSOR);
+               if (yych != '_') goto yy280;
+               YYDEBUG(425, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != '_') goto yy284;
-               YYDEBUG(434, *YYCURSOR);
+               if (yych != '_') goto yy280;
+               YYDEBUG(426, *YYCURSOR);
                ++YYCURSOR;
                if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
-               YYDEBUG(435, *YYCURSOR);
+               YYDEBUG(427, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1480 "Zend/zend_language_scanner.l"
                {
@@ -5114,43 +5071,43 @@ yy428:
        zendlval->type = IS_STRING;
        return T_METHOD_C;
 }
-#line 5118 "Zend/zend_language_scanner.c"
-yy436:
-               YYDEBUG(436, *YYCURSOR);
+#line 5075 "Zend/zend_language_scanner.c"
+yy428:
+               YYDEBUG(428, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'L') goto yy447;
-               goto yy284;
-yy437:
-               YYDEBUG(437, *YYCURSOR);
+               if (yych == 'L') goto yy439;
+               goto yy280;
+yy429:
+               YYDEBUG(429, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != 'N') goto yy284;
-               YYDEBUG(438, *YYCURSOR);
+               if (yych != 'N') goto yy280;
+               YYDEBUG(430, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != 'C') goto yy284;
-               YYDEBUG(439, *YYCURSOR);
+               if (yych != 'C') goto yy280;
+               YYDEBUG(431, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != 'T') goto yy284;
-               YYDEBUG(440, *YYCURSOR);
+               if (yych != 'T') goto yy280;
+               YYDEBUG(432, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != 'I') goto yy284;
-               YYDEBUG(441, *YYCURSOR);
+               if (yych != 'I') goto yy280;
+               YYDEBUG(433, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != 'O') goto yy284;
-               YYDEBUG(442, *YYCURSOR);
+               if (yych != 'O') goto yy280;
+               YYDEBUG(434, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != 'N') goto yy284;
-               YYDEBUG(443, *YYCURSOR);
+               if (yych != 'N') goto yy280;
+               YYDEBUG(435, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != '_') goto yy284;
-               YYDEBUG(444, *YYCURSOR);
+               if (yych != '_') goto yy280;
+               YYDEBUG(436, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != '_') goto yy284;
-               YYDEBUG(445, *YYCURSOR);
+               if (yych != '_') goto yy280;
+               YYDEBUG(437, *YYCURSOR);
                ++YYCURSOR;
                if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
-               YYDEBUG(446, *YYCURSOR);
+               YYDEBUG(438, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1464 "Zend/zend_language_scanner.l"
                {
@@ -5168,23 +5125,23 @@ yy437:
        zendlval->type = IS_STRING;
        return T_FUNC_C;
 }
-#line 5172 "Zend/zend_language_scanner.c"
-yy447:
-               YYDEBUG(447, *YYCURSOR);
+#line 5129 "Zend/zend_language_scanner.c"
+yy439:
+               YYDEBUG(439, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != 'E') goto yy284;
-               YYDEBUG(448, *YYCURSOR);
+               if (yych != 'E') goto yy280;
+               YYDEBUG(440, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != '_') goto yy284;
-               YYDEBUG(449, *YYCURSOR);
+               if (yych != '_') goto yy280;
+               YYDEBUG(441, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != '_') goto yy284;
-               YYDEBUG(450, *YYCURSOR);
+               if (yych != '_') goto yy280;
+               YYDEBUG(442, *YYCURSOR);
                ++YYCURSOR;
                if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
-               YYDEBUG(451, *YYCURSOR);
+               YYDEBUG(443, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1507 "Zend/zend_language_scanner.l"
                {
@@ -5198,29 +5155,29 @@ yy447:
        zendlval->type = IS_STRING;
        return T_FILE;
 }
-#line 5202 "Zend/zend_language_scanner.c"
-yy452:
-               YYDEBUG(452, *YYCURSOR);
+#line 5159 "Zend/zend_language_scanner.c"
+yy444:
+               YYDEBUG(444, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != 'A') goto yy284;
-               YYDEBUG(453, *YYCURSOR);
+               if (yych != 'A') goto yy280;
+               YYDEBUG(445, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != 'S') goto yy284;
-               YYDEBUG(454, *YYCURSOR);
+               if (yych != 'S') goto yy280;
+               YYDEBUG(446, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != 'S') goto yy284;
-               YYDEBUG(455, *YYCURSOR);
+               if (yych != 'S') goto yy280;
+               YYDEBUG(447, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != '_') goto yy284;
-               YYDEBUG(456, *YYCURSOR);
+               if (yych != '_') goto yy280;
+               YYDEBUG(448, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != '_') goto yy284;
-               YYDEBUG(457, *YYCURSOR);
+               if (yych != '_') goto yy280;
+               YYDEBUG(449, *YYCURSOR);
                ++YYCURSOR;
                if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
-               YYDEBUG(458, *YYCURSOR);
+               YYDEBUG(450, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1448 "Zend/zend_language_scanner.l"
                {
@@ -5238,433 +5195,475 @@ yy452:
        zendlval->type = IS_STRING;
        return T_CLASS_C;
 }
-#line 5242 "Zend/zend_language_scanner.c"
-yy459:
-               YYDEBUG(459, *YYCURSOR);
+#line 5199 "Zend/zend_language_scanner.c"
+yy451:
+               YYDEBUG(451, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'L') goto yy460;
-               if (yych != 'l') goto yy284;
-yy460:
-               YYDEBUG(460, *YYCURSOR);
+               if (yych == 'L') goto yy452;
+               if (yych != 'l') goto yy280;
+yy452:
+               YYDEBUG(452, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'T') goto yy461;
-               if (yych != 't') goto yy284;
-yy461:
-               YYDEBUG(461, *YYCURSOR);
+               if (yych == 'T') goto yy453;
+               if (yych != 't') goto yy280;
+yy453:
+               YYDEBUG(453, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != '_') goto yy284;
-               YYDEBUG(462, *YYCURSOR);
+               if (yych != '_') goto yy280;
+               YYDEBUG(454, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'C') goto yy463;
-               if (yych != 'c') goto yy284;
-yy463:
-               YYDEBUG(463, *YYCURSOR);
+               if (yych == 'C') goto yy455;
+               if (yych != 'c') goto yy280;
+yy455:
+               YYDEBUG(455, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'O') goto yy464;
-               if (yych != 'o') goto yy284;
-yy464:
-               YYDEBUG(464, *YYCURSOR);
+               if (yych == 'O') goto yy456;
+               if (yych != 'o') goto yy280;
+yy456:
+               YYDEBUG(456, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'M') goto yy465;
-               if (yych != 'm') goto yy284;
-yy465:
-               YYDEBUG(465, *YYCURSOR);
+               if (yych == 'M') goto yy457;
+               if (yych != 'm') goto yy280;
+yy457:
+               YYDEBUG(457, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'P') goto yy466;
-               if (yych != 'p') goto yy284;
-yy466:
-               YYDEBUG(466, *YYCURSOR);
+               if (yych == 'P') goto yy458;
+               if (yych != 'p') goto yy280;
+yy458:
+               YYDEBUG(458, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'I') goto yy467;
-               if (yych != 'i') goto yy284;
-yy467:
-               YYDEBUG(467, *YYCURSOR);
+               if (yych == 'I') goto yy459;
+               if (yych != 'i') goto yy280;
+yy459:
+               YYDEBUG(459, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'L') goto yy468;
-               if (yych != 'l') goto yy284;
-yy468:
-               YYDEBUG(468, *YYCURSOR);
+               if (yych == 'L') goto yy460;
+               if (yych != 'l') goto yy280;
+yy460:
+               YYDEBUG(460, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'E') goto yy469;
-               if (yych != 'e') goto yy284;
-yy469:
-               YYDEBUG(469, *YYCURSOR);
+               if (yych == 'E') goto yy461;
+               if (yych != 'e') goto yy280;
+yy461:
+               YYDEBUG(461, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'R') goto yy470;
-               if (yych != 'r') goto yy284;
-yy470:
-               YYDEBUG(470, *YYCURSOR);
+               if (yych == 'R') goto yy462;
+               if (yych != 'r') goto yy280;
+yy462:
+               YYDEBUG(462, *YYCURSOR);
                ++YYCURSOR;
                if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
-               YYDEBUG(471, *YYCURSOR);
+               YYDEBUG(463, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1190 "Zend/zend_language_scanner.l"
                {
        return T_HALT_COMPILER;
 }
-#line 5308 "Zend/zend_language_scanner.c"
-yy472:
-               YYDEBUG(472, *YYCURSOR);
+#line 5265 "Zend/zend_language_scanner.c"
+yy464:
+               YYDEBUG(464, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'S') goto yy476;
-               if (yych == 's') goto yy476;
-               goto yy284;
-yy473:
-               YYDEBUG(473, *YYCURSOR);
+               if (yych == 'S') goto yy468;
+               if (yych == 's') goto yy468;
+               goto yy280;
+yy465:
+               YYDEBUG(465, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'E') goto yy474;
-               if (yych != 'e') goto yy284;
-yy474:
-               YYDEBUG(474, *YYCURSOR);
+               if (yych == 'E') goto yy466;
+               if (yych != 'e') goto yy280;
+yy466:
+               YYDEBUG(466, *YYCURSOR);
                ++YYCURSOR;
                if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
-               YYDEBUG(475, *YYCURSOR);
+               YYDEBUG(467, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1174 "Zend/zend_language_scanner.l"
                {
        return T_USE;
 }
-#line 5332 "Zend/zend_language_scanner.c"
-yy476:
-               YYDEBUG(476, *YYCURSOR);
+#line 5289 "Zend/zend_language_scanner.c"
+yy468:
+               YYDEBUG(468, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'E') goto yy477;
-               if (yych != 'e') goto yy284;
-yy477:
-               YYDEBUG(477, *YYCURSOR);
+               if (yych == 'E') goto yy469;
+               if (yych != 'e') goto yy280;
+yy469:
+               YYDEBUG(469, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'T') goto yy478;
-               if (yych != 't') goto yy284;
-yy478:
-               YYDEBUG(478, *YYCURSOR);
+               if (yych == 'T') goto yy470;
+               if (yych != 't') goto yy280;
+yy470:
+               YYDEBUG(470, *YYCURSOR);
                ++YYCURSOR;
                if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
-               YYDEBUG(479, *YYCURSOR);
+               YYDEBUG(471, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1218 "Zend/zend_language_scanner.l"
                {
        return T_UNSET;
 }
-#line 5355 "Zend/zend_language_scanner.c"
-yy480:
-               YYDEBUG(480, *YYCURSOR);
+#line 5312 "Zend/zend_language_scanner.c"
+yy472:
+               YYDEBUG(472, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(7);
                yych = *YYCURSOR;
-yy481:
-               YYDEBUG(481, *YYCURSOR);
+yy473:
+               YYDEBUG(473, *YYCURSOR);
                if (yych <= 'S') {
                        if (yych <= 'D') {
                                if (yych <= ' ') {
-                                       if (yych == '\t') goto yy480;
-                                       if (yych <= 0x1F) goto yy274;
-                                       goto yy480;
+                                       if (yych == '\t') goto yy472;
+                                       if (yych <= 0x1F) goto yy270;
+                                       goto yy472;
                                } else {
                                        if (yych <= 'A') {
-                                               if (yych <= '@') goto yy274;
-                                               goto yy485;
+                                               if (yych <= '@') goto yy270;
+                                               goto yy477;
                                        } else {
-                                               if (yych <= 'B') goto yy483;
-                                               if (yych <= 'C') goto yy274;
-                                               goto yy488;
+                                               if (yych <= 'B') goto yy475;
+                                               if (yych <= 'C') goto yy270;
+                                               goto yy480;
                                        }
                                }
                        } else {
                                if (yych <= 'I') {
-                                       if (yych == 'F') goto yy489;
-                                       if (yych <= 'H') goto yy274;
-                                       goto yy490;
+                                       if (yych == 'F') goto yy481;
+                                       if (yych <= 'H') goto yy270;
+                                       goto yy482;
                                } else {
                                        if (yych <= 'O') {
-                                               if (yych <= 'N') goto yy274;
-                                               goto yy484;
+                                               if (yych <= 'N') goto yy270;
+                                               goto yy476;
                                        } else {
-                                               if (yych <= 'Q') goto yy274;
-                                               if (yych <= 'R') goto yy487;
-                                               goto yy486;
+                                               if (yych <= 'Q') goto yy270;
+                                               if (yych <= 'R') goto yy479;
+                                               goto yy478;
                                        }
                                }
                        }
                } else {
                        if (yych <= 'f') {
                                if (yych <= 'a') {
-                                       if (yych == 'U') goto yy482;
-                                       if (yych <= '`') goto yy274;
-                                       goto yy485;
+                                       if (yych == 'U') goto yy474;
+                                       if (yych <= '`') goto yy270;
+                                       goto yy477;
                                } else {
                                        if (yych <= 'c') {
-                                               if (yych <= 'b') goto yy483;
-                                               goto yy274;
+                                               if (yych <= 'b') goto yy475;
+                                               goto yy270;
                                        } else {
-                                               if (yych <= 'd') goto yy488;
-                                               if (yych <= 'e') goto yy274;
-                                               goto yy489;
+                                               if (yych <= 'd') goto yy480;
+                                               if (yych <= 'e') goto yy270;
+                                               goto yy481;
                                        }
                                }
                        } else {
                                if (yych <= 'q') {
                                        if (yych <= 'i') {
-                                               if (yych <= 'h') goto yy274;
-                                               goto yy490;
+                                               if (yych <= 'h') goto yy270;
+                                               goto yy482;
                                        } else {
-                                               if (yych == 'o') goto yy484;
-                                               goto yy274;
+                                               if (yych == 'o') goto yy476;
+                                               goto yy270;
                                        }
                                } else {
                                        if (yych <= 's') {
-                                               if (yych <= 'r') goto yy487;
-                                               goto yy486;
+                                               if (yych <= 'r') goto yy479;
+                                               goto yy478;
                                        } else {
-                                               if (yych != 'u') goto yy274;
+                                               if (yych != 'u') goto yy270;
                                        }
                                }
                        }
                }
-yy482:
-               YYDEBUG(482, *YYCURSOR);
+yy474:
+               YYDEBUG(474, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'N') goto yy553;
-               if (yych == 'n') goto yy553;
-               goto yy274;
-yy483:
-               YYDEBUG(483, *YYCURSOR);
+               if (yych == 'N') goto yy545;
+               if (yych == 'n') goto yy545;
+               goto yy270;
+yy475:
+               YYDEBUG(475, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych <= 'O') {
-                       if (yych == 'I') goto yy536;
-                       if (yych <= 'N') goto yy274;
-                       goto yy537;
+                       if (yych == 'I') goto yy528;
+                       if (yych <= 'N') goto yy270;
+                       goto yy529;
                } else {
                        if (yych <= 'i') {
-                               if (yych <= 'h') goto yy274;
-                               goto yy536;
+                               if (yych <= 'h') goto yy270;
+                               goto yy528;
                        } else {
-                               if (yych == 'o') goto yy537;
-                               goto yy274;
+                               if (yych == 'o') goto yy529;
+                               goto yy270;
                        }
                }
+yy476:
+               YYDEBUG(476, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'B') goto yy520;
+               if (yych == 'b') goto yy520;
+               goto yy270;
+yy477:
+               YYDEBUG(477, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'R') goto yy513;
+               if (yych == 'r') goto yy513;
+               goto yy270;
+yy478:
+               YYDEBUG(478, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'T') goto yy505;
+               if (yych == 't') goto yy505;
+               goto yy270;
+yy479:
+               YYDEBUG(479, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'E') goto yy503;
+               if (yych == 'e') goto yy503;
+               goto yy270;
+yy480:
+               YYDEBUG(480, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'O') goto yy499;
+               if (yych == 'o') goto yy499;
+               goto yy270;
+yy481:
+               YYDEBUG(481, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'L') goto yy492;
+               if (yych == 'l') goto yy492;
+               goto yy270;
+yy482:
+               YYDEBUG(482, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'N') goto yy483;
+               if (yych != 'n') goto yy270;
+yy483:
+               YYDEBUG(483, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'T') goto yy484;
+               if (yych != 't') goto yy270;
 yy484:
                YYDEBUG(484, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'B') goto yy528;
-               if (yych == 'b') goto yy528;
-               goto yy274;
+               if (yych == 'E') goto yy485;
+               if (yych != 'e') goto yy487;
 yy485:
                YYDEBUG(485, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'R') goto yy521;
-               if (yych == 'r') goto yy521;
-               goto yy274;
+               if (yych == 'G') goto yy490;
+               if (yych == 'g') goto yy490;
+               goto yy270;
 yy486:
                YYDEBUG(486, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'T') goto yy513;
-               if (yych == 't') goto yy513;
-               goto yy274;
+               ++YYCURSOR;
+               YYFILL(1);
+               yych = *YYCURSOR;
 yy487:
                YYDEBUG(487, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'E') goto yy511;
-               if (yych == 'e') goto yy511;
-               goto yy274;
-yy488:
+               if (yych <= 0x1F) {
+                       if (yych == '\t') goto yy486;
+                       goto yy270;
+               } else {
+                       if (yych <= ' ') goto yy486;
+                       if (yych != ')') goto yy270;
+               }
                YYDEBUG(488, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'O') goto yy507;
-               if (yych == 'o') goto yy507;
-               goto yy274;
-yy489:
+               ++YYCURSOR;
                YYDEBUG(489, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'L') goto yy500;
-               if (yych == 'l') goto yy500;
-               goto yy274;
+               yyleng = YYCURSOR - SCNG(yy_text);
+#line 1118 "Zend/zend_language_scanner.l"
+               {
+       return T_INT_CAST;
+}
+#line 5488 "Zend/zend_language_scanner.c"
 yy490:
                YYDEBUG(490, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'N') goto yy491;
-               if (yych != 'n') goto yy274;
+               if (yych == 'E') goto yy491;
+               if (yych != 'e') goto yy270;
 yy491:
                YYDEBUG(491, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'T') goto yy492;
-               if (yych != 't') goto yy274;
+               if (yych == 'R') goto yy486;
+               if (yych == 'r') goto yy486;
+               goto yy270;
 yy492:
                YYDEBUG(492, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'E') goto yy493;
-               if (yych != 'e') goto yy495;
+               if (yych == 'O') goto yy493;
+               if (yych != 'o') goto yy270;
 yy493:
                YYDEBUG(493, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'G') goto yy498;
-               if (yych == 'g') goto yy498;
-               goto yy274;
+               if (yych == 'A') goto yy494;
+               if (yych != 'a') goto yy270;
 yy494:
                YYDEBUG(494, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'T') goto yy495;
+               if (yych != 't') goto yy270;
+yy495:
+               YYDEBUG(495, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-yy495:
-               YYDEBUG(495, *YYCURSOR);
+               YYDEBUG(496, *YYCURSOR);
                if (yych <= 0x1F) {
-                       if (yych == '\t') goto yy494;
-                       goto yy274;
+                       if (yych == '\t') goto yy495;
+                       goto yy270;
                } else {
-                       if (yych <= ' ') goto yy494;
-                       if (yych != ')') goto yy274;
+                       if (yych <= ' ') goto yy495;
+                       if (yych != ')') goto yy270;
                }
-               YYDEBUG(496, *YYCURSOR);
-               ++YYCURSOR;
                YYDEBUG(497, *YYCURSOR);
+               ++YYCURSOR;
+               YYDEBUG(498, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1118 "Zend/zend_language_scanner.l"
+#line 1122 "Zend/zend_language_scanner.l"
                {
-       return T_INT_CAST;
+       return T_DOUBLE_CAST;
 }
-#line 5531 "Zend/zend_language_scanner.c"
-yy498:
-               YYDEBUG(498, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'E') goto yy499;
-               if (yych != 'e') goto yy274;
+#line 5536 "Zend/zend_language_scanner.c"
 yy499:
                YYDEBUG(499, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'R') goto yy494;
-               if (yych == 'r') goto yy494;
-               goto yy274;
+               if (yych == 'U') goto yy500;
+               if (yych != 'u') goto yy270;
 yy500:
                YYDEBUG(500, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'O') goto yy501;
-               if (yych != 'o') goto yy274;
+               if (yych == 'B') goto yy501;
+               if (yych != 'b') goto yy270;
 yy501:
                YYDEBUG(501, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'A') goto yy502;
-               if (yych != 'a') goto yy274;
+               if (yych == 'L') goto yy502;
+               if (yych != 'l') goto yy270;
 yy502:
                YYDEBUG(502, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'T') goto yy503;
-               if (yych != 't') goto yy274;
+               if (yych == 'E') goto yy495;
+               if (yych == 'e') goto yy495;
+               goto yy270;
 yy503:
                YYDEBUG(503, *YYCURSOR);
-               ++YYCURSOR;
-               YYFILL(1);
-               yych = *YYCURSOR;
+               yych = *++YYCURSOR;
+               if (yych == 'A') goto yy504;
+               if (yych != 'a') goto yy270;
+yy504:
                YYDEBUG(504, *YYCURSOR);
-               if (yych <= 0x1F) {
-                       if (yych == '\t') goto yy503;
-                       goto yy274;
-               } else {
-                       if (yych <= ' ') goto yy503;
-                       if (yych != ')') goto yy274;
-               }
+               yych = *++YYCURSOR;
+               if (yych == 'L') goto yy495;
+               if (yych == 'l') goto yy495;
+               goto yy270;
+yy505:
                YYDEBUG(505, *YYCURSOR);
-               ++YYCURSOR;
+               yych = *++YYCURSOR;
+               if (yych == 'R') goto yy506;
+               if (yych != 'r') goto yy270;
+yy506:
                YYDEBUG(506, *YYCURSOR);
-               yyleng = YYCURSOR - SCNG(yy_text);
-#line 1122 "Zend/zend_language_scanner.l"
-               {
-       return T_DOUBLE_CAST;
-}
-#line 5579 "Zend/zend_language_scanner.c"
+               yych = *++YYCURSOR;
+               if (yych == 'I') goto yy507;
+               if (yych != 'i') goto yy270;
 yy507:
                YYDEBUG(507, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'U') goto yy508;
-               if (yych != 'u') goto yy274;
+               if (yych == 'N') goto yy508;
+               if (yych != 'n') goto yy270;
 yy508:
                YYDEBUG(508, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'B') goto yy509;
-               if (yych != 'b') goto yy274;
+               if (yych == 'G') goto yy509;
+               if (yych != 'g') goto yy270;
 yy509:
                YYDEBUG(509, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'L') goto yy510;
-               if (yych != 'l') goto yy274;
-yy510:
+               ++YYCURSOR;
+               YYFILL(1);
+               yych = *YYCURSOR;
                YYDEBUG(510, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'E') goto yy503;
-               if (yych == 'e') goto yy503;
-               goto yy274;
-yy511:
+               if (yych <= 0x1F) {
+                       if (yych == '\t') goto yy509;
+                       goto yy270;
+               } else {
+                       if (yych <= ' ') goto yy509;
+                       if (yych != ')') goto yy270;
+               }
                YYDEBUG(511, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'A') goto yy512;
-               if (yych != 'a') goto yy274;
-yy512:
+               ++YYCURSOR;
                YYDEBUG(512, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'L') goto yy503;
-               if (yych == 'l') goto yy503;
-               goto yy274;
+               yyleng = YYCURSOR - SCNG(yy_text);
+#line 1126 "Zend/zend_language_scanner.l"
+               {
+       return T_STRING_CAST;
+}
+#line 5610 "Zend/zend_language_scanner.c"
 yy513:
                YYDEBUG(513, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych == 'R') goto yy514;
-               if (yych != 'r') goto yy274;
+               if (yych != 'r') goto yy270;
 yy514:
                YYDEBUG(514, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'I') goto yy515;
-               if (yych != 'i') goto yy274;
+               if (yych == 'A') goto yy515;
+               if (yych != 'a') goto yy270;
 yy515:
                YYDEBUG(515, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'N') goto yy516;
-               if (yych != 'n') goto yy274;
+               if (yych == 'Y') goto yy516;
+               if (yych != 'y') goto yy270;
 yy516:
                YYDEBUG(516, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'G') goto yy517;
-               if (yych != 'g') goto yy274;
-yy517:
-               YYDEBUG(517, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(518, *YYCURSOR);
+               YYDEBUG(517, *YYCURSOR);
                if (yych <= 0x1F) {
-                       if (yych == '\t') goto yy517;
-                       goto yy274;
+                       if (yych == '\t') goto yy516;
+                       goto yy270;
                } else {
-                       if (yych <= ' ') goto yy517;
-                       if (yych != ')') goto yy274;
+                       if (yych <= ' ') goto yy516;
+                       if (yych != ')') goto yy270;
                }
-               YYDEBUG(519, *YYCURSOR);
+               YYDEBUG(518, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(520, *YYCURSOR);
+               YYDEBUG(519, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1126 "Zend/zend_language_scanner.l"
+#line 1134 "Zend/zend_language_scanner.l"
                {
-       return T_STRING_CAST;
+       return T_ARRAY_CAST;
 }
-#line 5653 "Zend/zend_language_scanner.c"
+#line 5647 "Zend/zend_language_scanner.c"
+yy520:
+               YYDEBUG(520, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'J') goto yy521;
+               if (yych != 'j') goto yy270;
 yy521:
                YYDEBUG(521, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'R') goto yy522;
-               if (yych != 'r') goto yy274;
+               if (yych == 'E') goto yy522;
+               if (yych != 'e') goto yy270;
 yy522:
                YYDEBUG(522, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'A') goto yy523;
-               if (yych != 'a') goto yy274;
+               if (yych == 'C') goto yy523;
+               if (yych != 'c') goto yy270;
 yy523:
                YYDEBUG(523, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'Y') goto yy524;
-               if (yych != 'y') goto yy274;
+               if (yych == 'T') goto yy524;
+               if (yych != 't') goto yy270;
 yy524:
                YYDEBUG(524, *YYCURSOR);
                ++YYCURSOR;
@@ -5673,2108 +5672,2066 @@ yy524:
                YYDEBUG(525, *YYCURSOR);
                if (yych <= 0x1F) {
                        if (yych == '\t') goto yy524;
-                       goto yy274;
+                       goto yy270;
                } else {
                        if (yych <= ' ') goto yy524;
-                       if (yych != ')') goto yy274;
+                       if (yych != ')') goto yy270;
                }
                YYDEBUG(526, *YYCURSOR);
                ++YYCURSOR;
                YYDEBUG(527, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1134 "Zend/zend_language_scanner.l"
+#line 1138 "Zend/zend_language_scanner.l"
                {
-       return T_ARRAY_CAST;
+       return T_OBJECT_CAST;
 }
-#line 5690 "Zend/zend_language_scanner.c"
+#line 5689 "Zend/zend_language_scanner.c"
 yy528:
                YYDEBUG(528, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'J') goto yy529;
-               if (yych != 'j') goto yy274;
+               if (yych == 'N') goto yy538;
+               if (yych == 'n') goto yy538;
+               goto yy270;
 yy529:
                YYDEBUG(529, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'E') goto yy530;
-               if (yych != 'e') goto yy274;
+               if (yych == 'O') goto yy530;
+               if (yych != 'o') goto yy270;
 yy530:
                YYDEBUG(530, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'C') goto yy531;
-               if (yych != 'c') goto yy274;
+               if (yych == 'L') goto yy531;
+               if (yych != 'l') goto yy270;
 yy531:
                YYDEBUG(531, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'T') goto yy532;
-               if (yych != 't') goto yy274;
+               if (yych == 'E') goto yy536;
+               if (yych == 'e') goto yy536;
+               goto yy533;
 yy532:
                YYDEBUG(532, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
+yy533:
                YYDEBUG(533, *YYCURSOR);
                if (yych <= 0x1F) {
                        if (yych == '\t') goto yy532;
-                       goto yy274;
+                       goto yy270;
                } else {
                        if (yych <= ' ') goto yy532;
-                       if (yych != ')') goto yy274;
+                       if (yych != ')') goto yy270;
                }
                YYDEBUG(534, *YYCURSOR);
                ++YYCURSOR;
                YYDEBUG(535, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1138 "Zend/zend_language_scanner.l"
+#line 1142 "Zend/zend_language_scanner.l"
                {
-       return T_OBJECT_CAST;
+       return T_BOOL_CAST;
 }
-#line 5732 "Zend/zend_language_scanner.c"
+#line 5734 "Zend/zend_language_scanner.c"
 yy536:
                YYDEBUG(536, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'N') goto yy546;
-               if (yych == 'n') goto yy546;
-               goto yy274;
+               if (yych == 'A') goto yy537;
+               if (yych != 'a') goto yy270;
 yy537:
                YYDEBUG(537, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'O') goto yy538;
-               if (yych != 'o') goto yy274;
+               if (yych == 'N') goto yy532;
+               if (yych == 'n') goto yy532;
+               goto yy270;
 yy538:
                YYDEBUG(538, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'L') goto yy539;
-               if (yych != 'l') goto yy274;
+               if (yych == 'A') goto yy539;
+               if (yych != 'a') goto yy270;
 yy539:
                YYDEBUG(539, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'E') goto yy544;
-               if (yych == 'e') goto yy544;
-               goto yy541;
+               if (yych == 'R') goto yy540;
+               if (yych != 'r') goto yy270;
 yy540:
                YYDEBUG(540, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'Y') goto yy541;
+               if (yych != 'y') goto yy270;
+yy541:
+               YYDEBUG(541, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-yy541:
-               YYDEBUG(541, *YYCURSOR);
+               YYDEBUG(542, *YYCURSOR);
                if (yych <= 0x1F) {
-                       if (yych == '\t') goto yy540;
-                       goto yy274;
+                       if (yych == '\t') goto yy541;
+                       goto yy270;
                } else {
-                       if (yych <= ' ') goto yy540;
-                       if (yych != ')') goto yy274;
+                       if (yych <= ' ') goto yy541;
+                       if (yych != ')') goto yy270;
                }
-               YYDEBUG(542, *YYCURSOR);
-               ++YYCURSOR;
                YYDEBUG(543, *YYCURSOR);
+               ++YYCURSOR;
+               YYDEBUG(544, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1142 "Zend/zend_language_scanner.l"
+#line 1130 "Zend/zend_language_scanner.l"
                {
-       return T_BOOL_CAST;
+       return T_STRING_CAST;
 }
-#line 5777 "Zend/zend_language_scanner.c"
-yy544:
-               YYDEBUG(544, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'A') goto yy545;
-               if (yych != 'a') goto yy274;
+#line 5782 "Zend/zend_language_scanner.c"
 yy545:
                YYDEBUG(545, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'N') goto yy540;
-               if (yych == 'n') goto yy540;
-               goto yy274;
+               if (yych == 'S') goto yy546;
+               if (yych != 's') goto yy270;
 yy546:
                YYDEBUG(546, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'A') goto yy547;
-               if (yych != 'a') goto yy274;
+               if (yych == 'E') goto yy547;
+               if (yych != 'e') goto yy270;
 yy547:
                YYDEBUG(547, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'R') goto yy548;
-               if (yych != 'r') goto yy274;
+               if (yych == 'T') goto yy548;
+               if (yych != 't') goto yy270;
 yy548:
                YYDEBUG(548, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'Y') goto yy549;
-               if (yych != 'y') goto yy274;
-yy549:
-               YYDEBUG(549, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(550, *YYCURSOR);
+               YYDEBUG(549, *YYCURSOR);
                if (yych <= 0x1F) {
-                       if (yych == '\t') goto yy549;
-                       goto yy274;
+                       if (yych == '\t') goto yy548;
+                       goto yy270;
                } else {
-                       if (yych <= ' ') goto yy549;
-                       if (yych != ')') goto yy274;
+                       if (yych <= ' ') goto yy548;
+                       if (yych != ')') goto yy270;
                }
-               YYDEBUG(551, *YYCURSOR);
+               YYDEBUG(550, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(552, *YYCURSOR);
+               YYDEBUG(551, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1130 "Zend/zend_language_scanner.l"
+#line 1146 "Zend/zend_language_scanner.l"
                {
-       return T_STRING_CAST;
+       return T_UNSET_CAST;
 }
-#line 5825 "Zend/zend_language_scanner.c"
+#line 5819 "Zend/zend_language_scanner.c"
+yy552:
+               YYDEBUG(552, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'R') goto yy553;
+               if (yych != 'r') goto yy280;
 yy553:
                YYDEBUG(553, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'S') goto yy554;
-               if (yych != 's') goto yy274;
-yy554:
+               ++YYCURSOR;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy279;
+               }
                YYDEBUG(554, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'E') goto yy555;
-               if (yych != 'e') goto yy274;
+               yyleng = YYCURSOR - SCNG(yy_text);
+#line 1114 "Zend/zend_language_scanner.l"
+               {
+       return T_VAR;
+}
+#line 5837 "Zend/zend_language_scanner.c"
 yy555:
                YYDEBUG(555, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'T') goto yy556;
-               if (yych != 't') goto yy274;
+               if (yych == 'M') goto yy559;
+               if (yych == 'm') goto yy559;
+               goto yy280;
 yy556:
                YYDEBUG(556, *YYCURSOR);
-               ++YYCURSOR;
-               YYFILL(1);
-               yych = *YYCURSOR;
+               yych = *++YYCURSOR;
+               if (yych == 'W') goto yy557;
+               if (yych != 'w') goto yy280;
+yy557:
                YYDEBUG(557, *YYCURSOR);
-               if (yych <= 0x1F) {
-                       if (yych == '\t') goto yy556;
-                       goto yy274;
-               } else {
-                       if (yych <= ' ') goto yy556;
-                       if (yych != ')') goto yy274;
+               ++YYCURSOR;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy279;
                }
                YYDEBUG(558, *YYCURSOR);
-               ++YYCURSOR;
-               YYDEBUG(559, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1146 "Zend/zend_language_scanner.l"
+#line 1106 "Zend/zend_language_scanner.l"
                {
-       return T_UNSET_CAST;
+       return T_NEW;
 }
-#line 5862 "Zend/zend_language_scanner.c"
+#line 5861 "Zend/zend_language_scanner.c"
+yy559:
+               YYDEBUG(559, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'E') goto yy560;
+               if (yych != 'e') goto yy280;
 yy560:
                YYDEBUG(560, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'R') goto yy561;
-               if (yych != 'r') goto yy284;
+               if (yych == 'S') goto yy561;
+               if (yych != 's') goto yy280;
 yy561:
                YYDEBUG(561, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
-               }
+               yych = *++YYCURSOR;
+               if (yych == 'P') goto yy562;
+               if (yych != 'p') goto yy280;
+yy562:
                YYDEBUG(562, *YYCURSOR);
-               yyleng = YYCURSOR - SCNG(yy_text);
-#line 1114 "Zend/zend_language_scanner.l"
-               {
-       return T_VAR;
-}
-#line 5880 "Zend/zend_language_scanner.c"
+               yych = *++YYCURSOR;
+               if (yych == 'A') goto yy563;
+               if (yych != 'a') goto yy280;
 yy563:
                YYDEBUG(563, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'M') goto yy567;
-               if (yych == 'm') goto yy567;
-               goto yy284;
+               if (yych == 'C') goto yy564;
+               if (yych != 'c') goto yy280;
 yy564:
                YYDEBUG(564, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'W') goto yy565;
-               if (yych != 'w') goto yy284;
+               if (yych == 'E') goto yy565;
+               if (yych != 'e') goto yy280;
 yy565:
                YYDEBUG(565, *YYCURSOR);
                ++YYCURSOR;
                if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
                YYDEBUG(566, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1106 "Zend/zend_language_scanner.l"
+#line 1170 "Zend/zend_language_scanner.l"
                {
-       return T_NEW;
+       return T_NAMESPACE;
 }
 #line 5904 "Zend/zend_language_scanner.c"
 yy567:
                YYDEBUG(567, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'E') goto yy568;
-               if (yych != 'e') goto yy284;
-yy568:
+               ++YYCURSOR;
                YYDEBUG(568, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'S') goto yy569;
-               if (yych != 's') goto yy284;
+               yyleng = YYCURSOR - SCNG(yy_text);
+#line 1102 "Zend/zend_language_scanner.l"
+               {
+       return T_PAAMAYIM_NEKUDOTAYIM;
+}
+#line 5914 "Zend/zend_language_scanner.c"
 yy569:
                YYDEBUG(569, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'P') goto yy570;
-               if (yych != 'p') goto yy284;
+               ++YYCURSOR;
+               YYFILL(1);
+               yych = *YYCURSOR;
 yy570:
                YYDEBUG(570, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'A') goto yy571;
-               if (yych != 'a') goto yy284;
+               if (yych <= '\f') {
+                       if (yych <= 0x08) goto yy221;
+                       if (yych <= '\n') goto yy569;
+                       goto yy221;
+               } else {
+                       if (yych <= '\r') goto yy569;
+                       if (yych == ' ') goto yy569;
+                       goto yy221;
+               }
 yy571:
                YYDEBUG(571, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'C') goto yy572;
-               if (yych != 'c') goto yy284;
-yy572:
+               ++YYCURSOR;
                YYDEBUG(572, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'E') goto yy573;
-               if (yych != 'e') goto yy284;
+               yyleng = YYCURSOR - SCNG(yy_text);
+#line 1270 "Zend/zend_language_scanner.l"
+               {
+       return T_MINUS_EQUAL;
+}
+#line 5940 "Zend/zend_language_scanner.c"
 yy573:
                YYDEBUG(573, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
-               }
                YYDEBUG(574, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1170 "Zend/zend_language_scanner.l"
+#line 1238 "Zend/zend_language_scanner.l"
                {
-       return T_NAMESPACE;
+       return T_DEC;
 }
-#line 5947 "Zend/zend_language_scanner.c"
+#line 5950 "Zend/zend_language_scanner.c"
 yy575:
                YYDEBUG(575, *YYCURSOR);
                ++YYCURSOR;
                YYDEBUG(576, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1102 "Zend/zend_language_scanner.l"
+#line 1072 "Zend/zend_language_scanner.l"
                {
-       return T_PAAMAYIM_NEKUDOTAYIM;
+       yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC);
+       return T_OBJECT_OPERATOR;
 }
-#line 5957 "Zend/zend_language_scanner.c"
+#line 5961 "Zend/zend_language_scanner.c"
 yy577:
                YYDEBUG(577, *YYCURSOR);
-               ++YYCURSOR;
-               YYFILL(1);
-               yych = *YYCURSOR;
-yy578:
-               YYDEBUG(578, *YYCURSOR);
-               if (yych <= '\f') {
-                       if (yych <= 0x08) goto yy225;
-                       if (yych <= '\n') goto yy577;
-                       goto yy225;
+               yych = *++YYCURSOR;
+               if (yych <= 'O') {
+                       if (yych == 'I') goto yy584;
+                       if (yych <= 'N') goto yy280;
+                       goto yy585;
                } else {
-                       if (yych <= '\r') goto yy577;
-                       if (yych == ' ') goto yy577;
-                       goto yy225;
+                       if (yych <= 'i') {
+                               if (yych <= 'h') goto yy280;
+                               goto yy584;
+                       } else {
+                               if (yych == 'o') goto yy585;
+                               goto yy280;
+                       }
                }
+yy578:
+               YYDEBUG(578, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'B') goto yy579;
+               if (yych != 'b') goto yy280;
 yy579:
                YYDEBUG(579, *YYCURSOR);
-               ++YYCURSOR;
+               yych = *++YYCURSOR;
+               if (yych == 'L') goto yy580;
+               if (yych != 'l') goto yy280;
+yy580:
                YYDEBUG(580, *YYCURSOR);
-               yyleng = YYCURSOR - SCNG(yy_text);
-#line 1270 "Zend/zend_language_scanner.l"
-               {
-       return T_MINUS_EQUAL;
-}
-#line 5983 "Zend/zend_language_scanner.c"
+               yych = *++YYCURSOR;
+               if (yych == 'I') goto yy581;
+               if (yych != 'i') goto yy280;
 yy581:
                YYDEBUG(581, *YYCURSOR);
-               ++YYCURSOR;
+               yych = *++YYCURSOR;
+               if (yych == 'C') goto yy582;
+               if (yych != 'c') goto yy280;
+yy582:
                YYDEBUG(582, *YYCURSOR);
-               yyleng = YYCURSOR - SCNG(yy_text);
-#line 1238 "Zend/zend_language_scanner.l"
-               {
-       return T_DEC;
-}
-#line 5993 "Zend/zend_language_scanner.c"
-yy583:
-               YYDEBUG(583, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(584, *YYCURSOR);
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy279;
+               }
+               YYDEBUG(583, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1072 "Zend/zend_language_scanner.l"
+#line 1214 "Zend/zend_language_scanner.l"
                {
-       yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC);
-       return T_OBJECT_OPERATOR;
+       return T_PUBLIC;
 }
-#line 6004 "Zend/zend_language_scanner.c"
-yy585:
-               YYDEBUG(585, *YYCURSOR);
+#line 6010 "Zend/zend_language_scanner.c"
+yy584:
+               YYDEBUG(584, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych <= 'O') {
-                       if (yych == 'I') goto yy592;
-                       if (yych <= 'N') goto yy284;
-                       goto yy593;
+               if (yych <= 'V') {
+                       if (yych == 'N') goto yy593;
+                       if (yych <= 'U') goto yy280;
+                       goto yy594;
                } else {
-                       if (yych <= 'i') {
-                               if (yych <= 'h') goto yy284;
-                               goto yy592;
+                       if (yych <= 'n') {
+                               if (yych <= 'm') goto yy280;
+                               goto yy593;
                        } else {
-                               if (yych == 'o') goto yy593;
-                               goto yy284;
+                               if (yych == 'v') goto yy594;
+                               goto yy280;
                        }
                }
+yy585:
+               YYDEBUG(585, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'T') goto yy586;
+               if (yych != 't') goto yy280;
 yy586:
                YYDEBUG(586, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'B') goto yy587;
-               if (yych != 'b') goto yy284;
+               if (yych == 'E') goto yy587;
+               if (yych != 'e') goto yy280;
 yy587:
                YYDEBUG(587, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'L') goto yy588;
-               if (yych != 'l') goto yy284;
+               if (yych == 'C') goto yy588;
+               if (yych != 'c') goto yy280;
 yy588:
                YYDEBUG(588, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'I') goto yy589;
-               if (yych != 'i') goto yy284;
+               if (yych == 'T') goto yy589;
+               if (yych != 't') goto yy280;
 yy589:
                YYDEBUG(589, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'C') goto yy590;
-               if (yych != 'c') goto yy284;
+               if (yych == 'E') goto yy590;
+               if (yych != 'e') goto yy280;
 yy590:
                YYDEBUG(590, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'D') goto yy591;
+               if (yych != 'd') goto yy280;
+yy591:
+               YYDEBUG(591, *YYCURSOR);
                ++YYCURSOR;
                if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
-               YYDEBUG(591, *YYCURSOR);
+               YYDEBUG(592, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1214 "Zend/zend_language_scanner.l"
+#line 1210 "Zend/zend_language_scanner.l"
                {
-       return T_PUBLIC;
+       return T_PROTECTED;
 }
-#line 6053 "Zend/zend_language_scanner.c"
-yy592:
-               YYDEBUG(592, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych <= 'V') {
-                       if (yych == 'N') goto yy601;
-                       if (yych <= 'U') goto yy284;
-                       goto yy602;
-               } else {
-                       if (yych <= 'n') {
-                               if (yych <= 'm') goto yy284;
-                               goto yy601;
-                       } else {
-                               if (yych == 'v') goto yy602;
-                               goto yy284;
-                       }
-               }
+#line 6069 "Zend/zend_language_scanner.c"
 yy593:
                YYDEBUG(593, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'T') goto yy594;
-               if (yych != 't') goto yy284;
+               if (yych == 'T') goto yy599;
+               if (yych == 't') goto yy599;
+               goto yy280;
 yy594:
                YYDEBUG(594, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'E') goto yy595;
-               if (yych != 'e') goto yy284;
+               if (yych == 'A') goto yy595;
+               if (yych != 'a') goto yy280;
 yy595:
                YYDEBUG(595, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'C') goto yy596;
-               if (yych != 'c') goto yy284;
+               if (yych == 'T') goto yy596;
+               if (yych != 't') goto yy280;
 yy596:
                YYDEBUG(596, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'T') goto yy597;
-               if (yych != 't') goto yy284;
+               if (yych == 'E') goto yy597;
+               if (yych != 'e') goto yy280;
 yy597:
                YYDEBUG(597, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'E') goto yy598;
-               if (yych != 'e') goto yy284;
-yy598:
+               ++YYCURSOR;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy279;
+               }
                YYDEBUG(598, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'D') goto yy599;
-               if (yych != 'd') goto yy284;
+               yyleng = YYCURSOR - SCNG(yy_text);
+#line 1206 "Zend/zend_language_scanner.l"
+               {
+       return T_PRIVATE;
+}
+#line 6103 "Zend/zend_language_scanner.c"
 yy599:
                YYDEBUG(599, *YYCURSOR);
                ++YYCURSOR;
                if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
                YYDEBUG(600, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1210 "Zend/zend_language_scanner.l"
+#line 1052 "Zend/zend_language_scanner.l"
                {
-       return T_PROTECTED;
+       return T_PRINT;
 }
-#line 6112 "Zend/zend_language_scanner.c"
+#line 6116 "Zend/zend_language_scanner.c"
 yy601:
                YYDEBUG(601, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'T') goto yy607;
-               if (yych == 't') goto yy607;
-               goto yy284;
+               if (yych == 'O') goto yy606;
+               if (yych == 'o') goto yy606;
+               goto yy280;
 yy602:
                YYDEBUG(602, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'A') goto yy603;
-               if (yych != 'a') goto yy284;
+               if (yych == 'T') goto yy603;
+               if (yych != 't') goto yy280;
 yy603:
                YYDEBUG(603, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'T') goto yy604;
-               if (yych != 't') goto yy284;
+               if (yych == 'O') goto yy604;
+               if (yych != 'o') goto yy280;
 yy604:
                YYDEBUG(604, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'E') goto yy605;
-               if (yych != 'e') goto yy284;
-yy605:
-               YYDEBUG(605, *YYCURSOR);
                ++YYCURSOR;
                if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
-               YYDEBUG(606, *YYCURSOR);
+               YYDEBUG(605, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1206 "Zend/zend_language_scanner.l"
+#line 1044 "Zend/zend_language_scanner.l"
                {
-       return T_PRIVATE;
+       return T_GOTO;
 }
-#line 6146 "Zend/zend_language_scanner.c"
+#line 6145 "Zend/zend_language_scanner.c"
+yy606:
+               YYDEBUG(606, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'B') goto yy607;
+               if (yych != 'b') goto yy280;
 yy607:
                YYDEBUG(607, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'A') goto yy608;
+               if (yych != 'a') goto yy280;
+yy608:
+               YYDEBUG(608, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'L') goto yy609;
+               if (yych != 'l') goto yy280;
+yy609:
+               YYDEBUG(609, *YYCURSOR);
                ++YYCURSOR;
                if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
-               YYDEBUG(608, *YYCURSOR);
+               YYDEBUG(610, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1052 "Zend/zend_language_scanner.l"
+#line 1178 "Zend/zend_language_scanner.l"
                {
-       return T_PRINT;
+       return T_GLOBAL;
 }
-#line 6159 "Zend/zend_language_scanner.c"
-yy609:
-               YYDEBUG(609, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'O') goto yy614;
-               if (yych == 'o') goto yy614;
-               goto yy284;
-yy610:
-               YYDEBUG(610, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'T') goto yy611;
-               if (yych != 't') goto yy284;
+#line 6173 "Zend/zend_language_scanner.c"
 yy611:
                YYDEBUG(611, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'O') goto yy612;
-               if (yych != 'o') goto yy284;
+               if (yych == '<') goto yy618;
+               goto yy270;
 yy612:
                YYDEBUG(612, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
-               }
+               yyaccept = 3;
+               yych = *(YYMARKER = ++YYCURSOR);
+               goto yy272;
+yy613:
                YYDEBUG(613, *YYCURSOR);
-               yyleng = YYCURSOR - SCNG(yy_text);
-#line 1044 "Zend/zend_language_scanner.l"
-               {
-       return T_GOTO;
-}
-#line 6188 "Zend/zend_language_scanner.c"
+               yych = *++YYCURSOR;
+               if (yych == 'E') goto yy614;
+               if (yych != 'e') goto yy280;
 yy614:
                YYDEBUG(614, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'B') goto yy615;
-               if (yych != 'b') goto yy284;
+               if (yych == 'A') goto yy615;
+               if (yych != 'a') goto yy280;
 yy615:
                YYDEBUG(615, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'A') goto yy616;
-               if (yych != 'a') goto yy284;
+               if (yych == 'K') goto yy616;
+               if (yych != 'k') goto yy280;
 yy616:
                YYDEBUG(616, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'L') goto yy617;
-               if (yych != 'l') goto yy284;
-yy617:
-               YYDEBUG(617, *YYCURSOR);
                ++YYCURSOR;
                if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
-               YYDEBUG(618, *YYCURSOR);
+               YYDEBUG(617, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1178 "Zend/zend_language_scanner.l"
+#line 1036 "Zend/zend_language_scanner.l"
                {
-       return T_GLOBAL;
+       return T_BREAK;
 }
-#line 6216 "Zend/zend_language_scanner.c"
+#line 6211 "Zend/zend_language_scanner.c"
+yy618:
+               YYDEBUG(618, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == '<') goto yy359;
+               goto yy270;
 yy619:
                YYDEBUG(619, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == '<') goto yy626;
-               goto yy274;
+               if (yych == 'A') goto yy626;
+               if (yych == 'a') goto yy626;
+               goto yy280;
 yy620:
                YYDEBUG(620, *YYCURSOR);
-               yyaccept = 3;
-               yych = *(YYMARKER = ++YYCURSOR);
-               goto yy276;
+               yych = *++YYCURSOR;
+               if (yych == 'I') goto yy621;
+               if (yych != 'i') goto yy280;
 yy621:
                YYDEBUG(621, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'E') goto yy622;
-               if (yych != 'e') goto yy284;
+               if (yych == 'T') goto yy622;
+               if (yych != 't') goto yy280;
 yy622:
                YYDEBUG(622, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'A') goto yy623;
-               if (yych != 'a') goto yy284;
+               if (yych == 'C') goto yy623;
+               if (yych != 'c') goto yy280;
 yy623:
                YYDEBUG(623, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'K') goto yy624;
-               if (yych != 'k') goto yy284;
+               if (yych == 'H') goto yy624;
+               if (yych != 'h') goto yy280;
 yy624:
                YYDEBUG(624, *YYCURSOR);
                ++YYCURSOR;
                if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
                YYDEBUG(625, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1036 "Zend/zend_language_scanner.l"
+#line 1020 "Zend/zend_language_scanner.l"
                {
-       return T_BREAK;
+       return T_SWITCH;
 }
-#line 6254 "Zend/zend_language_scanner.c"
+#line 6255 "Zend/zend_language_scanner.c"
 yy626:
                YYDEBUG(626, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == '<') goto yy363;
-               goto yy274;
+               if (yych == 'T') goto yy627;
+               if (yych != 't') goto yy280;
 yy627:
                YYDEBUG(627, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'A') goto yy634;
-               if (yych == 'a') goto yy634;
-               goto yy284;
+               if (yych == 'I') goto yy628;
+               if (yych != 'i') goto yy280;
 yy628:
                YYDEBUG(628, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'I') goto yy629;
-               if (yych != 'i') goto yy284;
+               if (yych == 'C') goto yy629;
+               if (yych != 'c') goto yy280;
 yy629:
                YYDEBUG(629, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'T') goto yy630;
-               if (yych != 't') goto yy284;
-yy630:
+               ++YYCURSOR;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy279;
+               }
                YYDEBUG(630, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'C') goto yy631;
-               if (yych != 'c') goto yy284;
+               yyleng = YYCURSOR - SCNG(yy_text);
+#line 1194 "Zend/zend_language_scanner.l"
+               {
+       return T_STATIC;
+}
+#line 6283 "Zend/zend_language_scanner.c"
 yy631:
                YYDEBUG(631, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'H') goto yy632;
-               if (yych != 'h') goto yy284;
+               if (yych == 'S') goto yy642;
+               if (yych == 's') goto yy642;
+               goto yy280;
 yy632:
                YYDEBUG(632, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'D') goto yy640;
+               if (yych == 'd') goto yy640;
+               goto yy280;
+yy633:
+               YYDEBUG(633, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'R') goto yy636;
+               if (yych == 'r') goto yy636;
+               goto yy280;
+yy634:
+               YYDEBUG(634, *YYCURSOR);
                ++YYCURSOR;
                if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
-               YYDEBUG(633, *YYCURSOR);
+               YYDEBUG(635, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1020 "Zend/zend_language_scanner.l"
+#line 1016 "Zend/zend_language_scanner.l"
                {
-       return T_SWITCH;
+       return T_AS;
 }
-#line 6298 "Zend/zend_language_scanner.c"
-yy634:
-               YYDEBUG(634, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'T') goto yy635;
-               if (yych != 't') goto yy284;
-yy635:
-               YYDEBUG(635, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'I') goto yy636;
-               if (yych != 'i') goto yy284;
+#line 6314 "Zend/zend_language_scanner.c"
 yy636:
                YYDEBUG(636, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'C') goto yy637;
-               if (yych != 'c') goto yy284;
+               if (yych == 'A') goto yy637;
+               if (yych != 'a') goto yy280;
 yy637:
                YYDEBUG(637, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'Y') goto yy638;
+               if (yych != 'y') goto yy280;
+yy638:
+               YYDEBUG(638, *YYCURSOR);
                ++YYCURSOR;
                if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
-               YYDEBUG(638, *YYCURSOR);
+               YYDEBUG(639, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1194 "Zend/zend_language_scanner.l"
+#line 1230 "Zend/zend_language_scanner.l"
                {
-       return T_STATIC;
+       return T_ARRAY;
 }
-#line 6326 "Zend/zend_language_scanner.c"
-yy639:
-               YYDEBUG(639, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'S') goto yy650;
-               if (yych == 's') goto yy650;
-               goto yy284;
+#line 6337 "Zend/zend_language_scanner.c"
 yy640:
                YYDEBUG(640, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'D') goto yy648;
-               if (yych == 'd') goto yy648;
-               goto yy284;
-yy641:
-               YYDEBUG(641, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'R') goto yy644;
-               if (yych == 'r') goto yy644;
-               goto yy284;
-yy642:
-               YYDEBUG(642, *YYCURSOR);
                ++YYCURSOR;
                if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
-               YYDEBUG(643, *YYCURSOR);
+               YYDEBUG(641, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1016 "Zend/zend_language_scanner.l"
+#line 1322 "Zend/zend_language_scanner.l"
                {
-       return T_AS;
+       return T_LOGICAL_AND;
 }
-#line 6357 "Zend/zend_language_scanner.c"
+#line 6350 "Zend/zend_language_scanner.c"
+yy642:
+               YYDEBUG(642, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'T') goto yy643;
+               if (yych != 't') goto yy280;
+yy643:
+               YYDEBUG(643, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'R') goto yy644;
+               if (yych != 'r') goto yy280;
 yy644:
                YYDEBUG(644, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych == 'A') goto yy645;
-               if (yych != 'a') goto yy284;
+               if (yych != 'a') goto yy280;
 yy645:
                YYDEBUG(645, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'Y') goto yy646;
-               if (yych != 'y') goto yy284;
+               if (yych == 'C') goto yy646;
+               if (yych != 'c') goto yy280;
 yy646:
                YYDEBUG(646, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
-               }
+               yych = *++YYCURSOR;
+               if (yych == 'T') goto yy647;
+               if (yych != 't') goto yy280;
+yy647:
                YYDEBUG(647, *YYCURSOR);
-               yyleng = YYCURSOR - SCNG(yy_text);
-#line 1230 "Zend/zend_language_scanner.l"
-               {
-       return T_ARRAY;
-}
-#line 6380 "Zend/zend_language_scanner.c"
-yy648:
-               YYDEBUG(648, *YYCURSOR);
                ++YYCURSOR;
                if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
-               YYDEBUG(649, *YYCURSOR);
+               YYDEBUG(648, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1322 "Zend/zend_language_scanner.l"
+#line 1198 "Zend/zend_language_scanner.l"
                {
-       return T_LOGICAL_AND;
+       return T_ABSTRACT;
 }
-#line 6393 "Zend/zend_language_scanner.c"
+#line 6388 "Zend/zend_language_scanner.c"
+yy649:
+               YYDEBUG(649, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'I') goto yy650;
+               if (yych != 'i') goto yy280;
 yy650:
                YYDEBUG(650, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'T') goto yy651;
-               if (yych != 't') goto yy284;
+               if (yych == 'L') goto yy651;
+               if (yych != 'l') goto yy280;
 yy651:
                YYDEBUG(651, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'R') goto yy652;
-               if (yych != 'r') goto yy284;
+               if (yych == 'E') goto yy652;
+               if (yych != 'e') goto yy280;
 yy652:
                YYDEBUG(652, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'A') goto yy653;
-               if (yych != 'a') goto yy284;
-yy653:
+               ++YYCURSOR;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy279;
+               }
                YYDEBUG(653, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'C') goto yy654;
-               if (yych != 'c') goto yy284;
+               yyleng = YYCURSOR - SCNG(yy_text);
+#line 976 "Zend/zend_language_scanner.l"
+               {
+       return T_WHILE;
+}
+#line 6416 "Zend/zend_language_scanner.c"
 yy654:
                YYDEBUG(654, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'T') goto yy655;
-               if (yych != 't') goto yy284;
-yy655:
-               YYDEBUG(655, *YYCURSOR);
                ++YYCURSOR;
                if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
-               YYDEBUG(656, *YYCURSOR);
+               YYDEBUG(655, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1198 "Zend/zend_language_scanner.l"
+#line 960 "Zend/zend_language_scanner.l"
                {
-       return T_ABSTRACT;
+       return T_IF;
 }
-#line 6431 "Zend/zend_language_scanner.c"
+#line 6429 "Zend/zend_language_scanner.c"
+yy656:
+               YYDEBUG(656, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'P') goto yy692;
+               if (yych == 'p') goto yy692;
+               goto yy280;
 yy657:
                YYDEBUG(657, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'I') goto yy658;
-               if (yych != 'i') goto yy284;
+               if (yych <= 'T') {
+                       if (yych <= 'C') {
+                               if (yych <= 'B') goto yy280;
+                               goto yy665;
+                       } else {
+                               if (yych <= 'R') goto yy280;
+                               if (yych <= 'S') goto yy663;
+                               goto yy664;
+                       }
+               } else {
+                       if (yych <= 'r') {
+                               if (yych == 'c') goto yy665;
+                               goto yy280;
+                       } else {
+                               if (yych <= 's') goto yy663;
+                               if (yych <= 't') goto yy664;
+                               goto yy280;
+                       }
+               }
 yy658:
                YYDEBUG(658, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'L') goto yy659;
-               if (yych != 'l') goto yy284;
+               if (yych == 'S') goto yy659;
+               if (yych != 's') goto yy280;
 yy659:
                YYDEBUG(659, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych == 'E') goto yy660;
-               if (yych != 'e') goto yy284;
+               if (yych != 'e') goto yy280;
 yy660:
                YYDEBUG(660, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
-               }
+               yych = *++YYCURSOR;
+               if (yych == 'T') goto yy661;
+               if (yych != 't') goto yy280;
+yy661:
                YYDEBUG(661, *YYCURSOR);
-               yyleng = YYCURSOR - SCNG(yy_text);
-#line 976 "Zend/zend_language_scanner.l"
-               {
-       return T_WHILE;
-}
-#line 6459 "Zend/zend_language_scanner.c"
-yy662:
-               YYDEBUG(662, *YYCURSOR);
                ++YYCURSOR;
                if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
-               YYDEBUG(663, *YYCURSOR);
+               YYDEBUG(662, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 960 "Zend/zend_language_scanner.l"
+#line 1182 "Zend/zend_language_scanner.l"
                {
-       return T_IF;
+       return T_ISSET;
 }
-#line 6472 "Zend/zend_language_scanner.c"
+#line 6485 "Zend/zend_language_scanner.c"
+yy663:
+               YYDEBUG(663, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'T') goto yy684;
+               if (yych == 't') goto yy684;
+               goto yy280;
 yy664:
                YYDEBUG(664, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'P') goto yy700;
-               if (yych == 'p') goto yy700;
-               goto yy284;
+               if (yych == 'E') goto yy677;
+               if (yych == 'e') goto yy677;
+               goto yy280;
 yy665:
                YYDEBUG(665, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych <= 'T') {
-                       if (yych <= 'C') {
-                               if (yych <= 'B') goto yy284;
-                               goto yy673;
-                       } else {
-                               if (yych <= 'R') goto yy284;
-                               if (yych <= 'S') goto yy671;
-                               goto yy672;
-                       }
-               } else {
-                       if (yych <= 'r') {
-                               if (yych == 'c') goto yy673;
-                               goto yy284;
-                       } else {
-                               if (yych <= 's') goto yy671;
-                               if (yych <= 't') goto yy672;
-                               goto yy284;
-                       }
-               }
+               if (yych == 'L') goto yy666;
+               if (yych != 'l') goto yy280;
 yy666:
                YYDEBUG(666, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'S') goto yy667;
-               if (yych != 's') goto yy284;
+               if (yych == 'U') goto yy667;
+               if (yych != 'u') goto yy280;
 yy667:
                YYDEBUG(667, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'E') goto yy668;
-               if (yych != 'e') goto yy284;
+               if (yych == 'D') goto yy668;
+               if (yych != 'd') goto yy280;
 yy668:
                YYDEBUG(668, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'T') goto yy669;
-               if (yych != 't') goto yy284;
+               if (yych == 'E') goto yy669;
+               if (yych != 'e') goto yy280;
 yy669:
                YYDEBUG(669, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+               if ((yych = *YYCURSOR) <= '^') {
+                       if (yych <= '9') {
+                               if (yych >= '0') goto yy279;
+                       } else {
+                               if (yych <= '@') goto yy670;
+                               if (yych <= 'Z') goto yy279;
+                       }
+               } else {
+                       if (yych <= '`') {
+                               if (yych <= '_') goto yy671;
+                       } else {
+                               if (yych <= 'z') goto yy279;
+                               if (yych >= 0x7F) goto yy279;
+                       }
                }
+yy670:
                YYDEBUG(670, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1182 "Zend/zend_language_scanner.l"
+#line 1154 "Zend/zend_language_scanner.l"
                {
-       return T_ISSET;
+       return T_INCLUDE;
 }
-#line 6528 "Zend/zend_language_scanner.c"
+#line 6543 "Zend/zend_language_scanner.c"
 yy671:
                YYDEBUG(671, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'T') goto yy692;
-               if (yych == 't') goto yy692;
-               goto yy284;
+               if (yych == 'O') goto yy672;
+               if (yych != 'o') goto yy280;
 yy672:
                YYDEBUG(672, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'E') goto yy685;
-               if (yych == 'e') goto yy685;
-               goto yy284;
+               if (yych == 'N') goto yy673;
+               if (yych != 'n') goto yy280;
 yy673:
                YYDEBUG(673, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'L') goto yy674;
-               if (yych != 'l') goto yy284;
+               if (yych == 'C') goto yy674;
+               if (yych != 'c') goto yy280;
 yy674:
                YYDEBUG(674, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'U') goto yy675;
-               if (yych != 'u') goto yy284;
+               if (yych == 'E') goto yy675;
+               if (yych != 'e') goto yy280;
 yy675:
                YYDEBUG(675, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'D') goto yy676;
-               if (yych != 'd') goto yy284;
-yy676:
-               YYDEBUG(676, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'E') goto yy677;
-               if (yych != 'e') goto yy284;
-yy677:
-               YYDEBUG(677, *YYCURSOR);
                ++YYCURSOR;
-               if ((yych = *YYCURSOR) <= '^') {
-                       if (yych <= '9') {
-                               if (yych >= '0') goto yy283;
-                       } else {
-                               if (yych <= '@') goto yy678;
-                               if (yych <= 'Z') goto yy283;
-                       }
-               } else {
-                       if (yych <= '`') {
-                               if (yych <= '_') goto yy679;
-                       } else {
-                               if (yych <= 'z') goto yy283;
-                               if (yych >= 0x7F) goto yy283;
-                       }
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy279;
                }
-yy678:
-               YYDEBUG(678, *YYCURSOR);
+               YYDEBUG(676, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1154 "Zend/zend_language_scanner.l"
+#line 1158 "Zend/zend_language_scanner.l"
                {
-       return T_INCLUDE;
+       return T_INCLUDE_ONCE;
 }
-#line 6586 "Zend/zend_language_scanner.c"
+#line 6576 "Zend/zend_language_scanner.c"
+yy677:
+               YYDEBUG(677, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'R') goto yy678;
+               if (yych != 'r') goto yy280;
+yy678:
+               YYDEBUG(678, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'F') goto yy679;
+               if (yych != 'f') goto yy280;
 yy679:
                YYDEBUG(679, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'O') goto yy680;
-               if (yych != 'o') goto yy284;
+               if (yych == 'A') goto yy680;
+               if (yych != 'a') goto yy280;
 yy680:
                YYDEBUG(680, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'N') goto yy681;
-               if (yych != 'n') goto yy284;
+               if (yych == 'C') goto yy681;
+               if (yych != 'c') goto yy280;
 yy681:
                YYDEBUG(681, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'C') goto yy682;
-               if (yych != 'c') goto yy284;
+               if (yych == 'E') goto yy682;
+               if (yych != 'e') goto yy280;
 yy682:
                YYDEBUG(682, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'E') goto yy683;
-               if (yych != 'e') goto yy284;
-yy683:
-               YYDEBUG(683, *YYCURSOR);
                ++YYCURSOR;
                if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
-               YYDEBUG(684, *YYCURSOR);
+               YYDEBUG(683, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1158 "Zend/zend_language_scanner.l"
+#line 1060 "Zend/zend_language_scanner.l"
                {
-       return T_INCLUDE_ONCE;
+       return T_INTERFACE;
 }
-#line 6619 "Zend/zend_language_scanner.c"
+#line 6614 "Zend/zend_language_scanner.c"
+yy684:
+               YYDEBUG(684, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'A') goto yy685;
+               if (yych != 'a') goto yy280;
 yy685:
                YYDEBUG(685, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'R') goto yy686;
-               if (yych != 'r') goto yy284;
+               if (yych == 'N') goto yy686;
+               if (yych != 'n') goto yy280;
 yy686:
                YYDEBUG(686, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'F') goto yy687;
-               if (yych != 'f') goto yy284;
+               if (yych == 'C') goto yy687;
+               if (yych != 'c') goto yy280;
 yy687:
                YYDEBUG(687, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'A') goto yy688;
-               if (yych != 'a') goto yy284;
+               if (yych == 'E') goto yy688;
+               if (yych != 'e') goto yy280;
 yy688:
                YYDEBUG(688, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'C') goto yy689;
-               if (yych != 'c') goto yy284;
+               if (yych == 'O') goto yy689;
+               if (yych != 'o') goto yy280;
 yy689:
                YYDEBUG(689, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'E') goto yy690;
-               if (yych != 'e') goto yy284;
+               if (yych == 'F') goto yy690;
+               if (yych != 'f') goto yy280;
 yy690:
                YYDEBUG(690, *YYCURSOR);
                ++YYCURSOR;
                if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
                YYDEBUG(691, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1060 "Zend/zend_language_scanner.l"
+#line 1012 "Zend/zend_language_scanner.l"
                {
-       return T_INTERFACE;
+       return T_INSTANCEOF;
 }
 #line 6657 "Zend/zend_language_scanner.c"
 yy692:
                YYDEBUG(692, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'A') goto yy693;
-               if (yych != 'a') goto yy284;
+               if (yych == 'L') goto yy693;
+               if (yych != 'l') goto yy280;
 yy693:
                YYDEBUG(693, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'N') goto yy694;
-               if (yych != 'n') goto yy284;
+               if (yych == 'E') goto yy694;
+               if (yych != 'e') goto yy280;
 yy694:
                YYDEBUG(694, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'C') goto yy695;
-               if (yych != 'c') goto yy284;
+               if (yych == 'M') goto yy695;
+               if (yych != 'm') goto yy280;
 yy695:
                YYDEBUG(695, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych == 'E') goto yy696;
-               if (yych != 'e') goto yy284;
+               if (yych != 'e') goto yy280;
 yy696:
                YYDEBUG(696, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'O') goto yy697;
-               if (yych != 'o') goto yy284;
+               if (yych == 'N') goto yy697;
+               if (yych != 'n') goto yy280;
 yy697:
                YYDEBUG(697, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'F') goto yy698;
-               if (yych != 'f') goto yy284;
+               if (yych == 'T') goto yy698;
+               if (yych != 't') goto yy280;
 yy698:
                YYDEBUG(698, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'S') goto yy699;
+               if (yych != 's') goto yy280;
+yy699:
+               YYDEBUG(699, *YYCURSOR);
                ++YYCURSOR;
                if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
-               YYDEBUG(699, *YYCURSOR);
+               YYDEBUG(700, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1012 "Zend/zend_language_scanner.l"
+#line 1068 "Zend/zend_language_scanner.l"
                {
-       return T_INSTANCEOF;
+       return T_IMPLEMENTS;
 }
-#line 6700 "Zend/zend_language_scanner.c"
-yy700:
-               YYDEBUG(700, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'L') goto yy701;
-               if (yych != 'l') goto yy284;
+#line 6705 "Zend/zend_language_scanner.c"
 yy701:
                YYDEBUG(701, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'E') goto yy702;
-               if (yych != 'e') goto yy284;
+               if (yych == 'R') goto yy705;
+               if (yych == 'r') goto yy705;
+               goto yy280;
 yy702:
                YYDEBUG(702, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'M') goto yy703;
-               if (yych != 'm') goto yy284;
+               if (yych == 'Y') goto yy703;
+               if (yych != 'y') goto yy280;
 yy703:
                YYDEBUG(703, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'E') goto yy704;
-               if (yych != 'e') goto yy284;
-yy704:
+               ++YYCURSOR;
+               if (yybm[0+(yych = *YYCURSOR)] & 8) {
+                       goto yy279;
+               }
                YYDEBUG(704, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'N') goto yy705;
-               if (yych != 'n') goto yy284;
+               yyleng = YYCURSOR - SCNG(yy_text);
+#line 948 "Zend/zend_language_scanner.l"
+               {
+       return T_TRY;
+}
+#line 6729 "Zend/zend_language_scanner.c"
 yy705:
                YYDEBUG(705, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'T') goto yy706;
-               if (yych != 't') goto yy284;
+               if (yych == 'O') goto yy706;
+               if (yych != 'o') goto yy280;
 yy706:
                YYDEBUG(706, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'S') goto yy707;
-               if (yych != 's') goto yy284;
+               if (yych == 'W') goto yy707;
+               if (yych != 'w') goto yy280;
 yy707:
                YYDEBUG(707, *YYCURSOR);
                ++YYCURSOR;
                if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
                YYDEBUG(708, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 1068 "Zend/zend_language_scanner.l"
+#line 956 "Zend/zend_language_scanner.l"
                {
-       return T_IMPLEMENTS;
+       return T_THROW;
 }
-#line 6748 "Zend/zend_language_scanner.c"
+#line 6752 "Zend/zend_language_scanner.c"
 yy709:
                YYDEBUG(709, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'R') goto yy713;
-               if (yych == 'r') goto yy713;
-               goto yy284;
-yy710:
+               if (yych <= 'T') {
+                       if (yych == 'Q') goto yy711;
+                       if (yych <= 'S') goto yy280;
+               } else {
+                       if (yych <= 'q') {
+                               if (yych <= 'p') goto yy280;
+                               goto yy711;
+                       } else {
+                               if (yych != 't') goto yy280;
+                       }
+               }
                YYDEBUG(710, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'Y') goto yy711;
-               if (yych != 'y') goto yy284;
+               if (yych == 'U') goto yy723;
+               if (yych == 'u') goto yy723;
+               goto yy280;
 yy711:
                YYDEBUG(711, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
-               }
+               yych = *++YYCURSOR;
+               if (yych == 'U') goto yy712;
+               if (yych != 'u') goto yy280;
+yy712:
                YYDEBUG(712, *YYCURSOR);
-               yyleng = YYCURSOR - SCNG(yy_text);
-#line 948 "Zend/zend_language_scanner.l"
-               {
-       return T_TRY;
-}
-#line 6772 "Zend/zend_language_scanner.c"
+               yych = *++YYCURSOR;
+               if (yych == 'I') goto yy713;
+               if (yych != 'i') goto yy280;
 yy713:
                YYDEBUG(713, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'O') goto yy714;
-               if (yych != 'o') goto yy284;
+               if (yych == 'R') goto yy714;
+               if (yych != 'r') goto yy280;
 yy714:
                YYDEBUG(714, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'W') goto yy715;
-               if (yych != 'w') goto yy284;
+               if (yych == 'E') goto yy715;
+               if (yych != 'e') goto yy280;
 yy715:
                YYDEBUG(715, *YYCURSOR);
                ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
-               }
-               YYDEBUG(716, *YYCURSOR);
-               yyleng = YYCURSOR - SCNG(yy_text);
-#line 956 "Zend/zend_language_scanner.l"
-               {
-       return T_THROW;
-}
-#line 6795 "Zend/zend_language_scanner.c"
-yy717:
-               YYDEBUG(717, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych <= 'T') {
-                       if (yych == 'Q') goto yy719;
-                       if (yych <= 'S') goto yy284;
-               } else {
-                       if (yych <= 'q') {
-                               if (yych <= 'p') goto yy284;
-                               goto yy719;
-                       } else {
-                               if (yych != 't') goto yy284;
-                       }
-               }
-               YYDEBUG(718, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'U') goto yy731;
-               if (yych == 'u') goto yy731;
-               goto yy284;
-yy719:
-               YYDEBUG(719, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'U') goto yy720;
-               if (yych != 'u') goto yy284;
-yy720:
-               YYDEBUG(720, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'I') goto yy721;
-               if (yych != 'i') goto yy284;
-yy721:
-               YYDEBUG(721, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'R') goto yy722;
-               if (yych != 'r') goto yy284;
-yy722:
-               YYDEBUG(722, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'E') goto yy723;
-               if (yych != 'e') goto yy284;
-yy723:
-               YYDEBUG(723, *YYCURSOR);
-               ++YYCURSOR;
                if ((yych = *YYCURSOR) <= '^') {
                        if (yych <= '9') {
-                               if (yych >= '0') goto yy283;
+                               if (yych >= '0') goto yy279;
                        } else {
-                               if (yych <= '@') goto yy724;
-                               if (yych <= 'Z') goto yy283;
+                               if (yych <= '@') goto yy716;
+                               if (yych <= 'Z') goto yy279;
                        }
                } else {
                        if (yych <= '`') {
-                               if (yych <= '_') goto yy725;
+                               if (yych <= '_') goto yy717;
                        } else {
-                               if (yych <= 'z') goto yy283;
-                               if (yych >= 0x7F) goto yy283;
+                               if (yych <= 'z') goto yy279;
+                               if (yych >= 0x7F) goto yy279;
                        }
                }
-yy724:
-               YYDEBUG(724, *YYCURSOR);
+yy716:
+               YYDEBUG(716, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1162 "Zend/zend_language_scanner.l"
                {
        return T_REQUIRE;
 }
-#line 6860 "Zend/zend_language_scanner.c"
-yy725:
-               YYDEBUG(725, *YYCURSOR);
+#line 6817 "Zend/zend_language_scanner.c"
+yy717:
+               YYDEBUG(717, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'O') goto yy726;
-               if (yych != 'o') goto yy284;
-yy726:
-               YYDEBUG(726, *YYCURSOR);
+               if (yych == 'O') goto yy718;
+               if (yych != 'o') goto yy280;
+yy718:
+               YYDEBUG(718, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'N') goto yy727;
-               if (yych != 'n') goto yy284;
-yy727:
-               YYDEBUG(727, *YYCURSOR);
+               if (yych == 'N') goto yy719;
+               if (yych != 'n') goto yy280;
+yy719:
+               YYDEBUG(719, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'C') goto yy728;
-               if (yych != 'c') goto yy284;
-yy728:
-               YYDEBUG(728, *YYCURSOR);
+               if (yych == 'C') goto yy720;
+               if (yych != 'c') goto yy280;
+yy720:
+               YYDEBUG(720, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'E') goto yy729;
-               if (yych != 'e') goto yy284;
-yy729:
-               YYDEBUG(729, *YYCURSOR);
+               if (yych == 'E') goto yy721;
+               if (yych != 'e') goto yy280;
+yy721:
+               YYDEBUG(721, *YYCURSOR);
                ++YYCURSOR;
                if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
-               YYDEBUG(730, *YYCURSOR);
+               YYDEBUG(722, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1166 "Zend/zend_language_scanner.l"
                {
        return T_REQUIRE_ONCE;
 }
-#line 6893 "Zend/zend_language_scanner.c"
-yy731:
-               YYDEBUG(731, *YYCURSOR);
+#line 6850 "Zend/zend_language_scanner.c"
+yy723:
+               YYDEBUG(723, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'R') goto yy732;
-               if (yych != 'r') goto yy284;
-yy732:
-               YYDEBUG(732, *YYCURSOR);
+               if (yych == 'R') goto yy724;
+               if (yych != 'r') goto yy280;
+yy724:
+               YYDEBUG(724, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'N') goto yy733;
-               if (yych != 'n') goto yy284;
-yy733:
-               YYDEBUG(733, *YYCURSOR);
+               if (yych == 'N') goto yy725;
+               if (yych != 'n') goto yy280;
+yy725:
+               YYDEBUG(725, *YYCURSOR);
                ++YYCURSOR;
                if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
-               YYDEBUG(734, *YYCURSOR);
+               YYDEBUG(726, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 944 "Zend/zend_language_scanner.l"
                {
        return T_RETURN;
 }
-#line 6916 "Zend/zend_language_scanner.c"
-yy735:
-               YYDEBUG(735, *YYCURSOR);
+#line 6873 "Zend/zend_language_scanner.c"
+yy727:
+               YYDEBUG(727, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych <= 'T') {
-                       if (yych <= 'R') goto yy284;
-                       if (yych <= 'S') goto yy757;
-                       goto yy756;
+                       if (yych <= 'R') goto yy280;
+                       if (yych <= 'S') goto yy749;
+                       goto yy748;
                } else {
-                       if (yych <= 'r') goto yy284;
-                       if (yych <= 's') goto yy757;
-                       if (yych <= 't') goto yy756;
-                       goto yy284;
+                       if (yych <= 'r') goto yy280;
+                       if (yych <= 's') goto yy749;
+                       if (yych <= 't') goto yy748;
+                       goto yy280;
                }
-yy736:
-               YYDEBUG(736, *YYCURSOR);
+yy728:
+               YYDEBUG(728, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych <= 'O') {
-                       if (yych == 'A') goto yy748;
-                       if (yych <= 'N') goto yy284;
-                       goto yy749;
+                       if (yych == 'A') goto yy740;
+                       if (yych <= 'N') goto yy280;
+                       goto yy741;
                } else {
                        if (yych <= 'a') {
-                               if (yych <= '`') goto yy284;
-                               goto yy748;
+                               if (yych <= '`') goto yy280;
+                               goto yy740;
                        } else {
-                               if (yych == 'o') goto yy749;
-                               goto yy284;
+                               if (yych == 'o') goto yy741;
+                               goto yy280;
                        }
                }
-yy737:
-               YYDEBUG(737, *YYCURSOR);
+yy729:
+               YYDEBUG(729, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'N') goto yy738;
-               if (yych != 'n') goto yy284;
-yy738:
-               YYDEBUG(738, *YYCURSOR);
+               if (yych == 'N') goto yy730;
+               if (yych != 'n') goto yy280;
+yy730:
+               YYDEBUG(730, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych <= 'T') {
-                       if (yych <= 'R') goto yy284;
-                       if (yych >= 'T') goto yy740;
+                       if (yych <= 'R') goto yy280;
+                       if (yych >= 'T') goto yy732;
                } else {
-                       if (yych <= 'r') goto yy284;
-                       if (yych <= 's') goto yy739;
-                       if (yych <= 't') goto yy740;
-                       goto yy284;
+                       if (yych <= 'r') goto yy280;
+                       if (yych <= 's') goto yy731;
+                       if (yych <= 't') goto yy732;
+                       goto yy280;
                }
-yy739:
-               YYDEBUG(739, *YYCURSOR);
+yy731:
+               YYDEBUG(731, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'T') goto yy746;
-               if (yych == 't') goto yy746;
-               goto yy284;
-yy740:
-               YYDEBUG(740, *YYCURSOR);
+               if (yych == 'T') goto yy738;
+               if (yych == 't') goto yy738;
+               goto yy280;
+yy732:
+               YYDEBUG(732, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'I') goto yy741;
-               if (yych != 'i') goto yy284;
-yy741:
-               YYDEBUG(741, *YYCURSOR);
+               if (yych == 'I') goto yy733;
+               if (yych != 'i') goto yy280;
+yy733:
+               YYDEBUG(733, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'N') goto yy742;
-               if (yych != 'n') goto yy284;
-yy742:
-               YYDEBUG(742, *YYCURSOR);
+               if (yych == 'N') goto yy734;
+               if (yych != 'n') goto yy280;
+yy734:
+               YYDEBUG(734, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'U') goto yy743;
-               if (yych != 'u') goto yy284;
-yy743:
-               YYDEBUG(743, *YYCURSOR);
+               if (yych == 'U') goto yy735;
+               if (yych != 'u') goto yy280;
+yy735:
+               YYDEBUG(735, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'E') goto yy744;
-               if (yych != 'e') goto yy284;
-yy744:
-               YYDEBUG(744, *YYCURSOR);
+               if (yych == 'E') goto yy736;
+               if (yych != 'e') goto yy280;
+yy736:
+               YYDEBUG(736, *YYCURSOR);
                ++YYCURSOR;
                if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
-               YYDEBUG(745, *YYCURSOR);
+               YYDEBUG(737, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1040 "Zend/zend_language_scanner.l"
                {
        return T_CONTINUE;
 }
-#line 7001 "Zend/zend_language_scanner.c"
-yy746:
-               YYDEBUG(746, *YYCURSOR);
+#line 6958 "Zend/zend_language_scanner.c"
+yy738:
+               YYDEBUG(738, *YYCURSOR);
                ++YYCURSOR;
                if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
-               YYDEBUG(747, *YYCURSOR);
+               YYDEBUG(739, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 940 "Zend/zend_language_scanner.l"
                {
        return T_CONST;
 }
-#line 7014 "Zend/zend_language_scanner.c"
-yy748:
-               YYDEBUG(748, *YYCURSOR);
+#line 6971 "Zend/zend_language_scanner.c"
+yy740:
+               YYDEBUG(740, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'S') goto yy753;
-               if (yych == 's') goto yy753;
-               goto yy284;
-yy749:
-               YYDEBUG(749, *YYCURSOR);
+               if (yych == 'S') goto yy745;
+               if (yych == 's') goto yy745;
+               goto yy280;
+yy741:
+               YYDEBUG(741, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'N') goto yy750;
-               if (yych != 'n') goto yy284;
-yy750:
-               YYDEBUG(750, *YYCURSOR);
+               if (yych == 'N') goto yy742;
+               if (yych != 'n') goto yy280;
+yy742:
+               YYDEBUG(742, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'E') goto yy751;
-               if (yych != 'e') goto yy284;
-yy751:
-               YYDEBUG(751, *YYCURSOR);
+               if (yych == 'E') goto yy743;
+               if (yych != 'e') goto yy280;
+yy743:
+               YYDEBUG(743, *YYCURSOR);
                ++YYCURSOR;
                if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
-               YYDEBUG(752, *YYCURSOR);
+               YYDEBUG(744, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1110 "Zend/zend_language_scanner.l"
                {
        return T_CLONE;
 }
-#line 7043 "Zend/zend_language_scanner.c"
-yy753:
-               YYDEBUG(753, *YYCURSOR);
+#line 7000 "Zend/zend_language_scanner.c"
+yy745:
+               YYDEBUG(745, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'S') goto yy754;
-               if (yych != 's') goto yy284;
-yy754:
-               YYDEBUG(754, *YYCURSOR);
+               if (yych == 'S') goto yy746;
+               if (yych != 's') goto yy280;
+yy746:
+               YYDEBUG(746, *YYCURSOR);
                ++YYCURSOR;
                if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
-               YYDEBUG(755, *YYCURSOR);
+               YYDEBUG(747, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1056 "Zend/zend_language_scanner.l"
                {
        return T_CLASS;
 }
-#line 7061 "Zend/zend_language_scanner.c"
-yy756:
-               YYDEBUG(756, *YYCURSOR);
+#line 7018 "Zend/zend_language_scanner.c"
+yy748:
+               YYDEBUG(748, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'C') goto yy760;
-               if (yych == 'c') goto yy760;
-               goto yy284;
-yy757:
-               YYDEBUG(757, *YYCURSOR);
+               if (yych == 'C') goto yy752;
+               if (yych == 'c') goto yy752;
+               goto yy280;
+yy749:
+               YYDEBUG(749, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'E') goto yy758;
-               if (yych != 'e') goto yy284;
-yy758:
-               YYDEBUG(758, *YYCURSOR);
+               if (yych == 'E') goto yy750;
+               if (yych != 'e') goto yy280;
+yy750:
+               YYDEBUG(750, *YYCURSOR);
                ++YYCURSOR;
                if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
-               YYDEBUG(759, *YYCURSOR);
+               YYDEBUG(751, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1028 "Zend/zend_language_scanner.l"
                {
        return T_CASE;
 }
-#line 7085 "Zend/zend_language_scanner.c"
-yy760:
-               YYDEBUG(760, *YYCURSOR);
+#line 7042 "Zend/zend_language_scanner.c"
+yy752:
+               YYDEBUG(752, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'H') goto yy761;
-               if (yych != 'h') goto yy284;
-yy761:
-               YYDEBUG(761, *YYCURSOR);
+               if (yych == 'H') goto yy753;
+               if (yych != 'h') goto yy280;
+yy753:
+               YYDEBUG(753, *YYCURSOR);
                ++YYCURSOR;
                if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
-               YYDEBUG(762, *YYCURSOR);
+               YYDEBUG(754, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 952 "Zend/zend_language_scanner.l"
                {
        return T_CATCH;
 }
-#line 7103 "Zend/zend_language_scanner.c"
-yy763:
-               YYDEBUG(763, *YYCURSOR);
+#line 7060 "Zend/zend_language_scanner.c"
+yy755:
+               YYDEBUG(755, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'N') goto yy780;
-               if (yych == 'n') goto yy780;
-               goto yy284;
-yy764:
-               YYDEBUG(764, *YYCURSOR);
+               if (yych == 'N') goto yy772;
+               if (yych == 'n') goto yy772;
+               goto yy280;
+yy756:
+               YYDEBUG(756, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'R') goto yy773;
-               if (yych == 'r') goto yy773;
-               goto yy284;
-yy765:
-               YYDEBUG(765, *YYCURSOR);
+               if (yych == 'R') goto yy765;
+               if (yych == 'r') goto yy765;
+               goto yy280;
+yy757:
+               YYDEBUG(757, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'N') goto yy766;
-               if (yych != 'n') goto yy284;
-yy766:
-               YYDEBUG(766, *YYCURSOR);
+               if (yych == 'N') goto yy758;
+               if (yych != 'n') goto yy280;
+yy758:
+               YYDEBUG(758, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'C') goto yy767;
-               if (yych != 'c') goto yy284;
-yy767:
-               YYDEBUG(767, *YYCURSOR);
+               if (yych == 'C') goto yy759;
+               if (yych != 'c') goto yy280;
+yy759:
+               YYDEBUG(759, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'T') goto yy768;
-               if (yych != 't') goto yy284;
-yy768:
-               YYDEBUG(768, *YYCURSOR);
+               if (yych == 'T') goto yy760;
+               if (yych != 't') goto yy280;
+yy760:
+               YYDEBUG(760, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'I') goto yy769;
-               if (yych != 'i') goto yy284;
-yy769:
-               YYDEBUG(769, *YYCURSOR);
+               if (yych == 'I') goto yy761;
+               if (yych != 'i') goto yy280;
+yy761:
+               YYDEBUG(761, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'O') goto yy770;
-               if (yych != 'o') goto yy284;
-yy770:
-               YYDEBUG(770, *YYCURSOR);
+               if (yych == 'O') goto yy762;
+               if (yych != 'o') goto yy280;
+yy762:
+               YYDEBUG(762, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'N') goto yy771;
-               if (yych != 'n') goto yy284;
-yy771:
-               YYDEBUG(771, *YYCURSOR);
+               if (yych == 'N') goto yy763;
+               if (yych != 'n') goto yy280;
+yy763:
+               YYDEBUG(763, *YYCURSOR);
                ++YYCURSOR;
                if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
-               YYDEBUG(772, *YYCURSOR);
+               YYDEBUG(764, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 936 "Zend/zend_language_scanner.l"
                {
        return T_FUNCTION;
 }
-#line 7158 "Zend/zend_language_scanner.c"
-yy773:
-               YYDEBUG(773, *YYCURSOR);
+#line 7115 "Zend/zend_language_scanner.c"
+yy765:
+               YYDEBUG(765, *YYCURSOR);
                ++YYCURSOR;
                if ((yych = *YYCURSOR) <= '^') {
                        if (yych <= '@') {
-                               if (yych <= '/') goto yy774;
-                               if (yych <= '9') goto yy283;
+                               if (yych <= '/') goto yy766;
+                               if (yych <= '9') goto yy279;
                        } else {
-                               if (yych == 'E') goto yy775;
-                               if (yych <= 'Z') goto yy283;
+                               if (yych == 'E') goto yy767;
+                               if (yych <= 'Z') goto yy279;
                        }
                } else {
                        if (yych <= 'd') {
-                               if (yych != '`') goto yy283;
+                               if (yych != '`') goto yy279;
                        } else {
-                               if (yych <= 'e') goto yy775;
-                               if (yych <= 'z') goto yy283;
-                               if (yych >= 0x7F) goto yy283;
+                               if (yych <= 'e') goto yy767;
+                               if (yych <= 'z') goto yy279;
+                               if (yych >= 0x7F) goto yy279;
                        }
                }
-yy774:
-               YYDEBUG(774, *YYCURSOR);
+yy766:
+               YYDEBUG(766, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 988 "Zend/zend_language_scanner.l"
                {
        return T_FOR;
 }
-#line 7186 "Zend/zend_language_scanner.c"
-yy775:
-               YYDEBUG(775, *YYCURSOR);
+#line 7143 "Zend/zend_language_scanner.c"
+yy767:
+               YYDEBUG(767, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'A') goto yy776;
-               if (yych != 'a') goto yy284;
-yy776:
-               YYDEBUG(776, *YYCURSOR);
+               if (yych == 'A') goto yy768;
+               if (yych != 'a') goto yy280;
+yy768:
+               YYDEBUG(768, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'C') goto yy777;
-               if (yych != 'c') goto yy284;
-yy777:
-               YYDEBUG(777, *YYCURSOR);
+               if (yych == 'C') goto yy769;
+               if (yych != 'c') goto yy280;
+yy769:
+               YYDEBUG(769, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'H') goto yy778;
-               if (yych != 'h') goto yy284;
-yy778:
-               YYDEBUG(778, *YYCURSOR);
+               if (yych == 'H') goto yy770;
+               if (yych != 'h') goto yy280;
+yy770:
+               YYDEBUG(770, *YYCURSOR);
                ++YYCURSOR;
                if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
-               YYDEBUG(779, *YYCURSOR);
+               YYDEBUG(771, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 996 "Zend/zend_language_scanner.l"
                {
        return T_FOREACH;
 }
-#line 7214 "Zend/zend_language_scanner.c"
-yy780:
-               YYDEBUG(780, *YYCURSOR);
+#line 7171 "Zend/zend_language_scanner.c"
+yy772:
+               YYDEBUG(772, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'A') goto yy781;
-               if (yych != 'a') goto yy284;
-yy781:
-               YYDEBUG(781, *YYCURSOR);
+               if (yych == 'A') goto yy773;
+               if (yych != 'a') goto yy280;
+yy773:
+               YYDEBUG(773, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'L') goto yy782;
-               if (yych != 'l') goto yy284;
-yy782:
-               YYDEBUG(782, *YYCURSOR);
+               if (yych == 'L') goto yy774;
+               if (yych != 'l') goto yy280;
+yy774:
+               YYDEBUG(774, *YYCURSOR);
                ++YYCURSOR;
                if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
-               YYDEBUG(783, *YYCURSOR);
+               YYDEBUG(775, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1202 "Zend/zend_language_scanner.l"
                {
        return T_FINAL;
 }
-#line 7237 "Zend/zend_language_scanner.c"
-yy784:
-               YYDEBUG(784, *YYCURSOR);
+#line 7194 "Zend/zend_language_scanner.c"
+yy776:
+               YYDEBUG(776, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych <= 'F') {
-                       if (yych == 'C') goto yy790;
-                       if (yych <= 'E') goto yy284;
-                       goto yy791;
+                       if (yych == 'C') goto yy782;
+                       if (yych <= 'E') goto yy280;
+                       goto yy783;
                } else {
                        if (yych <= 'c') {
-                               if (yych <= 'b') goto yy284;
-                               goto yy790;
+                               if (yych <= 'b') goto yy280;
+                               goto yy782;
                        } else {
-                               if (yych == 'f') goto yy791;
-                               goto yy284;
+                               if (yych == 'f') goto yy783;
+                               goto yy280;
                        }
                }
-yy785:
-               YYDEBUG(785, *YYCURSOR);
+yy777:
+               YYDEBUG(777, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'E') goto yy788;
-               if (yych == 'e') goto yy788;
-               goto yy284;
-yy786:
-               YYDEBUG(786, *YYCURSOR);
+               if (yych == 'E') goto yy780;
+               if (yych == 'e') goto yy780;
+               goto yy280;
+yy778:
+               YYDEBUG(778, *YYCURSOR);
                ++YYCURSOR;
                if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
-               YYDEBUG(787, *YYCURSOR);
+               YYDEBUG(779, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 984 "Zend/zend_language_scanner.l"
                {
        return T_DO;
 }
-#line 7272 "Zend/zend_language_scanner.c"
-yy788:
-               YYDEBUG(788, *YYCURSOR);
+#line 7229 "Zend/zend_language_scanner.c"
+yy780:
+               YYDEBUG(780, *YYCURSOR);
                ++YYCURSOR;
                if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
-               YYDEBUG(789, *YYCURSOR);
+               YYDEBUG(781, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 932 "Zend/zend_language_scanner.l"
                {
        return T_EXIT;
 }
-#line 7285 "Zend/zend_language_scanner.c"
-yy790:
-               YYDEBUG(790, *YYCURSOR);
+#line 7242 "Zend/zend_language_scanner.c"
+yy782:
+               YYDEBUG(782, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'L') goto yy797;
-               if (yych == 'l') goto yy797;
-               goto yy284;
-yy791:
-               YYDEBUG(791, *YYCURSOR);
+               if (yych == 'L') goto yy789;
+               if (yych == 'l') goto yy789;
+               goto yy280;
+yy783:
+               YYDEBUG(783, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'A') goto yy792;
-               if (yych != 'a') goto yy284;
-yy792:
-               YYDEBUG(792, *YYCURSOR);
+               if (yych == 'A') goto yy784;
+               if (yych != 'a') goto yy280;
+yy784:
+               YYDEBUG(784, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'U') goto yy793;
-               if (yych != 'u') goto yy284;
-yy793:
-               YYDEBUG(793, *YYCURSOR);
+               if (yych == 'U') goto yy785;
+               if (yych != 'u') goto yy280;
+yy785:
+               YYDEBUG(785, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'L') goto yy794;
-               if (yych != 'l') goto yy284;
-yy794:
-               YYDEBUG(794, *YYCURSOR);
+               if (yych == 'L') goto yy786;
+               if (yych != 'l') goto yy280;
+yy786:
+               YYDEBUG(786, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'T') goto yy795;
-               if (yych != 't') goto yy284;
-yy795:
-               YYDEBUG(795, *YYCURSOR);
+               if (yych == 'T') goto yy787;
+               if (yych != 't') goto yy280;
+yy787:
+               YYDEBUG(787, *YYCURSOR);
                ++YYCURSOR;
                if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
-               YYDEBUG(796, *YYCURSOR);
+               YYDEBUG(788, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1032 "Zend/zend_language_scanner.l"
                {
        return T_DEFAULT;
 }
-#line 7324 "Zend/zend_language_scanner.c"
-yy797:
-               YYDEBUG(797, *YYCURSOR);
+#line 7281 "Zend/zend_language_scanner.c"
+yy789:
+               YYDEBUG(789, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'A') goto yy798;
-               if (yych != 'a') goto yy284;
-yy798:
-               YYDEBUG(798, *YYCURSOR);
+               if (yych == 'A') goto yy790;
+               if (yych != 'a') goto yy280;
+yy790:
+               YYDEBUG(790, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'R') goto yy799;
-               if (yych != 'r') goto yy284;
-yy799:
-               YYDEBUG(799, *YYCURSOR);
+               if (yych == 'R') goto yy791;
+               if (yych != 'r') goto yy280;
+yy791:
+               YYDEBUG(791, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'E') goto yy800;
-               if (yych != 'e') goto yy284;
-yy800:
-               YYDEBUG(800, *YYCURSOR);
+               if (yych == 'E') goto yy792;
+               if (yych != 'e') goto yy280;
+yy792:
+               YYDEBUG(792, *YYCURSOR);
                ++YYCURSOR;
                if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
-               YYDEBUG(801, *YYCURSOR);
+               YYDEBUG(793, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1004 "Zend/zend_language_scanner.l"
                {
        return T_DECLARE;
 }
-#line 7352 "Zend/zend_language_scanner.c"
-yy802:
-               YYDEBUG(802, *YYCURSOR);
+#line 7309 "Zend/zend_language_scanner.c"
+yy794:
+               YYDEBUG(794, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'H') goto yy864;
-               if (yych == 'h') goto yy864;
-               goto yy284;
-yy803:
-               YYDEBUG(803, *YYCURSOR);
+               if (yych == 'H') goto yy856;
+               if (yych == 'h') goto yy856;
+               goto yy280;
+yy795:
+               YYDEBUG(795, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'S') goto yy858;
-               if (yych == 's') goto yy858;
-               goto yy284;
-yy804:
-               YYDEBUG(804, *YYCURSOR);
+               if (yych == 'S') goto yy850;
+               if (yych == 's') goto yy850;
+               goto yy280;
+yy796:
+               YYDEBUG(796, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'P') goto yy854;
-               if (yych == 'p') goto yy854;
-               goto yy284;
-yy805:
-               YYDEBUG(805, *YYCURSOR);
+               if (yych == 'P') goto yy846;
+               if (yych == 'p') goto yy846;
+               goto yy280;
+yy797:
+               YYDEBUG(797, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'D') goto yy820;
-               if (yych == 'd') goto yy820;
-               goto yy284;
-yy806:
-               YYDEBUG(806, *YYCURSOR);
+               if (yych == 'D') goto yy812;
+               if (yych == 'd') goto yy812;
+               goto yy280;
+yy798:
+               YYDEBUG(798, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'A') goto yy817;
-               if (yych == 'a') goto yy817;
-               goto yy284;
-yy807:
-               YYDEBUG(807, *YYCURSOR);
+               if (yych == 'A') goto yy809;
+               if (yych == 'a') goto yy809;
+               goto yy280;
+yy799:
+               YYDEBUG(799, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych <= 'T') {
-                       if (yych == 'I') goto yy808;
-                       if (yych <= 'S') goto yy284;
-                       goto yy809;
+                       if (yych == 'I') goto yy800;
+                       if (yych <= 'S') goto yy280;
+                       goto yy801;
                } else {
                        if (yych <= 'i') {
-                               if (yych <= 'h') goto yy284;
+                               if (yych <= 'h') goto yy280;
                        } else {
-                               if (yych == 't') goto yy809;
-                               goto yy284;
+                               if (yych == 't') goto yy801;
+                               goto yy280;
                        }
                }
-yy808:
-               YYDEBUG(808, *YYCURSOR);
+yy800:
+               YYDEBUG(800, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'T') goto yy815;
-               if (yych == 't') goto yy815;
-               goto yy284;
-yy809:
-               YYDEBUG(809, *YYCURSOR);
+               if (yych == 'T') goto yy807;
+               if (yych == 't') goto yy807;
+               goto yy280;
+yy801:
+               YYDEBUG(801, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'E') goto yy810;
-               if (yych != 'e') goto yy284;
-yy810:
-               YYDEBUG(810, *YYCURSOR);
+               if (yych == 'E') goto yy802;
+               if (yych != 'e') goto yy280;
+yy802:
+               YYDEBUG(802, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'N') goto yy811;
-               if (yych != 'n') goto yy284;
-yy811:
-               YYDEBUG(811, *YYCURSOR);
+               if (yych == 'N') goto yy803;
+               if (yych != 'n') goto yy280;
+yy803:
+               YYDEBUG(803, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'D') goto yy812;
-               if (yych != 'd') goto yy284;
-yy812:
-               YYDEBUG(812, *YYCURSOR);
+               if (yych == 'D') goto yy804;
+               if (yych != 'd') goto yy280;
+yy804:
+               YYDEBUG(804, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'S') goto yy813;
-               if (yych != 's') goto yy284;
-yy813:
-               YYDEBUG(813, *YYCURSOR);
+               if (yych == 'S') goto yy805;
+               if (yych != 's') goto yy280;
+yy805:
+               YYDEBUG(805, *YYCURSOR);
                ++YYCURSOR;
                if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
-               YYDEBUG(814, *YYCURSOR);
+               YYDEBUG(806, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1064 "Zend/zend_language_scanner.l"
                {
        return T_EXTENDS;
 }
-#line 7436 "Zend/zend_language_scanner.c"
-yy815:
-               YYDEBUG(815, *YYCURSOR);
+#line 7393 "Zend/zend_language_scanner.c"
+yy807:
+               YYDEBUG(807, *YYCURSOR);
                ++YYCURSOR;
                if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
-               YYDEBUG(816, *YYCURSOR);
+               YYDEBUG(808, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 928 "Zend/zend_language_scanner.l"
                {
        return T_EXIT;
 }
-#line 7449 "Zend/zend_language_scanner.c"
-yy817:
-               YYDEBUG(817, *YYCURSOR);
+#line 7406 "Zend/zend_language_scanner.c"
+yy809:
+               YYDEBUG(809, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'L') goto yy818;
-               if (yych != 'l') goto yy284;
-yy818:
-               YYDEBUG(818, *YYCURSOR);
+               if (yych == 'L') goto yy810;
+               if (yych != 'l') goto yy280;
+yy810:
+               YYDEBUG(810, *YYCURSOR);
                ++YYCURSOR;
                if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
-               YYDEBUG(819, *YYCURSOR);
+               YYDEBUG(811, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1150 "Zend/zend_language_scanner.l"
                {
        return T_EVAL;
 }
-#line 7467 "Zend/zend_language_scanner.c"
-yy820:
-               YYDEBUG(820, *YYCURSOR);
+#line 7424 "Zend/zend_language_scanner.c"
+yy812:
+               YYDEBUG(812, *YYCURSOR);
                yych = *++YYCURSOR;
                YYDEBUG(-1, yych);
                switch (yych) {
                case 'D':
-               case 'd':       goto yy821;
+               case 'd':       goto yy813;
                case 'F':
-               case 'f':       goto yy822;
+               case 'f':       goto yy814;
                case 'I':
-               case 'i':       goto yy823;
+               case 'i':       goto yy815;
                case 'S':
-               case 's':       goto yy824;
+               case 's':       goto yy816;
                case 'W':
-               case 'w':       goto yy825;
-               default:        goto yy284;
+               case 'w':       goto yy817;
+               default:        goto yy280;
                }
-yy821:
-               YYDEBUG(821, *YYCURSOR);
+yy813:
+               YYDEBUG(813, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'E') goto yy847;
-               if (yych == 'e') goto yy847;
-               goto yy284;
-yy822:
-               YYDEBUG(822, *YYCURSOR);
+               if (yych == 'E') goto yy839;
+               if (yych == 'e') goto yy839;
+               goto yy280;
+yy814:
+               YYDEBUG(814, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'O') goto yy839;
-               if (yych == 'o') goto yy839;
-               goto yy284;
-yy823:
-               YYDEBUG(823, *YYCURSOR);
+               if (yych == 'O') goto yy831;
+               if (yych == 'o') goto yy831;
+               goto yy280;
+yy815:
+               YYDEBUG(815, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'F') goto yy837;
-               if (yych == 'f') goto yy837;
-               goto yy284;
-yy824:
-               YYDEBUG(824, *YYCURSOR);
+               if (yych == 'F') goto yy829;
+               if (yych == 'f') goto yy829;
+               goto yy280;
+yy816:
+               YYDEBUG(816, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'W') goto yy831;
-               if (yych == 'w') goto yy831;
-               goto yy284;
-yy825:
-               YYDEBUG(825, *YYCURSOR);
+               if (yych == 'W') goto yy823;
+               if (yych == 'w') goto yy823;
+               goto yy280;
+yy817:
+               YYDEBUG(817, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'H') goto yy826;
-               if (yych != 'h') goto yy284;
-yy826:
-               YYDEBUG(826, *YYCURSOR);
+               if (yych == 'H') goto yy818;
+               if (yych != 'h') goto yy280;
+yy818:
+               YYDEBUG(818, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'I') goto yy827;
-               if (yych != 'i') goto yy284;
-yy827:
-               YYDEBUG(827, *YYCURSOR);
+               if (yych == 'I') goto yy819;
+               if (yych != 'i') goto yy280;
+yy819:
+               YYDEBUG(819, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'L') goto yy828;
-               if (yych != 'l') goto yy284;
-yy828:
-               YYDEBUG(828, *YYCURSOR);
+               if (yych == 'L') goto yy820;
+               if (yych != 'l') goto yy280;
+yy820:
+               YYDEBUG(820, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'E') goto yy829;
-               if (yych != 'e') goto yy284;
-yy829:
-               YYDEBUG(829, *YYCURSOR);
+               if (yych == 'E') goto yy821;
+               if (yych != 'e') goto yy280;
+yy821:
+               YYDEBUG(821, *YYCURSOR);
                ++YYCURSOR;
                if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
-               YYDEBUG(830, *YYCURSOR);
+               YYDEBUG(822, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 980 "Zend/zend_language_scanner.l"
                {
        return T_ENDWHILE;
 }
-#line 7541 "Zend/zend_language_scanner.c"
-yy831:
-               YYDEBUG(831, *YYCURSOR);
+#line 7498 "Zend/zend_language_scanner.c"
+yy823:
+               YYDEBUG(823, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'I') goto yy832;
-               if (yych != 'i') goto yy284;
-yy832:
-               YYDEBUG(832, *YYCURSOR);
+               if (yych == 'I') goto yy824;
+               if (yych != 'i') goto yy280;
+yy824:
+               YYDEBUG(824, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'T') goto yy833;
-               if (yych != 't') goto yy284;
-yy833:
-               YYDEBUG(833, *YYCURSOR);
+               if (yych == 'T') goto yy825;
+               if (yych != 't') goto yy280;
+yy825:
+               YYDEBUG(825, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'C') goto yy834;
-               if (yych != 'c') goto yy284;
-yy834:
-               YYDEBUG(834, *YYCURSOR);
+               if (yych == 'C') goto yy826;
+               if (yych != 'c') goto yy280;
+yy826:
+               YYDEBUG(826, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'H') goto yy835;
-               if (yych != 'h') goto yy284;
-yy835:
-               YYDEBUG(835, *YYCURSOR);
+               if (yych == 'H') goto yy827;
+               if (yych != 'h') goto yy280;
+yy827:
+               YYDEBUG(827, *YYCURSOR);
                ++YYCURSOR;
                if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
-               YYDEBUG(836, *YYCURSOR);
+               YYDEBUG(828, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1024 "Zend/zend_language_scanner.l"
                {
        return T_ENDSWITCH;
 }
-#line 7574 "Zend/zend_language_scanner.c"
-yy837:
-               YYDEBUG(837, *YYCURSOR);
+#line 7531 "Zend/zend_language_scanner.c"
+yy829:
+               YYDEBUG(829, *YYCURSOR);
                ++YYCURSOR;
                if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
-               YYDEBUG(838, *YYCURSOR);
+               YYDEBUG(830, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 968 "Zend/zend_language_scanner.l"
                {
        return T_ENDIF;
 }
-#line 7587 "Zend/zend_language_scanner.c"
-yy839:
-               YYDEBUG(839, *YYCURSOR);
+#line 7544 "Zend/zend_language_scanner.c"
+yy831:
+               YYDEBUG(831, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'R') goto yy840;
-               if (yych != 'r') goto yy284;
-yy840:
-               YYDEBUG(840, *YYCURSOR);
+               if (yych == 'R') goto yy832;
+               if (yych != 'r') goto yy280;
+yy832:
+               YYDEBUG(832, *YYCURSOR);
                ++YYCURSOR;
                if ((yych = *YYCURSOR) <= '^') {
                        if (yych <= '@') {
-                               if (yych <= '/') goto yy841;
-                               if (yych <= '9') goto yy283;
+                               if (yych <= '/') goto yy833;
+                               if (yych <= '9') goto yy279;
                        } else {
-                               if (yych == 'E') goto yy842;
-                               if (yych <= 'Z') goto yy283;
+                               if (yych == 'E') goto yy834;
+                               if (yych <= 'Z') goto yy279;
                        }
                } else {
                        if (yych <= 'd') {
-                               if (yych != '`') goto yy283;
+                               if (yych != '`') goto yy279;
                        } else {
-                               if (yych <= 'e') goto yy842;
-                               if (yych <= 'z') goto yy283;
-                               if (yych >= 0x7F) goto yy283;
+                               if (yych <= 'e') goto yy834;
+                               if (yych <= 'z') goto yy279;
+                               if (yych >= 0x7F) goto yy279;
                        }
                }
-yy841:
-               YYDEBUG(841, *YYCURSOR);
+yy833:
+               YYDEBUG(833, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 992 "Zend/zend_language_scanner.l"
                {
        return T_ENDFOR;
 }
-#line 7620 "Zend/zend_language_scanner.c"
-yy842:
-               YYDEBUG(842, *YYCURSOR);
+#line 7577 "Zend/zend_language_scanner.c"
+yy834:
+               YYDEBUG(834, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'A') goto yy843;
-               if (yych != 'a') goto yy284;
-yy843:
-               YYDEBUG(843, *YYCURSOR);
+               if (yych == 'A') goto yy835;
+               if (yych != 'a') goto yy280;
+yy835:
+               YYDEBUG(835, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'C') goto yy844;
-               if (yych != 'c') goto yy284;
-yy844:
-               YYDEBUG(844, *YYCURSOR);
+               if (yych == 'C') goto yy836;
+               if (yych != 'c') goto yy280;
+yy836:
+               YYDEBUG(836, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'H') goto yy845;
-               if (yych != 'h') goto yy284;
-yy845:
-               YYDEBUG(845, *YYCURSOR);
+               if (yych == 'H') goto yy837;
+               if (yych != 'h') goto yy280;
+yy837:
+               YYDEBUG(837, *YYCURSOR);
                ++YYCURSOR;
                if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
-               YYDEBUG(846, *YYCURSOR);
+               YYDEBUG(838, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1000 "Zend/zend_language_scanner.l"
                {
        return T_ENDFOREACH;
 }
-#line 7648 "Zend/zend_language_scanner.c"
-yy847:
-               YYDEBUG(847, *YYCURSOR);
+#line 7605 "Zend/zend_language_scanner.c"
+yy839:
+               YYDEBUG(839, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'C') goto yy848;
-               if (yych != 'c') goto yy284;
-yy848:
-               YYDEBUG(848, *YYCURSOR);
+               if (yych == 'C') goto yy840;
+               if (yych != 'c') goto yy280;
+yy840:
+               YYDEBUG(840, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'L') goto yy849;
-               if (yych != 'l') goto yy284;
-yy849:
-               YYDEBUG(849, *YYCURSOR);
+               if (yych == 'L') goto yy841;
+               if (yych != 'l') goto yy280;
+yy841:
+               YYDEBUG(841, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'A') goto yy850;
-               if (yych != 'a') goto yy284;
-yy850:
-               YYDEBUG(850, *YYCURSOR);
+               if (yych == 'A') goto yy842;
+               if (yych != 'a') goto yy280;
+yy842:
+               YYDEBUG(842, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'R') goto yy851;
-               if (yych != 'r') goto yy284;
-yy851:
-               YYDEBUG(851, *YYCURSOR);
+               if (yych == 'R') goto yy843;
+               if (yych != 'r') goto yy280;
+yy843:
+               YYDEBUG(843, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'E') goto yy852;
-               if (yych != 'e') goto yy284;
-yy852:
-               YYDEBUG(852, *YYCURSOR);
+               if (yych == 'E') goto yy844;
+               if (yych != 'e') goto yy280;
+yy844:
+               YYDEBUG(844, *YYCURSOR);
                ++YYCURSOR;
                if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
-               YYDEBUG(853, *YYCURSOR);
+               YYDEBUG(845, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1008 "Zend/zend_language_scanner.l"
                {
        return T_ENDDECLARE;
 }
-#line 7686 "Zend/zend_language_scanner.c"
-yy854:
-               YYDEBUG(854, *YYCURSOR);
+#line 7643 "Zend/zend_language_scanner.c"
+yy846:
+               YYDEBUG(846, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'T') goto yy855;
-               if (yych != 't') goto yy284;
-yy855:
-               YYDEBUG(855, *YYCURSOR);
+               if (yych == 'T') goto yy847;
+               if (yych != 't') goto yy280;
+yy847:
+               YYDEBUG(847, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'Y') goto yy856;
-               if (yych != 'y') goto yy284;
-yy856:
-               YYDEBUG(856, *YYCURSOR);
+               if (yych == 'Y') goto yy848;
+               if (yych != 'y') goto yy280;
+yy848:
+               YYDEBUG(848, *YYCURSOR);
                ++YYCURSOR;
                if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
-               YYDEBUG(857, *YYCURSOR);
+               YYDEBUG(849, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1186 "Zend/zend_language_scanner.l"
                {
        return T_EMPTY;
 }
-#line 7709 "Zend/zend_language_scanner.c"
-yy858:
-               YYDEBUG(858, *YYCURSOR);
+#line 7666 "Zend/zend_language_scanner.c"
+yy850:
+               YYDEBUG(850, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'E') goto yy859;
-               if (yych != 'e') goto yy284;
-yy859:
-               YYDEBUG(859, *YYCURSOR);
+               if (yych == 'E') goto yy851;
+               if (yych != 'e') goto yy280;
+yy851:
+               YYDEBUG(851, *YYCURSOR);
                ++YYCURSOR;
                if ((yych = *YYCURSOR) <= '^') {
                        if (yych <= '@') {
-                               if (yych <= '/') goto yy860;
-                               if (yych <= '9') goto yy283;
+                               if (yych <= '/') goto yy852;
+                               if (yych <= '9') goto yy279;
                        } else {
-                               if (yych == 'I') goto yy861;
-                               if (yych <= 'Z') goto yy283;
+                               if (yych == 'I') goto yy853;
+                               if (yych <= 'Z') goto yy279;
                        }
                } else {
                        if (yych <= 'h') {
-                               if (yych != '`') goto yy283;
+                               if (yych != '`') goto yy279;
                        } else {
-                               if (yych <= 'i') goto yy861;
-                               if (yych <= 'z') goto yy283;
-                               if (yych >= 0x7F) goto yy283;
+                               if (yych <= 'i') goto yy853;
+                               if (yych <= 'z') goto yy279;
+                               if (yych >= 0x7F) goto yy279;
                        }
                }
-yy860:
-               YYDEBUG(860, *YYCURSOR);
-               yyleng = YYCURSOR - SCNG(yy_text);
+yy852:
+               YYDEBUG(852, *YYCURSOR);
+               yyleng = YYCURSOR - SCNG(yy_text);
 #line 972 "Zend/zend_language_scanner.l"
                {
        return T_ELSE;
 }
-#line 7742 "Zend/zend_language_scanner.c"
-yy861:
-               YYDEBUG(861, *YYCURSOR);
+#line 7699 "Zend/zend_language_scanner.c"
+yy853:
+               YYDEBUG(853, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'F') goto yy862;
-               if (yych != 'f') goto yy284;
-yy862:
-               YYDEBUG(862, *YYCURSOR);
+               if (yych == 'F') goto yy854;
+               if (yych != 'f') goto yy280;
+yy854:
+               YYDEBUG(854, *YYCURSOR);
                ++YYCURSOR;
                if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
-               YYDEBUG(863, *YYCURSOR);
+               YYDEBUG(855, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 964 "Zend/zend_language_scanner.l"
                {
        return T_ELSEIF;
 }
-#line 7760 "Zend/zend_language_scanner.c"
-yy864:
-               YYDEBUG(864, *YYCURSOR);
+#line 7717 "Zend/zend_language_scanner.c"
+yy856:
+               YYDEBUG(856, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'O') goto yy865;
-               if (yych != 'o') goto yy284;
-yy865:
-               YYDEBUG(865, *YYCURSOR);
+               if (yych == 'O') goto yy857;
+               if (yych != 'o') goto yy280;
+yy857:
+               YYDEBUG(857, *YYCURSOR);
                ++YYCURSOR;
                if (yybm[0+(yych = *YYCURSOR)] & 8) {
-                       goto yy283;
+                       goto yy279;
                }
-               YYDEBUG(866, *YYCURSOR);
+               YYDEBUG(858, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1048 "Zend/zend_language_scanner.l"
                {
        return T_ECHO;
 }
-#line 7778 "Zend/zend_language_scanner.c"
+#line 7735 "Zend/zend_language_scanner.c"
        }
 /* *********************************** */
 yyc_ST_LOOKING_FOR_PROPERTY:
@@ -7813,39 +7770,39 @@ yyc_ST_LOOKING_FOR_PROPERTY:
                         64,  64,  64,  64,  64,  64,  64,  64, 
                         64,  64,  64,  64,  64,  64,  64,  64, 
                };
-               YYDEBUG(867, *YYCURSOR);
+               YYDEBUG(859, *YYCURSOR);
                YYFILL(2);
                yych = *YYCURSOR;
                if (yych <= '-') {
                        if (yych <= '\r') {
-                               if (yych <= 0x08) goto yy875;
-                               if (yych <= '\n') goto yy869;
-                               if (yych <= '\f') goto yy875;
+                               if (yych <= 0x08) goto yy867;
+                               if (yych <= '\n') goto yy861;
+                               if (yych <= '\f') goto yy867;
                        } else {
-                               if (yych == ' ') goto yy869;
-                               if (yych <= ',') goto yy875;
-                               goto yy871;
+                               if (yych == ' ') goto yy861;
+                               if (yych <= ',') goto yy867;
+                               goto yy863;
                        }
                } else {
                        if (yych <= '_') {
-                               if (yych <= '@') goto yy875;
-                               if (yych <= 'Z') goto yy873;
-                               if (yych <= '^') goto yy875;
-                               goto yy873;
+                               if (yych <= '@') goto yy867;
+                               if (yych <= 'Z') goto yy865;
+                               if (yych <= '^') goto yy867;
+                               goto yy865;
                        } else {
-                               if (yych <= '`') goto yy875;
-                               if (yych <= 'z') goto yy873;
-                               if (yych <= '~') goto yy875;
-                               goto yy873;
+                               if (yych <= '`') goto yy867;
+                               if (yych <= 'z') goto yy865;
+                               if (yych <= '~') goto yy867;
+                               goto yy865;
                        }
                }
-yy869:
-               YYDEBUG(869, *YYCURSOR);
+yy861:
+               YYDEBUG(861, *YYCURSOR);
                ++YYCURSOR;
                yych = *YYCURSOR;
-               goto yy881;
-yy870:
-               YYDEBUG(870, *YYCURSOR);
+               goto yy873;
+yy862:
+               YYDEBUG(862, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1077 "Zend/zend_language_scanner.l"
                {
@@ -7855,13 +7812,13 @@ yy870:
        HANDLE_NEWLINES(yytext, yyleng);
        return T_WHITESPACE;
 }
-#line 7859 "Zend/zend_language_scanner.c"
-yy871:
-               YYDEBUG(871, *YYCURSOR);
+#line 7816 "Zend/zend_language_scanner.c"
+yy863:
+               YYDEBUG(863, *YYCURSOR);
                ++YYCURSOR;
-               if ((yych = *YYCURSOR) == '>') goto yy878;
-yy872:
-               YYDEBUG(872, *YYCURSOR);
+               if ((yych = *YYCURSOR) == '>') goto yy870;
+yy864:
+               YYDEBUG(864, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1096 "Zend/zend_language_scanner.l"
                {
@@ -7869,14 +7826,14 @@ yy872:
        yy_pop_state(TSRMLS_C);
        goto restart;
 }
-#line 7873 "Zend/zend_language_scanner.c"
-yy873:
-               YYDEBUG(873, *YYCURSOR);
+#line 7830 "Zend/zend_language_scanner.c"
+yy865:
+               YYDEBUG(865, *YYCURSOR);
                ++YYCURSOR;
                yych = *YYCURSOR;
-               goto yy877;
-yy874:
-               YYDEBUG(874, *YYCURSOR);
+               goto yy869;
+yy866:
+               YYDEBUG(866, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1089 "Zend/zend_language_scanner.l"
                {
@@ -7885,43 +7842,43 @@ yy874:
        zendlval->type = IS_STRING;
        return T_STRING;
 }
-#line 7889 "Zend/zend_language_scanner.c"
-yy875:
-               YYDEBUG(875, *YYCURSOR);
+#line 7846 "Zend/zend_language_scanner.c"
+yy867:
+               YYDEBUG(867, *YYCURSOR);
                yych = *++YYCURSOR;
-               goto yy872;
-yy876:
-               YYDEBUG(876, *YYCURSOR);
+               goto yy864;
+yy868:
+               YYDEBUG(868, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-yy877:
-               YYDEBUG(877, *YYCURSOR);
+yy869:
+               YYDEBUG(869, *YYCURSOR);
                if (yybm[0+yych] & 64) {
-                       goto yy876;
+                       goto yy868;
                }
-               goto yy874;
-yy878:
-               YYDEBUG(878, *YYCURSOR);
+               goto yy866;
+yy870:
+               YYDEBUG(870, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(879, *YYCURSOR);
+               YYDEBUG(871, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1085 "Zend/zend_language_scanner.l"
                {
        return T_OBJECT_OPERATOR;
 }
-#line 7914 "Zend/zend_language_scanner.c"
-yy880:
-               YYDEBUG(880, *YYCURSOR);
+#line 7871 "Zend/zend_language_scanner.c"
+yy872:
+               YYDEBUG(872, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-yy881:
-               YYDEBUG(881, *YYCURSOR);
+yy873:
+               YYDEBUG(873, *YYCURSOR);
                if (yybm[0+yych] & 128) {
-                       goto yy880;
+                       goto yy872;
                }
-               goto yy870;
+               goto yy862;
        }
 /* *********************************** */
 yyc_ST_LOOKING_FOR_VARNAME:
@@ -7960,25 +7917,25 @@ yyc_ST_LOOKING_FOR_VARNAME:
                        128, 128, 128, 128, 128, 128, 128, 128, 
                        128, 128, 128, 128, 128, 128, 128, 128, 
                };
-               YYDEBUG(882, *YYCURSOR);
+               YYDEBUG(874, *YYCURSOR);
                YYFILL(2);
                yych = *YYCURSOR;
                if (yych <= '_') {
-                       if (yych <= '@') goto yy886;
-                       if (yych <= 'Z') goto yy884;
-                       if (yych <= '^') goto yy886;
+                       if (yych <= '@') goto yy878;
+                       if (yych <= 'Z') goto yy876;
+                       if (yych <= '^') goto yy878;
                } else {
-                       if (yych <= '`') goto yy886;
-                       if (yych <= 'z') goto yy884;
-                       if (yych <= '~') goto yy886;
+                       if (yych <= '`') goto yy878;
+                       if (yych <= 'z') goto yy876;
+                       if (yych <= '~') goto yy878;
                }
-yy884:
-               YYDEBUG(884, *YYCURSOR);
+yy876:
+               YYDEBUG(876, *YYCURSOR);
                ++YYCURSOR;
                yych = *YYCURSOR;
-               goto yy889;
-yy885:
-               YYDEBUG(885, *YYCURSOR);
+               goto yy881;
+yy877:
+               YYDEBUG(877, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1364 "Zend/zend_language_scanner.l"
                {
@@ -7988,11 +7945,11 @@ yy885:
        yy_push_state(ST_IN_SCRIPTING TSRMLS_CC);
        return T_STRING_VARNAME;
 }
-#line 7992 "Zend/zend_language_scanner.c"
-yy886:
-               YYDEBUG(886, *YYCURSOR);
+#line 7949 "Zend/zend_language_scanner.c"
+yy878:
+               YYDEBUG(878, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(887, *YYCURSOR);
+               YYDEBUG(879, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1373 "Zend/zend_language_scanner.l"
                {
@@ -8001,469 +7958,156 @@ yy886:
        yy_push_state(ST_IN_SCRIPTING TSRMLS_CC);
        goto restart;
 }
-#line 8005 "Zend/zend_language_scanner.c"
-yy888:
-               YYDEBUG(888, *YYCURSOR);
+#line 7962 "Zend/zend_language_scanner.c"
+yy880:
+               YYDEBUG(880, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-yy889:
-               YYDEBUG(889, *YYCURSOR);
+yy881:
+               YYDEBUG(881, *YYCURSOR);
                if (yybm[0+yych] & 128) {
-                       goto yy888;
+                       goto yy880;
                }
-               goto yy885;
+               goto yy877;
        }
 /* *********************************** */
 yyc_ST_NOWDOC:
        {
                static const unsigned char yybm[] = {
-                        32,  32,  32,  32,  32,  32,  32,  32
-                        32,  32,   8,  32,  32,  16,  32,  32
-                        32,  32,  32,  32,  32,  32,  32,  32
-                        32,  32,  32,  32,  32,  32,  32,  32
-                        32,  32,  32,  32,  32,  32,  32,  32
-                        32,  32,  32,  32,  32,  32,  32,  32
-                        96,  96,  96,  96,  96,  96,  96,  96
-                        96,  96,  32,  32,  32,  32,  32,  32
-                        32, 192, 192, 192, 192, 192, 192, 192
-                       192, 192, 192, 192, 192, 192, 192, 192
-                       192, 192, 192, 192, 192, 192, 192, 192
-                       192, 192, 192,  32,  32,  32,  32, 192
-                        32, 192, 192, 192, 192, 192, 192, 192
-                       192, 192, 192, 192, 192, 192, 192, 192
-                       192, 192, 192, 192, 192, 192, 192, 192
-                       192, 192, 192,  32,  32,  32,  32, 192
-                       192, 192, 192, 192, 192, 192, 192, 192
-                       192, 192, 192, 192, 192, 192, 192, 192
-                       192, 192, 192, 192, 192, 192, 192, 192
-                       192, 192, 192, 192, 192, 192, 192, 192
-                       192, 192, 192, 192, 192, 192, 192, 192
-                       192, 192, 192, 192, 192, 192, 192, 192
-                       192, 192, 192, 192, 192, 192, 192, 192
-                       192, 192, 192, 192, 192, 192, 192, 192
-                       192, 192, 192, 192, 192, 192, 192, 192
-                       192, 192, 192, 192, 192, 192, 192, 192
-                       192, 192, 192, 192, 192, 192, 192, 192
-                       192, 192, 192, 192, 192, 192, 192, 192
-                       192, 192, 192, 192, 192, 192, 192, 192
-                       192, 192, 192, 192, 192, 192, 192, 192
-                       192, 192, 192, 192, 192, 192, 192, 192
-                       192, 192, 192, 192, 192, 192, 192, 192
+                        16,  16,  16,  16,  16,  16,  16,  16
+                        16,  16,  32,  16,  16,  64,  16,  16
+                        16,  16,  16,  16,  16,  16,  16,  16
+                        16,  16,  16,  16,  16,  16,  16,  16
+                        16,  16,  16,  16,  16,  16,  16,  16
+                        16,  16,  16,  16,  16,  16,  16,  16
+                       144, 144, 144, 144, 144, 144, 144, 144
+                       144, 144,  16,  16,  16,  16,  16,  16
+                        16, 144, 144, 144, 144, 144, 144, 144
+                       144, 144, 144, 144, 144, 144, 144, 144
+                       144, 144, 144, 144, 144, 144, 144, 144
+                       144, 144, 144,  16,  16,  16,  16, 144
+                        16, 144, 144, 144, 144, 144, 144, 144
+                       144, 144, 144, 144, 144, 144, 144, 144
+                       144, 144, 144, 144, 144, 144, 144, 144
+                       144, 144, 144,  16,  16,  16,  16, 144
+                       144, 144, 144, 144, 144, 144, 144, 144
+                       144, 144, 144, 144, 144, 144, 144, 144
+                       144, 144, 144, 144, 144, 144, 144, 144
+                       144, 144, 144, 144, 144, 144, 144, 144
+                       144, 144, 144, 144, 144, 144, 144, 144
+                       144, 144, 144, 144, 144, 144, 144, 144
+                       144, 144, 144, 144, 144, 144, 144, 144
+                       144, 144, 144, 144, 144, 144, 144, 144
+                       144, 144, 144, 144, 144, 144, 144, 144
+                       144, 144, 144, 144, 144, 144, 144, 144
+                       144, 144, 144, 144, 144, 144, 144, 144
+                       144, 144, 144, 144, 144, 144, 144, 144
+                       144, 144, 144, 144, 144, 144, 144, 144
+                       144, 144, 144, 144, 144, 144, 144, 144
+                       144, 144, 144, 144, 144, 144, 144, 144
+                       144, 144, 144, 144, 144, 144, 144, 144
                };
-               YYDEBUG(890, *YYCURSOR);
-               YYFILL(1);
-               yych = *YYCURSOR;
-               if (yybm[0+yych] & 32) {
-                       goto yy896;
-               }
-               if (yych <= '\f') goto yy892;
-               if (yych <= '\r') goto yy894;
-               goto yy898;
-yy892:
-               YYDEBUG(892, *YYCURSOR);
-               ++YYCURSOR;
+               YYDEBUG(882, *YYCURSOR);
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(893, *YYCURSOR);
-               if (yybm[0+yych] & 32) {
-                       goto yy896;
+               if (yybm[0+yych] & 16) {
+                       goto yy884;
                }
-               if (yych <= '\f') goto yy892;
-               if (yych >= 0x0E) goto yy922;
-yy894:
-               YYDEBUG(894, *YYCURSOR);
+               if (yych <= '\f') goto yy886;
+               goto yy888;
+yy884:
+               YYDEBUG(884, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(895, *YYCURSOR);
-               if (yybm[0+yych] & 32) {
-                       goto yy896;
+               YYDEBUG(885, *YYCURSOR);
+               if (yybm[0+yych] & 16) {
+                       goto yy884;
                }
-               if (yych <= '\f') goto yy892;
-               if (yych <= '\r') goto yy894;
-               goto yy922;
-yy896:
-               YYDEBUG(896, *YYCURSOR);
+               if (yych <= '\f') goto yy895;
+               goto yy897;
+yy886:
+               YYDEBUG(886, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(897, *YYCURSOR);
+               YYDEBUG(887, *YYCURSOR);
                if (yybm[0+yych] & 32) {
-                       goto yy896;
-               }
-               if (yych <= '\f') goto yy892;
-               if (yych <= '\r') goto yy894;
-               goto yy920;
-yy898:
-               YYDEBUG(898, *YYCURSOR);
-               ++YYCURSOR;
-               YYFILL(2);
-               yych = *YYCURSOR;
-               YYDEBUG(899, *YYCURSOR);
-               if (yybm[0+yych] & 64) {
-                       goto yy898;
-               }
-               if (yych <= '\f') {
-                       if (yych != '\n') goto yy902;
-               } else {
-                       if (yych <= '\r') goto yy900;
-                       if (yych == ';') goto yy901;
-                       goto yy902;
-               }
-yy900:
-               YYDEBUG(900, *YYCURSOR);
-yy901:
-               YYDEBUG(901, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == '\n') goto yy900;
-               if (yych == '\r') goto yy900;
-               goto yy913;
-yy902:
-               YYDEBUG(902, *YYCURSOR);
-               ++YYCURSOR;
-               YYFILL(1);
-               yych = *YYCURSOR;
-               if (yybm[0+yych] & 8) {
-                       goto yy892;
+                       goto yy886;
                }
                if (yych <= '^') {
                        if (yych <= '\r') {
-                               if (yych >= '\r') goto yy894;
+                               if (yych <= '\f') goto yy884;
                        } else {
-                               if (yych <= '@') goto yy903;
-                               if (yych <= 'Z') goto yy905;
+                               if (yych <= '@') goto yy884;
+                               if (yych <= 'Z') goto yy890;
+                               goto yy884;
                        }
                } else {
                        if (yych <= '`') {
-                               if (yych <= '_') goto yy905;
+                               if (yych <= '_') goto yy890;
+                               goto yy884;
                        } else {
-                               if (yych <= 'z') goto yy905;
-                               if (yych >= 0x7F) goto yy905;
+                               if (yych <= 'z') goto yy890;
+                               if (yych <= '~') goto yy884;
+                               goto yy890;
                        }
                }
-yy903:
-               YYDEBUG(903, *YYCURSOR);
-               ++YYCURSOR;
-               YYFILL(1);
-               yych = *YYCURSOR;
-               YYDEBUG(904, *YYCURSOR);
-               if (yybm[0+yych] & 8) {
-                       goto yy892;
-               }
-               if (yych <= '^') {
-                       if (yych <= '\r') {
-                               if (yych <= '\f') goto yy903;
-                               goto yy894;
-                       } else {
-                               if (yych <= '@') goto yy903;
-                               if (yych <= 'Z') goto yy907;
-                               goto yy903;
-                       }
-               } else {
-                       if (yych <= '`') {
-                               if (yych <= '_') goto yy907;
-                               goto yy903;
-                       } else {
-                               if (yych <= 'z') goto yy907;
-                               if (yych <= '~') goto yy903;
-                               goto yy907;
-                       }
-               }
-yy905:
-               YYDEBUG(905, *YYCURSOR);
-               ++YYCURSOR;
-               YYFILL(1);
-               yych = *YYCURSOR;
-               YYDEBUG(906, *YYCURSOR);
-               if (yybm[0+yych] & 8) {
-                       goto yy892;
-               }
-               if (yych <= '@') {
-                       if (yych <= '/') {
-                               if (yych == '\r') goto yy894;
-                               goto yy903;
-                       } else {
-                               if (yych <= '9') goto yy907;
-                               if (yych == ';') goto yy909;
-                               goto yy903;
-                       }
-               } else {
-                       if (yych <= '_') {
-                               if (yych <= 'Z') goto yy905;
-                               if (yych <= '^') goto yy903;
-                               goto yy905;
-                       } else {
-                               if (yych <= '`') goto yy903;
-                               if (yych <= 'z') goto yy905;
-                               if (yych <= '~') goto yy903;
-                               goto yy905;
-                       }
-               }
-yy907:
-               YYDEBUG(907, *YYCURSOR);
-               ++YYCURSOR;
-               YYFILL(1);
-               yych = *YYCURSOR;
-               YYDEBUG(908, *YYCURSOR);
-               if (yybm[0+yych] & 8) {
-                       goto yy892;
-               }
-               if (yych <= '@') {
-                       if (yych <= '/') {
-                               if (yych == '\r') goto yy894;
-                               goto yy903;
-                       } else {
-                               if (yych <= '9') goto yy907;
-                               if (yych != ';') goto yy903;
-                       }
-               } else {
-                       if (yych <= '_') {
-                               if (yych <= 'Z') goto yy907;
-                               if (yych <= '^') goto yy903;
-                               goto yy907;
-                       } else {
-                               if (yych <= '`') goto yy903;
-                               if (yych <= 'z') goto yy907;
-                               if (yych <= '~') goto yy903;
-                               goto yy907;
-                       }
-               }
-yy909:
-               YYDEBUG(909, *YYCURSOR);
-               ++YYCURSOR;
-               YYFILL(1);
-               yych = *YYCURSOR;
-               YYDEBUG(910, *YYCURSOR);
-               if (yybm[0+yych] & 8) {
-                       goto yy892;
-               }
-               if (yych <= '^') {
-                       if (yych <= '\r') {
-                               if (yych <= '\f') goto yy909;
-                               goto yy894;
-                       } else {
-                               if (yych <= '@') goto yy909;
-                               if (yych >= '[') goto yy909;
-                       }
-               } else {
-                       if (yych <= '`') {
-                               if (yych >= '`') goto yy909;
-                       } else {
-                               if (yych <= 'z') goto yy911;
-                               if (yych <= '~') goto yy909;
-                       }
-               }
-yy911:
-               YYDEBUG(911, *YYCURSOR);
-               ++YYCURSOR;
-               YYFILL(1);
-               yych = *YYCURSOR;
-               YYDEBUG(912, *YYCURSOR);
-               if (yybm[0+yych] & 8) {
-                       goto yy892;
-               }
-               if (yych <= 'Z') {
-                       if (yych <= '/') {
-                               if (yych == '\r') goto yy894;
-                               goto yy909;
-                       } else {
-                               if (yych <= '9') goto yy911;
-                               if (yych <= '@') goto yy909;
-                               goto yy911;
-                       }
-               } else {
-                       if (yych <= '`') {
-                               if (yych == '_') goto yy911;
-                               goto yy909;
-                       } else {
-                               if (yych <= 'z') goto yy911;
-                               if (yych <= '~') goto yy909;
-                               goto yy911;
-                       }
-               }
-yy913:
-               YYDEBUG(913, *YYCURSOR);
-               ++YYCURSOR;
-               YYFILL(1);
-               yych = *YYCURSOR;
-               if (yybm[0+yych] & 8) {
-                       goto yy892;
-               }
-               if (yych <= '^') {
-                       if (yych <= '\r') {
-                               if (yych >= '\r') goto yy894;
-                       } else {
-                               if (yych <= '@') goto yy914;
-                               if (yych <= 'Z') goto yy916;
-                       }
-               } else {
-                       if (yych <= '`') {
-                               if (yych <= '_') goto yy916;
-                       } else {
-                               if (yych <= 'z') goto yy916;
-                               if (yych >= 0x7F) goto yy916;
-                       }
-               }
-yy914:
-               YYDEBUG(914, *YYCURSOR);
+yy888:
+               YYDEBUG(888, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(915, *YYCURSOR);
-               if (yybm[0+yych] & 8) {
-                       goto yy892;
+               YYDEBUG(889, *YYCURSOR);
+               if (yybm[0+yych] & 32) {
+                       goto yy886;
                }
                if (yych <= '^') {
                        if (yych <= '\r') {
-                               if (yych <= '\f') goto yy914;
-                               goto yy894;
+                               if (yych <= '\f') goto yy884;
+                               goto yy888;
                        } else {
-                               if (yych <= '@') goto yy914;
-                               if (yych <= 'Z') goto yy918;
-                               goto yy914;
+                               if (yych <= '@') goto yy884;
+                               if (yych >= '[') goto yy884;
                        }
                } else {
                        if (yych <= '`') {
-                               if (yych <= '_') goto yy918;
-                               goto yy914;
+                               if (yych >= '`') goto yy884;
                        } else {
-                               if (yych <= 'z') goto yy918;
-                               if (yych <= '~') goto yy914;
-                               goto yy918;
+                               if (yych <= 'z') goto yy890;
+                               if (yych <= '~') goto yy884;
                        }
                }
-yy916:
-               YYDEBUG(916, *YYCURSOR);
-               ++YYCURSOR;
-               YYFILL(1);
-               yych = *YYCURSOR;
-               YYDEBUG(917, *YYCURSOR);
-               if (yybm[0+yych] & 8) {
-                       goto yy892;
-               }
-               if (yych <= '@') {
-                       if (yych <= '/') {
-                               if (yych == '\r') goto yy894;
-                               goto yy909;
-                       } else {
-                               if (yych <= '9') goto yy918;
-                               if (yych == ';') goto yy914;
-                               goto yy909;
-                       }
-               } else {
-                       if (yych <= '_') {
-                               if (yych <= 'Z') goto yy916;
-                               if (yych <= '^') goto yy909;
-                               goto yy916;
-                       } else {
-                               if (yych <= '`') goto yy909;
-                               if (yych <= 'z') goto yy916;
-                               if (yych <= '~') goto yy909;
-                               goto yy916;
-                       }
-               }
-yy918:
-               YYDEBUG(918, *YYCURSOR);
+yy890:
+               YYDEBUG(890, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(919, *YYCURSOR);
-               if (yybm[0+yych] & 8) {
-                       goto yy892;
+               YYDEBUG(891, *YYCURSOR);
+               if (yybm[0+yych] & 128) {
+                       goto yy890;
                }
-               if (yych <= '@') {
-                       if (yych <= '/') {
-                               if (yych == '\r') goto yy894;
-                               goto yy909;
-                       } else {
-                               if (yych <= '9') goto yy918;
-                               if (yych == ';') goto yy914;
-                               goto yy909;
-                       }
+               if (yych <= '\f') {
+                       if (yych == '\n') goto yy893;
+                       goto yy884;
                } else {
-                       if (yych <= '_') {
-                               if (yych <= 'Z') goto yy918;
-                               if (yych <= '^') goto yy909;
-                               goto yy918;
-                       } else {
-                               if (yych <= '`') goto yy909;
-                               if (yych <= 'z') goto yy918;
-                               if (yych <= '~') goto yy909;
-                               goto yy918;
-                       }
+                       if (yych <= '\r') goto yy893;
+                       if (yych != ';') goto yy884;
                }
-yy920:
-               YYDEBUG(920, *YYCURSOR);
-               ++YYCURSOR;
-               YYFILL(1);
-               yych = *YYCURSOR;
-               YYDEBUG(921, *YYCURSOR);
-               if (yybm[0+yych] & 8) {
-                       goto yy892;
-               }
-               if (yych <= '@') {
-                       if (yych <= '/') {
-                               if (yych == '\r') goto yy894;
-                               goto yy903;
-                       } else {
-                               if (yych <= '9') goto yy920;
-                               if (yych == ';') goto yy914;
-                               goto yy903;
-                       }
-               } else {
-                       if (yych <= '_') {
-                               if (yych <= 'Z') goto yy920;
-                               if (yych <= '^') goto yy903;
-                               goto yy920;
-                       } else {
-                               if (yych <= '`') goto yy903;
-                               if (yych <= 'z') goto yy920;
-                               if (yych <= '~') goto yy903;
-                               goto yy920;
-                       }
-               }
-yy922:
-               YYDEBUG(922, *YYCURSOR);
+               YYDEBUG(892, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(923, *YYCURSOR);
-               if (yych <= ';') {
-                       if (yych <= '\r') {
-                               if (yych == '\n') goto yy925;
-                               if (yych <= '\f') goto yy902;
-                               goto yy925;
-                       } else {
-                               if (yych <= '/') goto yy902;
-                               if (yych <= '9') goto yy922;
-                               if (yych <= ':') goto yy902;
-                       }
-               } else {
-                       if (yych <= '_') {
-                               if (yych <= '@') goto yy902;
-                               if (yych <= 'Z') goto yy922;
-                               if (yych <= '^') goto yy902;
-                               goto yy922;
-                       } else {
-                               if (yych <= '`') goto yy902;
-                               if (yych <= 'z') goto yy922;
-                               if (yych <= '~') goto yy902;
-                               goto yy922;
-                       }
+               if (yybm[0+yych] & 16) {
+                       goto yy884;
                }
-               YYDEBUG(924, *YYCURSOR);
-               ++YYCURSOR;
-               YYFILL(1);
-               yych = *YYCURSOR;
-               if (yych == '\n') goto yy925;
-               if (yych != '\r') goto yy913;
-yy925:
-               YYDEBUG(925, *YYCURSOR);
+yy893:
+               YYDEBUG(893, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(926, *YYCURSOR);
+               YYDEBUG(894, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2113 "Zend/zend_language_scanner.l"
+#line 2063 "Zend/zend_language_scanner.l"
                {
        char *end = yytext + yyleng - 1;
 
@@ -8485,19 +8129,16 @@ yy925:
                        len--; /* Windows newline */
                }
 
-               /* 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
-                * before label, for zend_highlight/strip, tokenizer, etc. */
-               yyleng -= CG(heredoc_len) - 1;
+               /* Go back before label, to match in ST_END_HEREDOC state. yytext will include
+                * newline before label, for zend_highlight/strip, tokenizer, etc. */
+               yyless(yyleng - CG(heredoc_len) - 1); /* 1 for newline after label */
 
                CG(increment_lineno) = 1; /* For newline before label */
-               BEGIN(ST_END_NOWDOC);
+               BEGIN(ST_END_HEREDOC);
 
-               HANDLE_NEWLINES(yytext, len);
                zend_copy_value(zendlval, yytext, len);
                zendlval->type = IS_STRING;
+               HANDLE_NEWLINES(yytext, len);
                return T_ENCAPSED_AND_WHITESPACE;
        } else {
                /* Go back to end of label, so the next match works correctly in case of
@@ -8506,7 +8147,57 @@ yy925:
                yymore();
        }
 }
-#line 8510 "Zend/zend_language_scanner.c"
+#line 8151 "Zend/zend_language_scanner.c"
+yy895:
+               YYDEBUG(895, *YYCURSOR);
+               ++YYCURSOR;
+               YYFILL(1);
+               yych = *YYCURSOR;
+               YYDEBUG(896, *YYCURSOR);
+               if (yych <= 'Z') {
+                       if (yych <= '\f') {
+                               if (yych == '\n') goto yy895;
+                               goto yy884;
+                       } else {
+                               if (yych <= '\r') goto yy897;
+                               if (yych <= '@') goto yy884;
+                               goto yy890;
+                       }
+               } else {
+                       if (yych <= '`') {
+                               if (yych == '_') goto yy890;
+                               goto yy884;
+                       } else {
+                               if (yych <= 'z') goto yy890;
+                               if (yych <= '~') goto yy884;
+                               goto yy890;
+                       }
+               }
+yy897:
+               YYDEBUG(897, *YYCURSOR);
+               ++YYCURSOR;
+               YYFILL(1);
+               yych = *YYCURSOR;
+               YYDEBUG(898, *YYCURSOR);
+               if (yych <= 'Z') {
+                       if (yych <= '\f') {
+                               if (yych == '\n') goto yy895;
+                               goto yy884;
+                       } else {
+                               if (yych <= '\r') goto yy897;
+                               if (yych <= '@') goto yy884;
+                               goto yy890;
+                       }
+               } else {
+                       if (yych <= '`') {
+                               if (yych == '_') goto yy890;
+                               goto yy884;
+                       } else {
+                               if (yych <= 'z') goto yy890;
+                               if (yych <= '~') goto yy884;
+                               goto yy890;
+                       }
+               }
        }
 /* *********************************** */
 yyc_ST_ONE_LINE_COMMENT:
@@ -8545,50 +8236,50 @@ yyc_ST_ONE_LINE_COMMENT:
                        128, 128, 128, 128, 128, 128, 128, 128, 
                        128, 128, 128, 128, 128, 128, 128, 128, 
                };
-               YYDEBUG(927, *YYCURSOR);
+               YYDEBUG(899, *YYCURSOR);
                YYFILL(2);
                yych = *YYCURSOR;
                if (yybm[0+yych] & 128) {
-                       goto yy933;
+                       goto yy905;
                }
-               if (yych <= '\f') goto yy936;
-               if (yych <= '\r') goto yy937;
-               if (yych <= '=') goto yy929;
-               if (yych <= '>') goto yy931;
-               goto yy932;
-yy929:
-               YYDEBUG(929, *YYCURSOR);
+               if (yych <= '\f') goto yy908;
+               if (yych <= '\r') goto yy909;
+               if (yych <= '=') goto yy901;
+               if (yych <= '>') goto yy903;
+               goto yy904;
+yy901:
+               YYDEBUG(901, *YYCURSOR);
                ++YYCURSOR;
-               if ((yych = *YYCURSOR) == '>') goto yy941;
-yy930:
-               YYDEBUG(930, *YYCURSOR);
+               if ((yych = *YYCURSOR) == '>') goto yy913;
+yy902:
+               YYDEBUG(902, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1731 "Zend/zend_language_scanner.l"
                {
        yymore();
 }
-#line 8571 "Zend/zend_language_scanner.c"
-yy931:
-               YYDEBUG(931, *YYCURSOR);
+#line 8262 "Zend/zend_language_scanner.c"
+yy903:
+               YYDEBUG(903, *YYCURSOR);
                yych = *++YYCURSOR;
-               goto yy930;
-yy932:
-               YYDEBUG(932, *YYCURSOR);
+               goto yy902;
+yy904:
+               YYDEBUG(904, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == '>') goto yy941;
-               goto yy930;
-yy933:
-               YYDEBUG(933, *YYCURSOR);
+               if (yych == '>') goto yy913;
+               goto yy902;
+yy905:
+               YYDEBUG(905, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(934, *YYCURSOR);
+               YYDEBUG(906, *YYCURSOR);
                if (yybm[0+yych] & 128) {
-                       goto yy933;
+                       goto yy905;
                }
-               goto yy940;
-yy935:
-               YYDEBUG(935, *YYCURSOR);
+               goto yy912;
+yy907:
+               YYDEBUG(907, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1735 "Zend/zend_language_scanner.l"
                {
@@ -8608,18 +8299,18 @@ yy935:
                        return T_COMMENT;
        }
 }
-#line 8612 "Zend/zend_language_scanner.c"
-yy936:
-               YYDEBUG(936, *YYCURSOR);
+#line 8303 "Zend/zend_language_scanner.c"
+yy908:
+               YYDEBUG(908, *YYCURSOR);
                yych = *++YYCURSOR;
-               goto yy935;
-yy937:
-               YYDEBUG(937, *YYCURSOR);
+               goto yy907;
+yy909:
+               YYDEBUG(909, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != '\n') goto yy935;
-               YYDEBUG(938, *YYCURSOR);
+               if (yych != '\n') goto yy907;
+               YYDEBUG(910, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(939, *YYCURSOR);
+               YYDEBUG(911, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1753 "Zend/zend_language_scanner.l"
                {
@@ -8630,15 +8321,15 @@ yy937:
        CG(zend_lineno)++;
        return T_COMMENT;
 }
-#line 8634 "Zend/zend_language_scanner.c"
-yy940:
-               YYDEBUG(940, *YYCURSOR);
+#line 8325 "Zend/zend_language_scanner.c"
+yy912:
+               YYDEBUG(912, *YYCURSOR);
                yych = *++YYCURSOR;
-               goto yy935;
-yy941:
-               YYDEBUG(941, *YYCURSOR);
+               goto yy907;
+yy913:
+               YYDEBUG(913, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(942, *YYCURSOR);
+               YYDEBUG(914, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1762 "Zend/zend_language_scanner.l"
                {
@@ -8653,265 +8344,7 @@ yy941:
                yymore();
        }
 }
-#line 8657 "Zend/zend_language_scanner.c"
-       }
-/* *********************************** */
-yyc_ST_START_HEREDOC:
-       {
-               static const unsigned char yybm[] = {
-                         0,   0,   0,   0,   0,   0,   0,   0, 
-                         0,   0,   0,   0,   0,   0,   0,   0, 
-                         0,   0,   0,   0,   0,   0,   0,   0, 
-                         0,   0,   0,   0,   0,   0,   0,   0, 
-                         0,   0,   0,   0,   0,   0,   0,   0, 
-                         0,   0,   0,   0,   0,   0,   0,   0, 
-                       128, 128, 128, 128, 128, 128, 128, 128, 
-                       128, 128,   0,   0,   0,   0,   0,   0, 
-                         0, 128, 128, 128, 128, 128, 128, 128, 
-                       128, 128, 128, 128, 128, 128, 128, 128, 
-                       128, 128, 128, 128, 128, 128, 128, 128, 
-                       128, 128, 128,   0,   0,   0,   0, 128, 
-                         0, 128, 128, 128, 128, 128, 128, 128, 
-                       128, 128, 128, 128, 128, 128, 128, 128, 
-                       128, 128, 128, 128, 128, 128, 128, 128, 
-                       128, 128, 128,   0,   0,   0,   0, 128, 
-                       128, 128, 128, 128, 128, 128, 128, 128, 
-                       128, 128, 128, 128, 128, 128, 128, 128, 
-                       128, 128, 128, 128, 128, 128, 128, 128, 
-                       128, 128, 128, 128, 128, 128, 128, 128, 
-                       128, 128, 128, 128, 128, 128, 128, 128, 
-                       128, 128, 128, 128, 128, 128, 128, 128, 
-                       128, 128, 128, 128, 128, 128, 128, 128, 
-                       128, 128, 128, 128, 128, 128, 128, 128, 
-                       128, 128, 128, 128, 128, 128, 128, 128, 
-                       128, 128, 128, 128, 128, 128, 128, 128, 
-                       128, 128, 128, 128, 128, 128, 128, 128, 
-                       128, 128, 128, 128, 128, 128, 128, 128, 
-                       128, 128, 128, 128, 128, 128, 128, 128, 
-                       128, 128, 128, 128, 128, 128, 128, 128, 
-                       128, 128, 128, 128, 128, 128, 128, 128, 
-                       128, 128, 128, 128, 128, 128, 128, 128, 
-               };
-               YYDEBUG(943, *YYCURSOR);
-               YYFILL(3);
-               yych = *YYCURSOR;
-               if (yych <= '_') {
-                       if (yych <= '@') goto yy945;
-                       if (yych <= 'Z') goto yy947;
-                       if (yych >= '_') goto yy947;
-               } else {
-                       if (yych <= '`') goto yy945;
-                       if (yych <= 'z') goto yy947;
-                       if (yych >= 0x7F) goto yy947;
-               }
-yy945:
-               YYDEBUG(945, *YYCURSOR);
-               ++YYCURSOR;
-yy946:
-               YYDEBUG(946, *YYCURSOR);
-               yyleng = YYCURSOR - SCNG(yy_text);
-#line 1927 "Zend/zend_language_scanner.l"
-               {
-       yyless(0);
-       BEGIN(ST_HEREDOC);
-       goto restart;
-}
-#line 8720 "Zend/zend_language_scanner.c"
-yy947:
-               YYDEBUG(947, *YYCURSOR);
-               yyaccept = 0;
-               yych = *(YYMARKER = ++YYCURSOR);
-               if (yybm[0+yych] & 128) {
-                       goto yy948;
-               }
-               if (yych <= '\f') {
-                       if (yych == '\n') goto yy952;
-                       goto yy946;
-               } else {
-                       if (yych <= '\r') goto yy952;
-                       if (yych == ';') goto yy951;
-                       goto yy946;
-               }
-yy948:
-               YYDEBUG(948, *YYCURSOR);
-               ++YYCURSOR;
-               YYFILL(2);
-               yych = *YYCURSOR;
-               YYDEBUG(949, *YYCURSOR);
-               if (yybm[0+yych] & 128) {
-                       goto yy948;
-               }
-               if (yych <= '\f') {
-                       if (yych == '\n') goto yy952;
-               } else {
-                       if (yych <= '\r') goto yy952;
-                       if (yych == ';') goto yy951;
-               }
-yy950:
-               YYDEBUG(950, *YYCURSOR);
-               YYCURSOR = YYMARKER;
-               goto yy946;
-yy951:
-               YYDEBUG(951, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == '\n') goto yy952;
-               if (yych != '\r') goto yy950;
-yy952:
-               YYDEBUG(952, *YYCURSOR);
-               ++YYCURSOR;
-               YYDEBUG(953, *YYCURSOR);
-               yyleng = YYCURSOR - SCNG(yy_text);
-#line 1933 "Zend/zend_language_scanner.l"
-               {
-       int label_len = yyleng - 1;
-
-       if (yytext[label_len-1]==';') {
-               label_len--;
-       }
-
-       yyless(label_len);
-
-       if (label_len==CG(heredoc_len) && !memcmp(yytext, CG(heredoc), label_len)) {
-               zendlval->value.str.val = CG(heredoc);
-               zendlval->value.str.len = label_len;
-               CG(heredoc)=NULL;
-               CG(heredoc_len)=0;
-               BEGIN(ST_IN_SCRIPTING);
-               return T_END_HEREDOC;
-       } else {
-               BEGIN(ST_HEREDOC);
-               yymore();
-       }
-}
-#line 8787 "Zend/zend_language_scanner.c"
-       }
-/* *********************************** */
-yyc_ST_START_NOWDOC:
-       {
-               static const unsigned char yybm[] = {
-                         0,   0,   0,   0,   0,   0,   0,   0, 
-                         0,   0,   0,   0,   0,   0,   0,   0, 
-                         0,   0,   0,   0,   0,   0,   0,   0, 
-                         0,   0,   0,   0,   0,   0,   0,   0, 
-                         0,   0,   0,   0,   0,   0,   0,   0, 
-                         0,   0,   0,   0,   0,   0,   0,   0, 
-                       128, 128, 128, 128, 128, 128, 128, 128, 
-                       128, 128,   0,   0,   0,   0,   0,   0, 
-                         0, 128, 128, 128, 128, 128, 128, 128, 
-                       128, 128, 128, 128, 128, 128, 128, 128, 
-                       128, 128, 128, 128, 128, 128, 128, 128, 
-                       128, 128, 128,   0,   0,   0,   0, 128, 
-                         0, 128, 128, 128, 128, 128, 128, 128, 
-                       128, 128, 128, 128, 128, 128, 128, 128, 
-                       128, 128, 128, 128, 128, 128, 128, 128, 
-                       128, 128, 128,   0,   0,   0,   0, 128, 
-                       128, 128, 128, 128, 128, 128, 128, 128, 
-                       128, 128, 128, 128, 128, 128, 128, 128, 
-                       128, 128, 128, 128, 128, 128, 128, 128, 
-                       128, 128, 128, 128, 128, 128, 128, 128, 
-                       128, 128, 128, 128, 128, 128, 128, 128, 
-                       128, 128, 128, 128, 128, 128, 128, 128, 
-                       128, 128, 128, 128, 128, 128, 128, 128, 
-                       128, 128, 128, 128, 128, 128, 128, 128, 
-                       128, 128, 128, 128, 128, 128, 128, 128, 
-                       128, 128, 128, 128, 128, 128, 128, 128, 
-                       128, 128, 128, 128, 128, 128, 128, 128, 
-                       128, 128, 128, 128, 128, 128, 128, 128, 
-                       128, 128, 128, 128, 128, 128, 128, 128, 
-                       128, 128, 128, 128, 128, 128, 128, 128, 
-                       128, 128, 128, 128, 128, 128, 128, 128, 
-                       128, 128, 128, 128, 128, 128, 128, 128, 
-               };
-               YYDEBUG(954, *YYCURSOR);
-               YYFILL(3);
-               yych = *YYCURSOR;
-               if (yych <= '_') {
-                       if (yych <= '@') goto yy956;
-                       if (yych <= 'Z') goto yy958;
-                       if (yych >= '_') goto yy958;
-               } else {
-                       if (yych <= '`') goto yy956;
-                       if (yych <= 'z') goto yy958;
-                       if (yych >= 0x7F) goto yy958;
-               }
-yy956:
-               YYDEBUG(956, *YYCURSOR);
-               ++YYCURSOR;
-yy957:
-               YYDEBUG(957, *YYCURSOR);
-               yyleng = YYCURSOR - SCNG(yy_text);
-#line 2087 "Zend/zend_language_scanner.l"
-               {
-       yyless(0);
-       BEGIN(ST_NOWDOC);
-       goto restart;
-}
-#line 8850 "Zend/zend_language_scanner.c"
-yy958:
-               YYDEBUG(958, *YYCURSOR);
-               yyaccept = 0;
-               yych = *(YYMARKER = ++YYCURSOR);
-               if (yybm[0+yych] & 128) {
-                       goto yy959;
-               }
-               if (yych <= '\f') {
-                       if (yych == '\n') goto yy963;
-                       goto yy957;
-               } else {
-                       if (yych <= '\r') goto yy963;
-                       if (yych == ';') goto yy962;
-                       goto yy957;
-               }
-yy959:
-               YYDEBUG(959, *YYCURSOR);
-               ++YYCURSOR;
-               YYFILL(2);
-               yych = *YYCURSOR;
-               YYDEBUG(960, *YYCURSOR);
-               if (yybm[0+yych] & 128) {
-                       goto yy959;
-               }
-               if (yych <= '\f') {
-                       if (yych == '\n') goto yy963;
-               } else {
-                       if (yych <= '\r') goto yy963;
-                       if (yych == ';') goto yy962;
-               }
-yy961:
-               YYDEBUG(961, *YYCURSOR);
-               YYCURSOR = YYMARKER;
-               goto yy957;
-yy962:
-               YYDEBUG(962, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == '\n') goto yy963;
-               if (yych != '\r') goto yy961;
-yy963:
-               YYDEBUG(963, *YYCURSOR);
-               ++YYCURSOR;
-               YYDEBUG(964, *YYCURSOR);
-               yyleng = YYCURSOR - SCNG(yy_text);
-#line 2093 "Zend/zend_language_scanner.l"
-               {
-       int label_len = yyleng - 1;
-
-       if (yytext[label_len-1]==';') {
-               label_len--;
-       }
-
-       if (label_len==CG(heredoc_len) && !memcmp(yytext, CG(heredoc), label_len)) {
-               yyless(label_len-1);
-               yyleng = 0;
-               BEGIN(ST_END_NOWDOC);
-               ZVAL_EMPTY_STRING(zendlval);
-               return T_ENCAPSED_AND_WHITESPACE;
-       } else {
-               BEGIN(ST_NOWDOC);
-               yyless(label_len);
-               yymore();
-       }
-}
-#line 8915 "Zend/zend_language_scanner.c"
+#line 8348 "Zend/zend_language_scanner.c"
        }
 /* *********************************** */
 yyc_ST_VAR_OFFSET:
@@ -8950,67 +8383,67 @@ yyc_ST_VAR_OFFSET:
                         32,  32,  32,  32,  32,  32,  32,  32, 
                         32,  32,  32,  32,  32,  32,  32,  32, 
                };
-               YYDEBUG(965, *YYCURSOR);
+               YYDEBUG(915, *YYCURSOR);
                YYFILL(3);
                yych = *YYCURSOR;
                if (yych <= '/') {
                        if (yych <= ' ') {
                                if (yych <= '\f') {
-                                       if (yych <= 0x08) goto yy979;
-                                       if (yych <= '\n') goto yy975;
-                                       goto yy979;
+                                       if (yych <= 0x08) goto yy929;
+                                       if (yych <= '\n') goto yy925;
+                                       goto yy929;
                                } else {
-                                       if (yych <= '\r') goto yy975;
-                                       if (yych <= 0x1F) goto yy979;
-                                       goto yy975;
+                                       if (yych <= '\r') goto yy925;
+                                       if (yych <= 0x1F) goto yy929;
+                                       goto yy925;
                                }
                        } else {
                                if (yych <= '$') {
-                                       if (yych <= '"') goto yy974;
-                                       if (yych <= '#') goto yy975;
-                                       goto yy970;
+                                       if (yych <= '"') goto yy924;
+                                       if (yych <= '#') goto yy925;
+                                       goto yy920;
                                } else {
-                                       if (yych == '\'') goto yy975;
-                                       goto yy974;
+                                       if (yych == '\'') goto yy925;
+                                       goto yy924;
                                }
                        }
                } else {
                        if (yych <= '\\') {
                                if (yych <= '@') {
-                                       if (yych <= '0') goto yy967;
-                                       if (yych <= '9') goto yy969;
-                                       goto yy974;
+                                       if (yych <= '0') goto yy917;
+                                       if (yych <= '9') goto yy919;
+                                       goto yy924;
                                } else {
-                                       if (yych <= 'Z') goto yy977;
-                                       if (yych <= '[') goto yy974;
-                                       goto yy975;
+                                       if (yych <= 'Z') goto yy927;
+                                       if (yych <= '[') goto yy924;
+                                       goto yy925;
                                }
                        } else {
                                if (yych <= '_') {
-                                       if (yych <= ']') goto yy972;
-                                       if (yych <= '^') goto yy974;
-                                       goto yy977;
+                                       if (yych <= ']') goto yy922;
+                                       if (yych <= '^') goto yy924;
+                                       goto yy927;
                                } else {
-                                       if (yych <= '`') goto yy974;
-                                       if (yych <= 'z') goto yy977;
-                                       if (yych <= '~') goto yy974;
-                                       goto yy977;
+                                       if (yych <= '`') goto yy924;
+                                       if (yych <= 'z') goto yy927;
+                                       if (yych <= '~') goto yy924;
+                                       goto yy927;
                                }
                        }
                }
-yy967:
-               YYDEBUG(967, *YYCURSOR);
+yy917:
+               YYDEBUG(917, *YYCURSOR);
                yyaccept = 0;
                yych = *(YYMARKER = ++YYCURSOR);
                if (yych <= 'W') {
-                       if (yych <= '/') goto yy968;
-                       if (yych <= '9') goto yy990;
+                       if (yych <= '/') goto yy918;
+                       if (yych <= '9') goto yy940;
                } else {
-                       if (yych <= 'X') goto yy988;
-                       if (yych == 'x') goto yy988;
+                       if (yych <= 'X') goto yy938;
+                       if (yych == 'x') goto yy938;
                }
-yy968:
-               YYDEBUG(968, *YYCURSOR);
+yy918:
+               YYDEBUG(918, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1423 "Zend/zend_language_scanner.l"
                { /* Offset could be treated as a long */
@@ -9024,51 +8457,51 @@ yy968:
        }
        return T_NUM_STRING;
 }
-#line 9028 "Zend/zend_language_scanner.c"
-yy969:
-               YYDEBUG(969, *YYCURSOR);
+#line 8461 "Zend/zend_language_scanner.c"
+yy919:
+               YYDEBUG(919, *YYCURSOR);
                yych = *++YYCURSOR;
-               goto yy987;
-yy970:
-               YYDEBUG(970, *YYCURSOR);
+               goto yy937;
+yy920:
+               YYDEBUG(920, *YYCURSOR);
                ++YYCURSOR;
                if ((yych = *YYCURSOR) <= '_') {
-                       if (yych <= '@') goto yy971;
-                       if (yych <= 'Z') goto yy983;
-                       if (yych >= '_') goto yy983;
+                       if (yych <= '@') goto yy921;
+                       if (yych <= 'Z') goto yy933;
+                       if (yych >= '_') goto yy933;
                } else {
-                       if (yych <= '`') goto yy971;
-                       if (yych <= 'z') goto yy983;
-                       if (yych >= 0x7F) goto yy983;
+                       if (yych <= '`') goto yy921;
+                       if (yych <= 'z') goto yy933;
+                       if (yych >= 0x7F) goto yy933;
                }
-yy971:
-               YYDEBUG(971, *YYCURSOR);
+yy921:
+               YYDEBUG(921, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1706 "Zend/zend_language_scanner.l"
                {
        /* Only '[' can be valid, but returning other tokens will allow a more explicit parse error */
        return yytext[0];
 }
-#line 9053 "Zend/zend_language_scanner.c"
-yy972:
-               YYDEBUG(972, *YYCURSOR);
+#line 8486 "Zend/zend_language_scanner.c"
+yy922:
+               YYDEBUG(922, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(973, *YYCURSOR);
+               YYDEBUG(923, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1701 "Zend/zend_language_scanner.l"
                {
        yy_pop_state(TSRMLS_C);
        return ']';
 }
-#line 9064 "Zend/zend_language_scanner.c"
-yy974:
-               YYDEBUG(974, *YYCURSOR);
+#line 8497 "Zend/zend_language_scanner.c"
+yy924:
+               YYDEBUG(924, *YYCURSOR);
                yych = *++YYCURSOR;
-               goto yy971;
-yy975:
-               YYDEBUG(975, *YYCURSOR);
+               goto yy921;
+yy925:
+               YYDEBUG(925, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(976, *YYCURSOR);
+               YYDEBUG(926, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1711 "Zend/zend_language_scanner.l"
                {
@@ -9078,14 +8511,14 @@ yy975:
        ZVAL_EMPTY_STRING(zendlval); /* Empty since it won't be used */
        return T_ENCAPSED_AND_WHITESPACE;
 }
-#line 9082 "Zend/zend_language_scanner.c"
-yy977:
-               YYDEBUG(977, *YYCURSOR);
+#line 8515 "Zend/zend_language_scanner.c"
+yy927:
+               YYDEBUG(927, *YYCURSOR);
                ++YYCURSOR;
                yych = *YYCURSOR;
-               goto yy982;
-yy978:
-               YYDEBUG(978, *YYCURSOR);
+               goto yy932;
+yy928:
+               YYDEBUG(928, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1719 "Zend/zend_language_scanner.l"
                {
@@ -9093,52 +8526,52 @@ yy978:
        zendlval->type = IS_STRING;
        return T_STRING;
 }
-#line 9097 "Zend/zend_language_scanner.c"
-yy979:
-               YYDEBUG(979, *YYCURSOR);
+#line 8530 "Zend/zend_language_scanner.c"
+yy929:
+               YYDEBUG(929, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(980, *YYCURSOR);
+               YYDEBUG(930, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 2179 "Zend/zend_language_scanner.l"
+#line 2116 "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 9108 "Zend/zend_language_scanner.c"
-yy981:
-               YYDEBUG(981, *YYCURSOR);
+#line 8541 "Zend/zend_language_scanner.c"
+yy931:
+               YYDEBUG(931, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-yy982:
-               YYDEBUG(982, *YYCURSOR);
+yy932:
+               YYDEBUG(932, *YYCURSOR);
                if (yybm[0+yych] & 32) {
-                       goto yy981;
+                       goto yy931;
                }
-               goto yy978;
-yy983:
-               YYDEBUG(983, *YYCURSOR);
+               goto yy928;
+yy933:
+               YYDEBUG(933, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(984, *YYCURSOR);
+               YYDEBUG(934, *YYCURSOR);
                if (yych <= '^') {
                        if (yych <= '9') {
-                               if (yych >= '0') goto yy983;
+                               if (yych >= '0') goto yy933;
                        } else {
-                               if (yych <= '@') goto yy985;
-                               if (yych <= 'Z') goto yy983;
+                               if (yych <= '@') goto yy935;
+                               if (yych <= 'Z') goto yy933;
                        }
                } else {
                        if (yych <= '`') {
-                               if (yych <= '_') goto yy983;
+                               if (yych <= '_') goto yy933;
                        } else {
-                               if (yych <= 'z') goto yy983;
-                               if (yych >= 0x7F) goto yy983;
+                               if (yych <= 'z') goto yy933;
+                               if (yych >= 0x7F) goto yy933;
                        }
                }
-yy985:
-               YYDEBUG(985, *YYCURSOR);
+yy935:
+               YYDEBUG(935, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1695 "Zend/zend_language_scanner.l"
                {
@@ -9146,37 +8579,37 @@ yy985:
        zendlval->type = IS_STRING;
        return T_VARIABLE;
 }
-#line 9150 "Zend/zend_language_scanner.c"
-yy986:
-               YYDEBUG(986, *YYCURSOR);
+#line 8583 "Zend/zend_language_scanner.c"
+yy936:
+               YYDEBUG(936, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-yy987:
-               YYDEBUG(987, *YYCURSOR);
+yy937:
+               YYDEBUG(937, *YYCURSOR);
                if (yybm[0+yych] & 64) {
-                       goto yy986;
+                       goto yy936;
                }
-               goto yy968;
-yy988:
-               YYDEBUG(988, *YYCURSOR);
+               goto yy918;
+yy938:
+               YYDEBUG(938, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yybm[0+yych] & 128) {
-                       goto yy993;
+                       goto yy943;
                }
-               YYDEBUG(989, *YYCURSOR);
+               YYDEBUG(939, *YYCURSOR);
                YYCURSOR = YYMARKER;
-               goto yy968;
-yy990:
-               YYDEBUG(990, *YYCURSOR);
+               goto yy918;
+yy940:
+               YYDEBUG(940, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(991, *YYCURSOR);
-               if (yych <= '/') goto yy992;
-               if (yych <= '9') goto yy990;
-yy992:
-               YYDEBUG(992, *YYCURSOR);
+               YYDEBUG(941, *YYCURSOR);
+               if (yych <= '/') goto yy942;
+               if (yych <= '9') goto yy940;
+yy942:
+               YYDEBUG(942, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 1435 "Zend/zend_language_scanner.l"
                { /* Offset must be treated as a string */
@@ -9185,19 +8618,19 @@ yy992:
        zendlval->type = IS_STRING;
        return T_NUM_STRING;
 }
-#line 9189 "Zend/zend_language_scanner.c"
-yy993:
-               YYDEBUG(993, *YYCURSOR);
+#line 8622 "Zend/zend_language_scanner.c"
+yy943:
+               YYDEBUG(943, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(994, *YYCURSOR);
+               YYDEBUG(944, *YYCURSOR);
                if (yybm[0+yych] & 128) {
-                       goto yy993;
+                       goto yy943;
                }
-               goto yy992;
+               goto yy942;
        }
 }
-#line 2184 "Zend/zend_language_scanner.l"
+#line 2121 "Zend/zend_language_scanner.l"
 
 }
index cf898f3bb226e2060e684861d86b1d3f3abceb0d..7ac4efe353a740c77d084336a5a7714c98cbbea3 100644 (file)
@@ -919,7 +919,7 @@ DOUBLE_QUOTES_CHARS ("{"*([^$"\\{]|("\\"{ANY_CHAR}))|{DOUBLE_QUOTES_LITERAL_DOLL
 BACKQUOTE_CHARS     ("{"*([^$`\\{]|("\\"{ANY_CHAR}))|{BACKQUOTE_LITERAL_DOLLAR})
 HEREDOC_CHARS       ("{"*([^$\n\r\\{]|("\\"[^\n\r]))|{HEREDOC_LITERAL_DOLLAR}|({HEREDOC_NEWLINE}+({HEREDOC_NON_LABEL}|{HEREDOC_LABEL_NO_NEWLINE})))
 
-NOWDOC_CHARS           ({NEWLINE}*(([^a-zA-Z_\x7f-\xff\n\r][^\n\r]*)|({LABEL}[^a-zA-Z0-9_\x7f-\xff;\n\r][^\n\r]*)|({LABEL}[;][^\n\r]+)))
+NOWDOC_CHARS        ([^\n\r]|{NEWLINE}+([^a-zA-Z_\x7f-\xff\n\r]|({LABEL}([^a-zA-Z0-9_\x7f-\xff;\n\r]|(";"[^\n\r])))))
 
 /* compute yyleng before each rule */
 <!*> := yyleng = YYCURSOR - SCNG(yy_text);
@@ -1896,7 +1896,7 @@ inline_char_handler:
 }
 
 
-<ST_IN_SCRIPTING>b?"<<<"{TABS_AND_SPACES}({LABEL}|["]{LABEL}["]){NEWLINE} {
+<ST_IN_SCRIPTING>b?"<<<"{TABS_AND_SPACES}({LABEL}|([']{LABEL}['])|(["]{LABEL}["])){NEWLINE} {
        char *s;
        int bprefix = (yytext[0] != '<') ? 1 : 0;
 
@@ -1908,12 +1908,35 @@ inline_char_handler:
                CG(heredoc_len)--;
        }
 
-       if (*s == '"') {
+       if (*s == '\'') {
                s++;
                CG(heredoc_len) -= 2;
+
+               BEGIN(ST_NOWDOC);
+       } else {
+               if (*s == '"') {
+                       s++;
+                       CG(heredoc_len) -= 2;
+               }
+
+               BEGIN(ST_HEREDOC);
        }
+
        CG(heredoc) = estrndup(s, CG(heredoc_len));
-       BEGIN(ST_START_HEREDOC);
+
+       /* Check for ending label on the next line */
+       if (CG(heredoc_len) < YYLIMIT - YYCURSOR && !memcmp(YYCURSOR, s, CG(heredoc_len))) {
+               char *end = YYCURSOR + CG(heredoc_len);
+
+               if (*end == ';') {
+                       end++;
+               }
+
+               if (*end == '\n' || *end == '\r') {
+                       BEGIN(ST_END_HEREDOC);
+               }
+       }
+
        return T_START_HEREDOC;
 }
 
@@ -1924,34 +1947,6 @@ inline_char_handler:
 }
 
 
-<ST_START_HEREDOC>{ANY_CHAR} {
-       yyless(0);
-       BEGIN(ST_HEREDOC);
-       goto restart;
-}
-
-<ST_START_HEREDOC>{LABEL}";"?[\n\r] {
-       int label_len = yyleng - 1;
-
-       if (yytext[label_len-1]==';') {
-               label_len--;
-       }
-
-       yyless(label_len);
-
-       if (label_len==CG(heredoc_len) && !memcmp(yytext, CG(heredoc), label_len)) {
-               zendlval->value.str.val = CG(heredoc);
-               zendlval->value.str.len = label_len;
-               CG(heredoc)=NULL;
-               CG(heredoc_len)=0;
-               BEGIN(ST_IN_SCRIPTING);
-               return T_END_HEREDOC;
-       } else {
-               BEGIN(ST_HEREDOC);
-               yymore();
-       }
-}
-
 /* Match everything up to and including a possible ending label, so if the label
  * doesn't match, it's kept with the rest of the string
  *
@@ -1979,12 +1974,9 @@ inline_char_handler:
                        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
-                * before label, for zend_highlight/strip, tokenizer, etc. */
-               yyleng -= CG(heredoc_len) - 1;
+               /* Go back before label, to match in ST_END_HEREDOC state. yytext will include
+                * newline before label, for zend_highlight/strip, tokenizer, etc. */
+               yyless(yyleng - CG(heredoc_len) - 1); /* 1 for newline after label */
 
                CG(increment_lineno) = 1; /* For newline before label */
                BEGIN(ST_END_HEREDOC);
@@ -1999,8 +1991,11 @@ inline_char_handler:
 }
 
 <ST_END_HEREDOC>{ANY_CHAR} {
-       SCNG(yy_text) = (unsigned char *)(Z_STRVAL_P(zendlval) = CG(heredoc));
-       SCNG(yy_leng) = Z_STRLEN_P(zendlval) = CG(heredoc_len);
+       YYCURSOR += CG(heredoc_len) - 1;
+       yyleng = CG(heredoc_len);
+
+       Z_STRVAL_P(zendlval) = CG(heredoc);
+       Z_STRLEN_P(zendlval) = CG(heredoc_len);
        CG(heredoc) = NULL;
        CG(heredoc_len) = 0;
        BEGIN(ST_IN_SCRIPTING);
@@ -2065,52 +2060,7 @@ inline_char_handler:
 }
 
 
-/* BEGIN nowdoc */
-
-<ST_IN_SCRIPTING>b?"<<<"{TABS_AND_SPACES}[']{LABEL}[']{NEWLINE} {
-       int bprefix = (yytext[0] != '<') ? 1 : 0;
-       char *s;
-       CG(zend_lineno)++;
-       /* 3 is <<<, 2 is quotes, 1 is newline */
-       CG(heredoc_len) = yyleng-bprefix-3-2-1-(yytext[yyleng-2]=='\r'?1:0);
-       s = yytext+bprefix+3;
-       while ((*s == ' ') || (*s == '\t')) {
-               s++;
-               CG(heredoc_len)--;
-       }
-       s++; /* first quote */
-       CG(heredoc) = estrndup(s, CG(heredoc_len));
-       BEGIN(ST_START_NOWDOC);
-       return T_START_NOWDOC;
-}
-
-<ST_START_NOWDOC>{ANY_CHAR} {
-       yyless(0);
-       BEGIN(ST_NOWDOC);
-       goto restart;
-}
-
-<ST_START_NOWDOC>{LABEL}";"?[\r\n] {
-       int label_len = yyleng - 1;
-
-       if (yytext[label_len-1]==';') {
-               label_len--;
-       }
-
-       if (label_len==CG(heredoc_len) && !memcmp(yytext, CG(heredoc), label_len)) {
-               yyless(label_len-1);
-               yyleng = 0;
-               BEGIN(ST_END_NOWDOC);
-               ZVAL_EMPTY_STRING(zendlval);
-               return T_ENCAPSED_AND_WHITESPACE;
-       } else {
-               BEGIN(ST_NOWDOC);
-               yyless(label_len);
-               yymore();
-       }
-}
-
-<ST_NOWDOC>{NOWDOC_CHARS}*{NEWLINE}+{LABEL}";"?[\n\r] {
+<ST_NOWDOC>({NOWDOC_CHARS}+{NEWLINE}+|{NEWLINE}+){LABEL}";"?[\n\r] {
        char *end = yytext + yyleng - 1;
 
        if (end[-1] == ';') {
@@ -2131,19 +2081,16 @@ inline_char_handler:
                        len--; /* Windows newline */
                }
 
-               /* 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
-                * before label, for zend_highlight/strip, tokenizer, etc. */
-               yyleng -= CG(heredoc_len) - 1;
+               /* Go back before label, to match in ST_END_HEREDOC state. yytext will include
+                * newline before label, for zend_highlight/strip, tokenizer, etc. */
+               yyless(yyleng - CG(heredoc_len) - 1); /* 1 for newline after label */
 
                CG(increment_lineno) = 1; /* For newline before label */
-               BEGIN(ST_END_NOWDOC);
+               BEGIN(ST_END_HEREDOC);
 
-               HANDLE_NEWLINES(yytext, len);
                zend_copy_value(zendlval, yytext, len);
                zendlval->type = IS_STRING;
+               HANDLE_NEWLINES(yytext, len);
                return T_ENCAPSED_AND_WHITESPACE;
        } else {
                /* Go back to end of label, so the next match works correctly in case of
@@ -2153,16 +2100,6 @@ inline_char_handler:
        }
 }
 
-<ST_END_NOWDOC>{ANY_CHAR} {
-       SCNG(yy_text) = (unsigned char*)(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;
-}
-
-/* END nowdoc */
 
 <ST_DOUBLE_QUOTES>["] {
        BEGIN(ST_IN_SCRIPTING);
index fbd9f33cabac324afdc3d5c6dccf84461dbc58f5..73d311c570e07786fed92b66fe51381ac50f39c1 100644 (file)
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Fri Jul 25 07:14:28 2008 */
+/* Generated by re2c 0.13.5 on Sat Jul 26 18:30:43 2008 */
 #line 3 "Zend/zend_language_scanner_defs.h"
 
 enum YYCONDTYPE {
@@ -13,9 +13,6 @@ enum YYCONDTYPE {
        yycST_ONE_LINE_COMMENT,
        yycST_COMMENT,
        yycST_DOC_COMMENT,
-       yycST_START_HEREDOC,
        yycST_END_HEREDOC,
-       yycST_START_NOWDOC,
        yycST_NOWDOC,
-       yycST_END_NOWDOC,
 };
index a294a02b359f3bd20b89d06b4f7eb8cd95939315..63c375a55c9622614eba9dc668ddc79bf441b24a 100644 (file)
@@ -1776,38 +1776,64 @@ ZEND_VM_HANDLER(53, ZEND_INIT_STRING, ANY, ANY)
        ZEND_VM_NEXT_OPCODE();
 }
 
-ZEND_VM_HANDLER(54, ZEND_ADD_CHAR, TMP, CONST)
+ZEND_VM_HANDLER(54, ZEND_ADD_CHAR, TMP|UNUSED, CONST)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1;
+       zval *str = &EX_T(opline->result.u.var).tmp_var;
+
+       if (OP1_TYPE == IS_UNUSED) {
+               /* Initialize for erealloc in add_char_to_string */
+               Z_STRVAL_P(str) = NULL;
+               Z_STRLEN_P(str) = 0;
+               Z_TYPE_P(str) = IS_STRING;
+
+               INIT_PZVAL(str);
+       }
+
+       add_char_to_string(str, str, &opline->op2.u.constant);
 
-       add_char_to_string(&EX_T(opline->result.u.var).tmp_var,
-               GET_OP1_ZVAL_PTR(BP_VAR_NA),
-               &opline->op2.u.constant);
        /* FREE_OP is missing intentionally here - we're always working on the same temporary variable */
        ZEND_VM_NEXT_OPCODE();
 }
 
-ZEND_VM_HANDLER(55, ZEND_ADD_STRING, TMP, CONST)
+ZEND_VM_HANDLER(55, ZEND_ADD_STRING, TMP|UNUSED, CONST)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1;
+       zval *str = &EX_T(opline->result.u.var).tmp_var;
+
+       if (OP1_TYPE == IS_UNUSED) {
+               /* Initialize for erealloc in add_string_to_string */
+               Z_STRVAL_P(str) = NULL;
+               Z_STRLEN_P(str) = 0;
+               Z_TYPE_P(str) = IS_STRING;
+
+               INIT_PZVAL(str);
+       }
+
+       add_string_to_string(str, str, &opline->op2.u.constant);
 
-       add_string_to_string(&EX_T(opline->result.u.var).tmp_var,
-               GET_OP1_ZVAL_PTR(BP_VAR_NA),
-               &opline->op2.u.constant);
        /* FREE_OP is missing intentionally here - we're always working on the same temporary variable */
        ZEND_VM_NEXT_OPCODE();
 }
 
-ZEND_VM_HANDLER(56, ZEND_ADD_VAR, TMP, TMP|VAR|CV)
+ZEND_VM_HANDLER(56, ZEND_ADD_VAR, TMP|UNUSED, TMP|VAR|CV)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
+       zval *str = &EX_T(opline->result.u.var).tmp_var;
        zval *var = GET_OP2_ZVAL_PTR(BP_VAR_R);
        zval var_copy;
        int use_copy = 0;
 
+       if (OP1_TYPE == IS_UNUSED) {
+               /* Initialize for erealloc in add_string_to_string */
+               Z_STRVAL_P(str) = NULL;
+               Z_STRLEN_P(str) = 0;
+               Z_TYPE_P(str) = IS_STRING;
+
+               INIT_PZVAL(str);
+       }
+
        if (Z_TYPE_P(var) != IS_STRING) {
                zend_make_printable_zval(var, &var_copy, &use_copy);
 
@@ -1815,9 +1841,8 @@ ZEND_VM_HANDLER(56, ZEND_ADD_VAR, TMP, TMP|VAR|CV)
                        var = &var_copy;
                }
        }
-       add_string_to_string(   &EX_T(opline->result.u.var).tmp_var,
-                                                       GET_OP1_ZVAL_PTR(BP_VAR_NA),
-                                                       var);
+       add_string_to_string(str, str, var);
+
        if (use_copy) {
                zval_dtor(var);
        }
index 6cb693ecedd070a5f4f3be082d4d9b29ae9903e7..a8afd94dbafcf421ba8bddb1a6512d53a0139413 100644 (file)
@@ -5890,11 +5890,19 @@ static int ZEND_FASTCALL  ZEND_FETCH_DIM_TMP_VAR_SPEC_TMP_CONST_HANDLER(ZEND_OPC
 static int ZEND_FASTCALL  ZEND_ADD_CHAR_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1;
+       zval *str = &EX_T(opline->result.u.var).tmp_var;
+
+       if (IS_TMP_VAR == IS_UNUSED) {
+               /* Initialize for erealloc in add_char_to_string */
+               Z_STRVAL_P(str) = NULL;
+               Z_STRLEN_P(str) = 0;
+               Z_TYPE_P(str) = IS_STRING;
+
+               INIT_PZVAL(str);
+       }
+
+       add_char_to_string(str, str, &opline->op2.u.constant);
 
-       add_char_to_string(&EX_T(opline->result.u.var).tmp_var,
-               _get_zval_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
-               &opline->op2.u.constant);
        /* FREE_OP is missing intentionally here - we're always working on the same temporary variable */
        ZEND_VM_NEXT_OPCODE();
 }
@@ -5902,11 +5910,19 @@ static int ZEND_FASTCALL  ZEND_ADD_CHAR_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDL
 static int ZEND_FASTCALL  ZEND_ADD_STRING_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1;
+       zval *str = &EX_T(opline->result.u.var).tmp_var;
+
+       if (IS_TMP_VAR == IS_UNUSED) {
+               /* Initialize for erealloc in add_string_to_string */
+               Z_STRVAL_P(str) = NULL;
+               Z_STRLEN_P(str) = 0;
+               Z_TYPE_P(str) = IS_STRING;
+
+               INIT_PZVAL(str);
+       }
+
+       add_string_to_string(str, str, &opline->op2.u.constant);
 
-       add_string_to_string(&EX_T(opline->result.u.var).tmp_var,
-               _get_zval_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
-               &opline->op2.u.constant);
        /* FREE_OP is missing intentionally here - we're always working on the same temporary variable */
        ZEND_VM_NEXT_OPCODE();
 }
@@ -6337,11 +6353,21 @@ static int ZEND_FASTCALL  ZEND_BOOL_XOR_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER
 static int ZEND_FASTCALL  ZEND_ADD_VAR_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
+       zval *str = &EX_T(opline->result.u.var).tmp_var;
        zval *var = _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
        zval var_copy;
        int use_copy = 0;
 
+       if (IS_TMP_VAR == IS_UNUSED) {
+               /* Initialize for erealloc in add_string_to_string */
+               Z_STRVAL_P(str) = NULL;
+               Z_STRLEN_P(str) = 0;
+               Z_TYPE_P(str) = IS_STRING;
+
+               INIT_PZVAL(str);
+       }
+
        if (Z_TYPE_P(var) != IS_STRING) {
                zend_make_printable_zval(var, &var_copy, &use_copy);
 
@@ -6349,9 +6375,8 @@ static int ZEND_FASTCALL  ZEND_ADD_VAR_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_
                        var = &var_copy;
                }
        }
-       add_string_to_string(   &EX_T(opline->result.u.var).tmp_var,
-                                                       _get_zval_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
-                                                       var);
+       add_string_to_string(str, str, var);
+
        if (use_copy) {
                zval_dtor(var);
        }
@@ -6794,11 +6819,21 @@ static int ZEND_FASTCALL  ZEND_BOOL_XOR_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER
 static int ZEND_FASTCALL  ZEND_ADD_VAR_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
+       zval *str = &EX_T(opline->result.u.var).tmp_var;
        zval *var = _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
        zval var_copy;
        int use_copy = 0;
 
+       if (IS_TMP_VAR == IS_UNUSED) {
+               /* Initialize for erealloc in add_string_to_string */
+               Z_STRVAL_P(str) = NULL;
+               Z_STRLEN_P(str) = 0;
+               Z_TYPE_P(str) = IS_STRING;
+
+               INIT_PZVAL(str);
+       }
+
        if (Z_TYPE_P(var) != IS_STRING) {
                zend_make_printable_zval(var, &var_copy, &use_copy);
 
@@ -6806,9 +6841,8 @@ static int ZEND_FASTCALL  ZEND_ADD_VAR_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_
                        var = &var_copy;
                }
        }
-       add_string_to_string(   &EX_T(opline->result.u.var).tmp_var,
-                                                       _get_zval_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
-                                                       var);
+       add_string_to_string(str, str, var);
+
        if (use_copy) {
                zval_dtor(var);
        }
@@ -7344,11 +7378,21 @@ static int ZEND_FASTCALL  ZEND_BOOL_XOR_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_
 static int ZEND_FASTCALL  ZEND_ADD_VAR_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1;
+
+       zval *str = &EX_T(opline->result.u.var).tmp_var;
        zval *var = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
        zval var_copy;
        int use_copy = 0;
 
+       if (IS_TMP_VAR == IS_UNUSED) {
+               /* Initialize for erealloc in add_string_to_string */
+               Z_STRVAL_P(str) = NULL;
+               Z_STRLEN_P(str) = 0;
+               Z_TYPE_P(str) = IS_STRING;
+
+               INIT_PZVAL(str);
+       }
+
        if (Z_TYPE_P(var) != IS_STRING) {
                zend_make_printable_zval(var, &var_copy, &use_copy);
 
@@ -7356,9 +7400,8 @@ static int ZEND_FASTCALL  ZEND_ADD_VAR_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_A
                        var = &var_copy;
                }
        }
-       add_string_to_string(   &EX_T(opline->result.u.var).tmp_var,
-                                                       _get_zval_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
-                                                       var);
+       add_string_to_string(str, str, var);
+
        if (use_copy) {
                zval_dtor(var);
        }
@@ -17682,6 +17725,46 @@ static int ZEND_FASTCALL  ZEND_ASSIGN_OBJ_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_
        ZEND_VM_NEXT_OPCODE();
 }
 
+static int ZEND_FASTCALL  ZEND_ADD_CHAR_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
+{
+       zend_op *opline = EX(opline);
+       zval *str = &EX_T(opline->result.u.var).tmp_var;
+
+       if (IS_UNUSED == IS_UNUSED) {
+               /* Initialize for erealloc in add_char_to_string */
+               Z_STRVAL_P(str) = NULL;
+               Z_STRLEN_P(str) = 0;
+               Z_TYPE_P(str) = IS_STRING;
+
+               INIT_PZVAL(str);
+       }
+
+       add_char_to_string(str, str, &opline->op2.u.constant);
+
+       /* FREE_OP is missing intentionally here - we're always working on the same temporary variable */
+       ZEND_VM_NEXT_OPCODE();
+}
+
+static int ZEND_FASTCALL  ZEND_ADD_STRING_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
+{
+       zend_op *opline = EX(opline);
+       zval *str = &EX_T(opline->result.u.var).tmp_var;
+
+       if (IS_UNUSED == IS_UNUSED) {
+               /* Initialize for erealloc in add_string_to_string */
+               Z_STRVAL_P(str) = NULL;
+               Z_STRLEN_P(str) = 0;
+               Z_TYPE_P(str) = IS_STRING;
+
+               INIT_PZVAL(str);
+       }
+
+       add_string_to_string(str, str, &opline->op2.u.constant);
+
+       /* FREE_OP is missing intentionally here - we're always working on the same temporary variable */
+       ZEND_VM_NEXT_OPCODE();
+}
+
 static int ZEND_FASTCALL  ZEND_INIT_METHOD_CALL_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -18786,6 +18869,47 @@ static int ZEND_FASTCALL  ZEND_ASSIGN_OBJ_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HA
        ZEND_VM_NEXT_OPCODE();
 }
 
+static int ZEND_FASTCALL  ZEND_ADD_VAR_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
+{
+       zend_op *opline = EX(opline);
+       zend_free_op free_op2;
+       zval *str = &EX_T(opline->result.u.var).tmp_var;
+       zval *var = _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
+       zval var_copy;
+       int use_copy = 0;
+
+       if (IS_UNUSED == IS_UNUSED) {
+               /* Initialize for erealloc in add_string_to_string */
+               Z_STRVAL_P(str) = NULL;
+               Z_STRLEN_P(str) = 0;
+               Z_TYPE_P(str) = IS_STRING;
+
+               INIT_PZVAL(str);
+       }
+
+       if (Z_TYPE_P(var) != IS_STRING) {
+               zend_make_printable_zval(var, &var_copy, &use_copy);
+
+               if (use_copy) {
+                       var = &var_copy;
+               }
+       }
+       add_string_to_string(str, str, var);
+
+       if (use_copy) {
+               zval_dtor(var);
+       }
+       /* original comment, possibly problematic:
+        * FREE_OP is missing intentionally here - we're always working on the same temporary variable
+        * (Zeev):  I don't think it's problematic, we only use variables
+        * which aren't affected by FREE_OP(Ts, )'s anyway, unless they're
+        * string offsets or overloaded objects
+        */
+       zval_dtor(free_op2.var);
+
+       ZEND_VM_NEXT_OPCODE();
+}
+
 static int ZEND_FASTCALL  ZEND_INIT_METHOD_CALL_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -19819,6 +19943,47 @@ static int ZEND_FASTCALL  ZEND_ASSIGN_OBJ_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HA
        ZEND_VM_NEXT_OPCODE();
 }
 
+static int ZEND_FASTCALL  ZEND_ADD_VAR_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
+{
+       zend_op *opline = EX(opline);
+       zend_free_op free_op2;
+       zval *str = &EX_T(opline->result.u.var).tmp_var;
+       zval *var = _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
+       zval var_copy;
+       int use_copy = 0;
+
+       if (IS_UNUSED == IS_UNUSED) {
+               /* Initialize for erealloc in add_string_to_string */
+               Z_STRVAL_P(str) = NULL;
+               Z_STRLEN_P(str) = 0;
+               Z_TYPE_P(str) = IS_STRING;
+
+               INIT_PZVAL(str);
+       }
+
+       if (Z_TYPE_P(var) != IS_STRING) {
+               zend_make_printable_zval(var, &var_copy, &use_copy);
+
+               if (use_copy) {
+                       var = &var_copy;
+               }
+       }
+       add_string_to_string(str, str, var);
+
+       if (use_copy) {
+               zval_dtor(var);
+       }
+       /* original comment, possibly problematic:
+        * FREE_OP is missing intentionally here - we're always working on the same temporary variable
+        * (Zeev):  I don't think it's problematic, we only use variables
+        * which aren't affected by FREE_OP(Ts, )'s anyway, unless they're
+        * string offsets or overloaded objects
+        */
+       if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
+
+       ZEND_VM_NEXT_OPCODE();
+}
+
 static int ZEND_FASTCALL  ZEND_INIT_METHOD_CALL_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -21123,6 +21288,46 @@ static int ZEND_FASTCALL  ZEND_ASSIGN_OBJ_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HAN
        ZEND_VM_NEXT_OPCODE();
 }
 
+static int ZEND_FASTCALL  ZEND_ADD_VAR_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
+{
+       zend_op *opline = EX(opline);
+
+       zval *str = &EX_T(opline->result.u.var).tmp_var;
+       zval *var = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
+       zval var_copy;
+       int use_copy = 0;
+
+       if (IS_UNUSED == IS_UNUSED) {
+               /* Initialize for erealloc in add_string_to_string */
+               Z_STRVAL_P(str) = NULL;
+               Z_STRLEN_P(str) = 0;
+               Z_TYPE_P(str) = IS_STRING;
+
+               INIT_PZVAL(str);
+       }
+
+       if (Z_TYPE_P(var) != IS_STRING) {
+               zend_make_printable_zval(var, &var_copy, &use_copy);
+
+               if (use_copy) {
+                       var = &var_copy;
+               }
+       }
+       add_string_to_string(str, str, var);
+
+       if (use_copy) {
+               zval_dtor(var);
+       }
+       /* original comment, possibly problematic:
+        * FREE_OP is missing intentionally here - we're always working on the same temporary variable
+        * (Zeev):  I don't think it's problematic, we only use variables
+        * which aren't affected by FREE_OP(Ts, )'s anyway, unless they're
+        * string offsets or overloaded objects
+        */
+
+       ZEND_VM_NEXT_OPCODE();
+}
+
 static int ZEND_FASTCALL  ZEND_INIT_METHOD_CALL_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -31371,7 +31576,7 @@ void zend_init_opcodes_handlers(void)
        ZEND_NULL_HANDLER,
        ZEND_NULL_HANDLER,
        ZEND_NULL_HANDLER,
-       ZEND_NULL_HANDLER,
+       ZEND_ADD_CHAR_SPEC_UNUSED_CONST_HANDLER,
        ZEND_NULL_HANDLER,
        ZEND_NULL_HANDLER,
        ZEND_NULL_HANDLER,
@@ -31396,7 +31601,7 @@ void zend_init_opcodes_handlers(void)
        ZEND_NULL_HANDLER,
        ZEND_NULL_HANDLER,
        ZEND_NULL_HANDLER,
-       ZEND_NULL_HANDLER,
+       ZEND_ADD_STRING_SPEC_UNUSED_CONST_HANDLER,
        ZEND_NULL_HANDLER,
        ZEND_NULL_HANDLER,
        ZEND_NULL_HANDLER,
@@ -31422,10 +31627,10 @@ void zend_init_opcodes_handlers(void)
        ZEND_NULL_HANDLER,
        ZEND_NULL_HANDLER,
        ZEND_NULL_HANDLER,
+       ZEND_ADD_VAR_SPEC_UNUSED_TMP_HANDLER,
+       ZEND_ADD_VAR_SPEC_UNUSED_VAR_HANDLER,
        ZEND_NULL_HANDLER,
-       ZEND_NULL_HANDLER,
-       ZEND_NULL_HANDLER,
-       ZEND_NULL_HANDLER,
+       ZEND_ADD_VAR_SPEC_UNUSED_CV_HANDLER,
        ZEND_NULL_HANDLER,
        ZEND_NULL_HANDLER,
        ZEND_NULL_HANDLER,
index bd76ac1a28fb80651dce04cc1ce807eb61c859d2..b31b28e440cfd64a68fd4e0b0e4c9ab8c9194d8c 100644 (file)
@@ -132,7 +132,7 @@ static void tokenize(zval *return_value TSRMLS_DC)
                        MAKE_STD_ZVAL(keyword);
                        array_init(keyword);
                        add_next_index_long(keyword, token_type);
-                       if (token_type == T_END_HEREDOC || token_type == T_END_NOWDOC) {
+                       if (token_type == T_END_HEREDOC) {
                                if (CG(increment_lineno)) {
                                        token_line = ++CG(zend_lineno);
                                        CG(increment_lineno) = 0;
index 344ed59deb275e4764bf591d53c4e2d3850cf7e1..0dcac6f500d52b7b2feccd75d6626e6ef9b4d090 100644 (file)
@@ -151,8 +151,6 @@ void tokenizer_register_constants(INIT_FUNC_ARGS) {
        REGISTER_LONG_CONSTANT("T_NAMESPACE", T_NAMESPACE, CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("T_NS_C", T_NS_C, CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("T_DIR", T_DIR, CONST_CS | CONST_PERSISTENT);
-       REGISTER_LONG_CONSTANT("T_START_NOWDOC", T_START_NOWDOC, CONST_CS | CONST_PERSISTENT);
-       REGISTER_LONG_CONSTANT("T_END_NOWDOC", T_END_NOWDOC, CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("T_DOUBLE_COLON", T_PAAMAYIM_NEKUDOTAYIM, CONST_CS | CONST_PERSISTENT);
 }
 
@@ -282,8 +280,6 @@ char *get_token_type_name(int token_type)
                case T_NAMESPACE: return "T_NAMESPACE";
                case T_NS_C: return "T_NS_C";
                case T_DIR: return "T_DIR";
-               case T_START_NOWDOC: return "T_START_NOWDOC";
-               case T_END_NOWDOC: return "T_END_NOWDOC";
 
        }
        return "UNKNOWN";
index f21bcb900aee3ce7fcfb1d84da8fd70f79a9b654..ef2d81de4ab662c9a81a6383e621275cb0a5e05c 100644 (file)
@@ -13,6 +13,6 @@ highlight.html=#000000
 ?>
 --EXPECT--
 <code><span style="color: #000000">
-<span style="color: #0000BB">&lt;?php&nbsp;</span><span style="color: #007700">echo&nbsp;</span><span style="color: #DD0000">"foo[]&nbsp;$a&nbsp;\n"</span><span style="color: #007700">;&nbsp;</span><span style="color: #0000BB">?&gt;</span>
+<span style="color: #0000BB">&lt;?php&nbsp;</span><span style="color: #007700">echo&nbsp;</span><span style="color: #DD0000">"foo[]&nbsp;</span><span style="color: #0000BB">$a</span><span style="color: #DD0000">&nbsp;\n"</span><span style="color: #007700">;&nbsp;</span><span style="color: #0000BB">?&gt;</span>
 </span>
 </code>