V2.9.1

docs/changelog.md

@@ -2,6 +2,13 @@
 
 ----
 
+## v2.9.1 (2024-01-11)
+
+- Inlined one in CoreParserTest.php because it was used only in one place
+- Change IfStatement ast node to a better implementation
+
+----
+
 ## v2.9.0 (2023-12-23)
 
 - Simplified Lexer code

src/Ast/Statements/ElseIfStatement.php

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Serhii\GoodbyeHtml\Ast\Statements;
+
+use Serhii\GoodbyeHtml\Ast\Expressions\Expression;
+use Serhii\GoodbyeHtml\Token\Token;
+
+readonly class ElseIfStatement implements Statement
+{
+    public function __construct(
+        public Token $token,
+        public Expression $condition,
+        public BlockStatement $block,
+    ) {
+    }
+
+    public function tokenLiteral(): string
+    {
+        return $this->token->literal;
+    }
+
+    public function string(): string
+    {
+        $result = sprintf("{{ else if %s }}", $this->condition->string());
+        return $result . $this->block->string();
+    }
+}

src/Ast/Statements/IfStatement.php

@@ -10,7 +10,7 @@
 readonly class IfStatement implements Statement
 {
     /**
-     * @param list<IfStatement> $elseIfBlocks
+     * @param list<ElseIfStatement> $elseIfBlocks
      */
     public function __construct(
         public Token $token,
@@ -28,7 +28,7 @@ public function tokenLiteral(): string
 
     public function string(): string
     {
-        $result = sprintf("{{ %s %s }}\n", $this->tokenLiteral(), $this->condition->string());
+        $result = sprintf("{{ if %s }}", $this->condition->string());
 
         $result .= $this->block->string();
 
@@ -37,8 +37,7 @@ public function string(): string
         }
 
         if ($this->elseBlock) {
-            $result .= "{{ else }}\n";
-
+            $result .= "{{ else }}";
             $result .= $this->elseBlock->string();
         }
 

src/CoreParser/CoreParser.php

@@ -17,6 +17,7 @@
 use Serhii\GoodbyeHtml\Ast\Literals\StringLiteral;
 use Serhii\GoodbyeHtml\Ast\Statements\AssignStatement;
 use Serhii\GoodbyeHtml\Ast\Statements\BlockStatement;
+use Serhii\GoodbyeHtml\Ast\Statements\ElseIfStatement;
 use Serhii\GoodbyeHtml\Ast\Statements\ExpressionStatement;
 use Serhii\GoodbyeHtml\Ast\Statements\HtmlStatement;
 use Serhii\GoodbyeHtml\Ast\Statements\IfStatement;
@@ -381,11 +382,10 @@ private function parseIfStatement(): IfStatement
             $this->nextToken(); // skip "{{"
             $this->nextToken(); // skip "elseif"
 
-            $elseIfBlocks[] = new IfStatement(
+            $elseIfBlocks[] = new ElseIfStatement(
                 token: $this->curToken,
                 condition: $this->parseExpression(Precedence::LOWEST),
                 block: $this->parseBlockStatement(),
-                elseBlock: null,
             );
         }
 

tests/CoreParserTest.php

@@ -20,7 +20,6 @@
 use Serhii\GoodbyeHtml\Ast\Statements\IfStatement;
 use Serhii\GoodbyeHtml\Ast\Statements\LoopStatement;
 use Serhii\GoodbyeHtml\Ast\Statements\Program;
-use Serhii\GoodbyeHtml\Ast\Statements\Statement;
 use Serhii\GoodbyeHtml\CoreParser\CoreParser;
 use Serhii\GoodbyeHtml\CoreParser\ParserError;
 use Serhii\GoodbyeHtml\Exceptions\CoreParserException;
@@ -38,19 +37,11 @@ private function createProgram(string $input): Program
 
         $program = $parser->parseProgram();
 
-        $this->assertOneStatement($parser, $program->statements);
+        $this->assertCount(1, $program->statements, 'Program must contain 1 statements');
 
         return $program;
     }
 
-    /**
-     * @param Statement[] $stmt
-     */
-    private function assertOneStatement(CoreParser $parser, array $stmt): void
-    {
-        $this->assertCount(1, $stmt, "Program must contain 1 statements");
-    }
-
     private static function testVariable($var, string $val): void
     {
         self::assertInstanceOf(VariableExpression::class, $var);
@@ -430,4 +421,23 @@ public function testParsingAssignStatement(): void
         $this->testString($stmt->value, 'Anna');
         $this->assertSame("{{ \$herName = 'Anna' }}", $stmt->string());
     }
+
+    public function testIfStatementIsPrintedCorrectly(): void
+    {
+        $input = <<<HTML
+        {{ if true }}
+            Is true
+        {{ else if false }}
+            Is false
+        {{ else if true }}
+            Is true again
+        {{ else }}
+            Else is here
+        {{ end }}
+        HTML;
+
+        $expect = $input . "\n";
+
+        $this->assertSame($expect, $this->createProgram($input)->string());
+    }
 }