improved {syntax} and n:syntax handling

Author: dg

src/Latte/Compiler/TemplateLexer.php

@@ -30,12 +30,6 @@ final class TemplateLexer
 	private const ReHtmlValue = '[^\p{C} "\'<>=`{}]+';
 	private const StateEnd = 'end';
 
-	/** @var array<string, array{string, string}> */
-	public array $syntaxes = [
-		'latte' => ['\{(?![\s\'"{}])', '\}'], // {...}
-		'double' => ['\{\{(?![\s\'"{}])', '\}\}'], // {{...}}
-		'off' => ['\{(?=/syntax\})', '\}'], // {/syntax}
-	];
 	public string $openDelimiter;
 	public string $closeDelimiter;
 	private TagLexer $tagLexer;
@@ -360,14 +354,19 @@ private function popState(): void
 	/**
 	 * Changes tag delimiters.
 	 */
-	public function setSyntax(?string $type): static
+	public function setSyntax(?string $type, ?string $endTag = null): static
 	{
-		$type ??= 'latte';
-		if (!isset($this->syntaxes[$type])) {
-			throw new \InvalidArgumentException("Unknown syntax '$type'");
-		}
-
-		[$this->openDelimiter, $this->closeDelimiter] = $this->syntaxes[$type];
+		$left = '\{(?![\s\'"{}])';
+		$end = $endTag ? '\{/' . preg_quote($endTag, '~') . '\}' : null;
+
+		[$this->openDelimiter, $this->closeDelimiter] = match ($type) {
+			null => [$left, '\}'], // {...}
+			'off' => [$endTag ? '(?=' . $end . ')\{' : '(?!x)x', '\}'],
+			'double' => $endTag // {{...}}
+				? ['(?:\{' . $left . '|(?=' . $end . ')\{)', '\}(?:\}|(?<=' . $end . '))']
+				: ['\{' . $left, '\}\}'],
+			default => throw new \InvalidArgumentException("Unknown syntax '$type'"),
+		};
 		return $this;
 	}
 

src/Latte/Essential/CoreExtension.php

@@ -222,9 +222,11 @@ private function parseSyntax(Tag $tag, TemplateParser $parser): \Generator
 	{
 		$tag->expectArguments();
 		$token = $tag->parser->stream->consume();
-		$parser->getLexer()->setSyntax($token->text);
+		$lexer = $parser->getLexer();
+		$saved = [$lexer->openDelimiter, $lexer->closeDelimiter];
+		$lexer->setSyntax($token->text, $tag->isNAttribute() ? null : $tag->name);
 		[$inner] = yield;
-		$parser->getLexer()->setSyntax(null);
+		[$lexer->openDelimiter, $lexer->closeDelimiter] = $saved;
 		return $inner;
 	}
 }

tests/tags/expected/syntax.html

@@ -14,32 +14,134 @@ require __DIR__ . '/../bootstrap.php';
 $latte = new Latte\Engine;
 $latte->setLoader(new Latte\Loaders\StringLoader);
 
+// double
+$template = <<<'EOD'
+	{syntax double}
+		{if $var} {$var} {/if}
+		{{if $var}} {{$var}} {{/if}}
+		{* comment single *}
+		{{* comment double *}}
+	{/syntax}
+
+	{$after}
+	EOD;
+
+Assert::match(
+	<<<'XX'
+			{if $var} {$var} {/if}
+			 var
+			{* comment single *}
+
+		after
+		XX,
+	$latte->renderToString($template, ['var' => 'var', 'after' => 'after']),
+);
+
+
+// double n:attribute
 $template = <<<'EOD'
 	<ul n:syntax="double">
-	{{foreach $people as $person}}
-		<li>{{$person |upper}}</li>
-	{{/foreach}}
-	{* comment latte *}
-	{{* comment double *}}
+		{if $var} {$var} {/if}
+		{{if $var}} {{$var}} {{/if}}
+		{/syntax}
+		{* comment single *}
+		{{* comment double *}}
 	</ul>
 
-	<p>Default: {$person}</p>
+	{$after}
+	EOD;
+
+Assert::match(
+	<<<'XX'
+		<ul>
+			{if $var} {$var} {/if}
+			 var
+			{/syntax}
+			{* comment single *}
+		</ul>
 
-	<p n:syntax="latte">Default: {$person}</p>
+		after
+		XX,
+	$latte->renderToString($template, ['var' => 'var', 'after' => 'after']),
+);
 
-	<p n:syntax="off">Default: {$person}</p>
 
+// off
+$template = <<<'EOD'
 	{syntax off}
-	{a}
-	{ {/ {/syntax
+		{if $var} {$var} {/if}
+		{ {/ {/syntax
+		{* comment single *}
 	{/syntax}
+
+	{$after}
 	EOD;
 
-Assert::matchFile(
-	__DIR__ . '/expected/syntax.phtml',
-	$latte->compile($template),
+Assert::match(
+	<<<'XX'
+			{if $var} {$var} {/if}
+			{ {/ {/syntax
+			{* comment single *}
+
+		after
+		XX,
+	$latte->renderToString($template, ['var' => 'var', 'after' => 'after']),
 );
-Assert::matchFile(
-	__DIR__ . '/expected/syntax.html',
-	$latte->renderToString($template, ['people' => ['John', 'Mary', 'Paul']]),
+
+
+// off n:attribute
+$template = <<<'EOD'
+	<ul n:syntax="off">
+		{if $var} {$var} {/if}
+		{/syntax}
+		{* comment single *}
+	</ul>
+
+	{$after}
+	EOD;
+
+Assert::match(
+	<<<'XX'
+		<ul>
+			{if $var} {$var} {/if}
+			{/syntax}
+			{* comment single *}
+		</ul>
+
+		after
+		XX,
+	$latte->renderToString($template, ['var' => 'var', 'after' => 'after']),
+);
+
+
+// nested
+$template = <<<'EOD'
+	<ul n:syntax="double">
+		{if $var} {$var} {/if}
+		{{if $var}} {{$var}} {{/if}}
+		<div n:syntax=off>
+			{$inner}
+		</div>
+		{$after}
+		{{$after}}
+	</ul>
+
+	{$after}
+	EOD;
+
+Assert::match(
+	<<<'XX'
+		<ul>
+			{if $var} {$var} {/if}
+			 var
+			<div>
+				{$inner}
+			</div>
+			{$after}
+			after
+		</ul>
+
+		after
+		XX,
+	$latte->renderToString($template, ['var' => 'var', 'after' => 'after']),
 );