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

Compile Elvis operator with Elvis operator

Browse Source
This commit is contained in:
Jérôme Tamarelle
2023-10-21 19:08:22 +02:00
parent 51cfad8039
commit fb0d7495a8
2 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ExpressionParser.php
+3
View File
@@ -183,11 +183,14 @@ class ExpressionParser
if (!$this->parser->getStream()->nextIf(/* Token::PUNCTUATION_TYPE */ 9, ':')) { if (!$this->parser->getStream()->nextIf(/* Token::PUNCTUATION_TYPE */ 9, ':')) {
$expr2 = $this->parseExpression(); $expr2 = $this->parseExpression();
if ($this->parser->getStream()->nextIf(/* Token::PUNCTUATION_TYPE */ 9, ':')) { if ($this->parser->getStream()->nextIf(/* Token::PUNCTUATION_TYPE */ 9, ':')) {
// Ternary operator (expr ? expr2 : expr3)
$expr3 = $this->parseExpression(); $expr3 = $this->parseExpression();
} else { } else {
// Ternary without else (expr ? expr2)
$expr3 = new ConstantExpression('', $this->parser->getCurrentToken()->getLine()); $expr3 = new ConstantExpression('', $this->parser->getCurrentToken()->getLine());
} }
} else { } else {
// Ternary without then (expr ?: expr3)
$expr2 = $expr; $expr2 = $expr;
$expr3 = $this->parseExpression(); $expr3 = $this->parseExpression();
} }
src/Node/Expression/ConditionalExpression.php
+18 -9
View File
@@ -23,14 +23,23 @@ class ConditionalExpression extends AbstractExpression
public function compile(Compiler $compiler): void public function compile(Compiler $compiler): void
{ {
$compiler // Ternary with no then uses Elvis operator
->raw('((') if ($this->getNode('expr1') === $this->getNode('expr2')) {
->subcompile($this->getNode('expr1')) $compiler
->raw(') ? (') ->raw('((')
->subcompile($this->getNode('expr2')) ->subcompile($this->getNode('expr1'))
->raw(') : (') ->raw(') ?: (')
->subcompile($this->getNode('expr3')) ->subcompile($this->getNode('expr3'))
->raw('))') ->raw('))');
; } else {
$compiler
->raw('((')
->subcompile($this->getNode('expr1'))
->raw(') ? (')
->subcompile($this->getNode('expr2'))
->raw(') : (')
->subcompile($this->getNode('expr3'))
->raw('))');
}
} }
} }