geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-14 19:36:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed Lexer when a template has a big chunk of text between/in a block (due to a limitation of preg_match maximum length of matching - closes #10)

Browse Source
This commit is contained in:
Fabien Potencier
2010-01-24 13:44:33 +01:00
parent fc3a59dd32
commit cd4cde952d
1 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Twig/Lexer.php
+26 -5
View File
@@ -149,9 +149,13 @@ class Twig_Lexer implements Twig_LexerInterface
{
$match = null;
$pos1 = strpos($this->code, $this->options['tag_comment'][0], $this->cursor);
$pos2 = strpos($this->code, $this->options['tag_variable'][0], $this->cursor);
$pos3 = strpos($this->code, $this->options['tag_block'][0], $this->cursor);
// if no matches are left we return the rest of the template
// as simple text token
if (!preg_match('/(.*?)('.preg_quote($this->options['tag_comment'][0], '/').'|'.preg_quote($this->options['tag_variable'][0], '/').'|'.preg_quote($this->options['tag_block'][0], '/').')/As', $this->code, $match, null, $this->cursor))
if (false === $pos1 && false === $pos2 && false === $pos3)
{
$rv = new Twig_Token(Twig_Token::TEXT_TYPE, substr($this->code, $this->cursor), $this->lineno);
$this->cursor = $this->end;
@@ -159,24 +163,41 @@ class Twig_Lexer implements Twig_LexerInterface
return $rv;
}
// min
$pos = -log(0);
if (false !== $pos1 && $pos1 < $pos)
{
$pos = $pos1;
$token = $this->options['tag_comment'][0];
}
if (false !== $pos2 && $pos2 < $pos)
{
$pos = $pos2;
$token = $this->options['tag_variable'][0];
}
if (false !== $pos3 && $pos3 < $pos)
{
$pos = $pos3;
$token = $this->options['tag_block'][0];
}
// update the lineno on the instance
$lineno = $this->lineno;
$this->moveCursor($match[0]);
$this->moveLineNo($match[0]);
$text = substr($this->code, $this->cursor, $pos - $this->cursor);
$this->moveCursor($text.$token);
$this->moveLineNo($text.$token);
// array of tokens
$result = array();
// push the template text first
$text = $match[1];
if (!empty($text))
{
$result[] = new Twig_Token(Twig_Token::TEXT_TYPE, $text, $lineno);
$lineno += substr_count($text, "\n");
}
$token = $match[2];
switch ($token)
{
case $this->options['tag_comment'][0]: