TemplateLexer: added $openDelimiter & $closeDelimiter, removed setDelimiters() (BC break)

Author: dg

src/Latte/Compiler/TemplateLexer.php

@@ -36,9 +36,8 @@ final class TemplateLexer
 		'double' => ['\{\{(?![\s\'"{}])', '\}\}'], // {{...}}
 		'off' => ['\{(?=/syntax\})', '\}'], // {/syntax}
 	];
-
-	/** @var string[] */
-	private array $delimiters;
+	public string $openDelimiter;
+	public string $closeDelimiter;
 	private TagLexer $tagLexer;
 
 	/** @var array<array{name: string, args: mixed[]}> */
@@ -77,8 +76,8 @@ private function statePlain(): \Generator
 			(?<Text>.+?)??
 			(?<Indentation>(?<=\n|^)[ \t]+)?
 			(
-				(?<Latte_TagOpen>' . $this->delimiters[0] . '(?!\*))|      # {tag
-				(?<Latte_CommentOpen>' . $this->delimiters[0] . '\*)|      # {* comment
+				(?<Latte_TagOpen>' . $this->openDelimiter . '(?!\*))|      # {tag
+				(?<Latte_CommentOpen>' . $this->openDelimiter . '\*)|      # {* comment
 				$
 			)
 		~xsiAuD');
@@ -105,7 +104,7 @@ private function stateLatteTag(): \Generator
 
 		yield from $this->match('~
 			(?<Slash>/)?
-			(?<Latte_TagClose>' . $this->delimiters[1] . ')
+			(?<Latte_TagClose>' . $this->closeDelimiter . ')
 			(?<Newline>[ \t]*\R)?
 		~xsiAu');
 	}
@@ -116,7 +115,7 @@ private function stateLatteComment(): \Generator
 		$this->popState();
 		yield from $this->match('~
 			(?<Text>.+?)??
-			(?<Latte_CommentClose>\*' . $this->delimiters[1] . ')
+			(?<Latte_CommentClose>\*' . $this->closeDelimiter . ')
 			(?<Newline>[ \t]*\R{1,2})?
 		~xsiAu');
 	}
@@ -130,8 +129,8 @@ private function stateHtmlText(): \Generator
 				(?<Indentation>(?<=\n|^)[ \t]+)?(?<Html_TagOpen><)(?<Slash>/)?(?<Html_Name>' . self::ReTagName . ')|  # <tag </tag
 				(?<Html_CommentOpen><!--(?!>|->))|                                                      # <!-- comment
 				(?<Html_BogusOpen><[/?!])|                                                              # <!doctype <?xml or error
-				(?<Indentation>(?<=\n|^)[ \t]+)?(?<Latte_TagOpen>' . $this->delimiters[0] . '(?!\*))|   # {tag
-				(?<Indentation>(?<=\n|^)[ \t]+)?(?<Latte_CommentOpen>' . $this->delimiters[0] . '\*)|   # {* comment
+				(?<Indentation>(?<=\n|^)[ \t]+)?(?<Latte_TagOpen>' . $this->openDelimiter . '(?!\*))|   # {tag
+				(?<Indentation>(?<=\n|^)[ \t]+)?(?<Latte_CommentOpen>' . $this->openDelimiter . '\*)|   # {* comment
 				$
 			)
 		~xsiAuD');
@@ -161,8 +160,8 @@ private function stateHtmlTag(?string $tagName = null, ?string $attrName = null)
 			(?<Quote>["\'])|
 			(?<Slash>/)?(?<Html_TagClose>>)(?<Newline>[ \t]*\R)?|      # > />
 			(?<Html_Name>' . self::ReHtmlName . ')|                    # HTML attribute name/value
-			(?<Latte_TagOpen>' . $this->delimiters[0] . '(?!\*))|      # {tag
-			(?<Latte_CommentOpen>' . $this->delimiters[0] . '\*)       # {* comment
+			(?<Latte_TagOpen>' . $this->openDelimiter . '(?!\*))|      # {tag
+			(?<Latte_CommentOpen>' . $this->openDelimiter . '\*)       # {* comment
 		~xsiAu');
 
 		if (isset($m['Html_Name'])) {
@@ -201,8 +200,8 @@ private function stateHtmlQuotedValue(string $quote): \Generator
 		$m = yield from $this->match('~
 			(?<Text>.+?)??(
 				(?<Quote>' . $quote . ')|
-				(?<Latte_TagOpen>' . $this->delimiters[0] . '(?!\*))|      # {tag
-				(?<Latte_CommentOpen>' . $this->delimiters[0] . '\*)       # {* comment
+				(?<Latte_TagOpen>' . $this->openDelimiter . '(?!\*))|      # {tag
+				(?<Latte_CommentOpen>' . $this->openDelimiter . '\*)       # {* comment
 			)
 		~xsiAu');
 
@@ -239,8 +238,8 @@ private function stateHtmlRCData(string $tagName): \Generator
 			(?<Indentation>(?<=\n|^)[ \t]+)?
 			(
 				(?<Html_TagOpen><)(?<Slash>/)(?<Html_Name>' . preg_quote($tagName, '~') . ')|  # </tag
-				(?<Latte_TagOpen>' . $this->delimiters[0] . '(?!\*))|                          # {tag
-				(?<Latte_CommentOpen>' . $this->delimiters[0] . '\*)|                          # {* comment
+				(?<Latte_TagOpen>' . $this->openDelimiter . '(?!\*))|                          # {tag
+				(?<Latte_CommentOpen>' . $this->openDelimiter . '\*)|                          # {* comment
 				$
 			)
 		~xsiAu');
@@ -263,8 +262,8 @@ private function stateHtmlComment(): \Generator
 			(?<Text>.+?)??
 			(
 				(?<Html_CommentClose>-->)|                                                              # -->
-				(?<Indentation>(?<=\n|^)[ \t]+)?(?<Latte_TagOpen>' . $this->delimiters[0] . '(?!\*))|   # {tag
-				(?<Indentation>(?<=\n|^)[ \t]+)?(?<Latte_CommentOpen>' . $this->delimiters[0] . '\*)    # {* comment
+				(?<Indentation>(?<=\n|^)[ \t]+)?(?<Latte_TagOpen>' . $this->openDelimiter . '(?!\*))|   # {tag
+				(?<Indentation>(?<=\n|^)[ \t]+)?(?<Latte_CommentOpen>' . $this->openDelimiter . '\*)    # {* comment
 			)
 		~xsiAu');
 
@@ -285,8 +284,8 @@ private function stateHtmlBogus(): \Generator
 		$m = yield from $this->match('~
 			(?<Text>.+?)??(
 				(?<Html_TagClose>>)|                                       # >
-				(?<Latte_TagOpen>' . $this->delimiters[0] . '(?!\*))|      # {tag
-				(?<Latte_CommentOpen>' . $this->delimiters[0] . '\*)       # {* comment
+				(?<Latte_TagOpen>' . $this->openDelimiter . '(?!\*))|      # {tag
+				(?<Latte_CommentOpen>' . $this->openDelimiter . '\*)       # {* comment
 			)
 		~xsiAu');
 
@@ -359,7 +358,7 @@ private function popState(): void
 
 
 	/**
-	 * Changes macro tag delimiters.
+	 * Changes tag delimiters.
 	 */
 	public function setSyntax(?string $type): static
 	{
@@ -368,17 +367,7 @@ public function setSyntax(?string $type): static
 			throw new \InvalidArgumentException("Unknown syntax '$type'");
 		}
 
-		$this->setDelimiters($this->syntaxes[$type][0], $this->syntaxes[$type][1]);
-		return $this;
-	}
-
-
-	/**
-	 * Changes macro tag delimiters (as regular expression).
-	 */
-	public function setDelimiters(string $left, string $right): static
-	{
-		$this->delimiters = [$left, $right];
+		[$this->openDelimiter, $this->closeDelimiter] = $this->syntaxes[$type];
 		return $this;
 	}