regex optimization

This commit is contained in:
Arnaud Le Blanc
2011-11-13 14:10:36 +01:00
parent 0e63abba76
commit 062ed5ca3e
+2 -2
View File
@@ -41,7 +41,7 @@ class Twig_Lexer implements Twig_LexerInterface
const REGEX_NUMBER = '/[0-9]+(?:\.[0-9]+)?/A';
const REGEX_STRING = '/\'([^\'\\\\]*(?:\\\\.[^\'\\\\]*)*)\'/As';
const REGEX_DQ_STRING_START = '/"/A';
const REGEX_DQ_STRING_PART = '/(?:[^#"\\\\]|\\\\.|#(?!{))+/A';
const REGEX_DQ_STRING_PART = '/[^#"\\\\]*(?:(?:\\\\.|#(?!\{))[^#"\\\\]*)*/As';
const PUNCTUATION = '()[]{}?:.,|';
public function __construct(Twig_Environment $env, array $options = array())
@@ -304,7 +304,7 @@ class Twig_Lexer implements Twig_LexerInterface
$this->moveCursor($match[0]);
$this->pushState(self::STATE_INTERPOLATION);
} else if (preg_match(self::REGEX_DQ_STRING_PART, $this->code, $match, null, $this->cursor)) {
} else if (preg_match(self::REGEX_DQ_STRING_PART, $this->code, $match, null, $this->cursor) && strlen($match[0]) > 0) {
$this->pushToken(Twig_Token::STRING_TYPE, stripcslashes($match[0]));
$this->moveCursor($match[0]);