geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-13 02:46:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

added {% line \d+ %} directive

Browse Source
This commit is contained in:
Arnaud Le Blanc
2011-06-05 19:38:12 +02:00
parent 7e457209f8
commit 5ec19550b2
2 changed files with 45 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Twig/Lexer.php
+5
View File
@@ -162,6 +162,11 @@ class Twig_Lexer implements Twig_LexerInterface
$this->moveCursor($match[0]);
$this->lexRawData();
$this->state = self::STATE_DATA;
// {% line \d+ %}
} else if (preg_match('/\s*line\s+(\d+)\s*'.preg_quote($this->options['tag_block'][1], '/').'/As', $this->code, $match, null, $this->cursor)) {
$this->moveCursor($match[0]);
$this->lineno = (int) $match[1];
$this->state = self::STATE_DATA;
} else {
$this->pushToken(Twig_Token::BLOCK_START_TYPE);
$this->state = self::STATE_BLOCK;
test/Twig/Tests/LexerTest.php
+40
View File
@@ -36,4 +36,44 @@ class Twig_Tests_LexerTest extends PHPUnit_Framework_TestCase
return $count;
}
public function testLineDirective()
{
$template = "foo\n"
. "bar\n"
. "{% line 10 %}\n"
. "{{\n"
. "baz\n"
. "}}\n";
$lexer = new Twig_Lexer(new Twig_Environment());
$stream = $lexer->tokenize($template);
// foo\nbar\n
$this->assertSame(1, $stream->expect(Twig_Token::TEXT_TYPE)->getLine());
// \n (after {% line %})
$this->assertSame(10, $stream->expect(Twig_Token::TEXT_TYPE)->getLine());
// {{
$this->assertSame(11, $stream->expect(Twig_Token::VAR_START_TYPE)->getLine());
// baz
$this->assertSame(12, $stream->expect(Twig_Token::NAME_TYPE)->getLine());
}
public function testLineDirectiveInline()
{
$template = "foo\n"
. "bar{% line 10 %}{{\n"
. "baz\n"
. "}}\n";
$lexer = new Twig_Lexer(new Twig_Environment());
$stream = $lexer->tokenize($template);
// foo\nbar
$this->assertSame(1, $stream->expect(Twig_Token::TEXT_TYPE)->getLine());
// {{
$this->assertSame(10, $stream->expect(Twig_Token::VAR_START_TYPE)->getLine());
// baz
$this->assertSame(11, $stream->expect(Twig_Token::NAME_TYPE)->getLine());
}
}