Re: [ZEND-ENGINE-CVS] cvs: Zend / zend_language_scanner.l
| From: | Andi Gutmans | Date: | Fri, 15 Nov 2002 22:51:16 +0000 |
| Subject: | Re: [ZEND-ENGINE-CVS] cvs: Zend / zend_language_scanner.l | ||
| References: | 1 | Groups: | php.zend-engine.cvs |
| Request: | Send a blank email to php-zend-engine-cvs+get-620@lists.php.net to get a copy of this message | ||
I'm checking it out now. In any case, the whitespace is pretty screwed up. It uses spaces instead of tabs...
Andi
At 08:52 PM 11/15/2002 +0000, Andrei Zmievski wrote:
andrei Fri Nov 15 15:52:07 2002 EDTModified files:/Zend zend_language_scanner.lLog: Patch from George Schlossnagle that avoids unnecessary tokenization of strings on spaces. Supposed to improve performance. Index: Zend/zend_language_scanner.l diff -u Zend/zend_language_scanner.l:1.54 Zend/zend_language_scanner.l:1.55 --- Zend/zend_language_scanner.l:1.54 Tue Nov 12 22:28:23 2002+++ Zend/zend_language_scanner.l Fri Nov 15 15:52:07 2002@@ -37,6 +37,7 @@ %x ST_BACKQUOTE %x ST_HEREDOC %x ST_LOOKING_FOR_PROPERTY +%x ST_EXPECTING_OBJECT %x ST_LOOKING_FOR_VARNAME %x ST_COMMENT %x ST_ONE_LINE_COMMENT @@ -708,6 +709,7 @@ HNUM "0x"[0-9a-fA-F]+ LABEL [a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]* WHITESPACE [ \n\r\t]+ +LABEL_OR_WHITESPACE [a-zA-Z0-9_\x7f-\xff \t\n\r #'.:;,()|^&+-/*=%!~<>?@]+ TABS_AND_SPACES [ \t]* TOKENS [;:,.\[\]()|^&+-/*=%!~$<>?@] ENCAPSED_TOKENS [\[\]{}$] @@ -839,13 +841,25 @@return T_EXTENDS;} -<ST_IN_SCRIPTING,ST_DOUBLE_QUOTES,ST_BACKQUOTE,ST_HEREDOC>"->" { +<ST_DOUBLE_QUOTES,ST_BACKQUOTE,ST_HEREDOC>"$"{LABEL}"->"{LABEL} {+ yy_push_state(ST_EXPECTING_OBJECT TSRMLS_CC); + yyless(0);+} + + +<ST_IN_SCRIPTING,ST_EXPECTING_OBJECT>"->" {yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC); return T_OBJECT_OPERATOR;} <ST_LOOKING_FOR_PROPERTY>{LABEL} {- yy_pop_state(TSRMLS_C); + if(yy_top_state(TSRMLS_C) == ST_EXPECTING_OBJECT) { + yy_pop_state(TSRMLS_C); + yy_pop_state(TSRMLS_C); + } + else { + yy_pop_state(TSRMLS_C); + } zend_copy_value(zendlval, yytext, yyleng); zendlval->value.str.len = yyleng; zendlval->type = IS_STRING;@@ -1281,7 +1295,7 @@return T_INLINE_HTML;} -<ST_IN_SCRIPTING,ST_DOUBLE_QUOTES,ST_HEREDOC,ST_BACKQUOTE>"$"{LABEL} { +<ST_EXPECTING_OBJECT,ST_IN_SCRIPTING,ST_DOUBLE_QUOTES,ST_HEREDOC,ST_BACKQUOTE>"$"{LABEL} {zend_copy_value(zendlval, (yytext+1), (yyleng-1)); zendlval->type = IS_STRING; return T_VARIABLE;@@ -1294,13 +1308,26 @@return T_STRING;} - -<ST_DOUBLE_QUOTES,ST_BACKQUOTE,ST_HEREDOC>{LABEL} { +<ST_DOUBLE_QUOTES,ST_BACKQUOTE>{LABEL_OR_WHITESPACE} {+ HANDLE_NEWLINES(yytext, yyleng); zend_copy_value(zendlval, yytext, yyleng); zendlval->type = IS_STRING; return T_STRING;} +<ST_HEREDOC>{LABEL} {+ zend_copy_value(zendlval, yytext, yyleng); + zendlval->type = IS_STRING; + return T_STRING;+} + +<ST_HEREDOC>{ESCAPED_AND_WHITESPACE} {+ HANDLE_NEWLINES(yytext, yyleng); + zendlval->value.str.val = (char *) estrndup(yytext, yyleng); + zendlval->value.str.len = yyleng; + zendlval->type = IS_STRING; + return T_ENCAPSED_AND_WHITESPACE;+} <ST_IN_SCRIPTING>{WHITESPACE} {zendlval->value.str.val = yytext; /* no copying - intentional */@@ -1597,14 +1624,6 @@}} - -<ST_DOUBLE_QUOTES,ST_BACKQUOTE,ST_HEREDOC>{ESCAPED_AND_WHITESPACE} {- HANDLE_NEWLINES(yytext, yyleng); - zendlval->value.str.val = (char *) estrndup(yytext, yyleng); - zendlval->value.str.len = yyleng; - zendlval->type = IS_STRING; - return T_ENCAPSED_AND_WHITESPACE;-} <ST_SINGLE_QUOTE>([^'\\]|\\[^'\\])+ {HANDLE_NEWLINES(yytext, yyleng);-- Zend Engine CVS Mailing List (http://cvs.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php