Simplify parsing else if

Author: thekid

ChangeLog.md

@@ -3,6 +3,7 @@ HandleBars change log
 
 ## ?.?.? / ????-??-??
 
+* Simplify code for parsing `else if` - @thekid
 * Added PHP 8.6 to test matrix - @thekid
 
 ## 10.0.1 / 2025-09-06

src/main/php/com/handlebarsjs/BlockHelpers.class.php

@@ -23,7 +23,7 @@ public function register($name, $impl) {
       unset($this->impl[$name]);
     } else if (is_string($impl)) {
       $this->impl[$name]= function($options, $state) use($impl) {
-        return $state->target->add(new $impl($options, null, null, $state->start, $state->end));
+        return new $impl($options, null, null, $state->start, $state->end);
       };
     } else {
       $this->impl[$name]= $impl;
@@ -35,7 +35,6 @@ public function register($name, $impl) {
    * Creates a new with block helper
    *
    * - Creates instances of named block implementations
-   * - Registers `*inline` partials in top-level nodes
    * - Uses default block implementation otherwise
    *
    * @param  var[] $options
@@ -44,10 +43,10 @@ public function register($name, $impl) {
    */
   public function newInstance($options, $state) {
     $name= array_shift($options);
-    if ($impl= $this->impl[$name] ?? null) {
+    if ($impl= $this->impl[(string)$name] ?? null) {
       return $impl($options, $state);
     } else {
-      return $state->target->add(new BlockNode($name, $options, null, null, $state->start, $state->end));
+      return new BlockNode($name, $options, null, null, $state->start, $state->end);
     }
   }
 }

src/main/php/com/handlebarsjs/HandlebarsParser.class.php

@@ -128,7 +128,10 @@ protected function initialize() {
     // Sections
     $this->withHandler('#', true, function($tag, $state, $parse) {
       $state->parents[]= $state->target;
-      $block= $this->blocks->newInstance($parse->options(trim(substr($tag, 1))), $state);
+      $block= $state->target->add($this->blocks->newInstance(
+        $parse->options(trim(substr($tag, 1))),
+        $state
+      ));
       $state->target= $block->fn();
       $state->parents[]= $block;
     });
@@ -204,7 +207,10 @@ protected function initialize() {
         $state->target= $block->inverse();
       } else {
         $state->parents[]= $state->target;
-        $block= new InverseOf($this->blocks->newInstance($parse->options(substr($tag, 1)), $state));
+        $block= new InverseOf($state->target->add($this->blocks->newInstance(
+          $parse->options(substr($tag, 1)),
+          $state
+        )));
         $state->target= $block->fn();
         $state->parents[]= $block;
       }
@@ -223,14 +229,11 @@ protected function initialize() {
         $context= &$state->parents[sizeof($state->parents) - 1];
         if ($context instanceof BlockNode) {
 
-          // `else if` vs. `else`
-          if (isset($parsed[1]) && 'if' === (string)$parsed[1]) {
-            $context= $context->inverse()->add(new IfBlockHelper(
-              array_slice($parsed, 2),
-              null,
-              null,
-              $state->start,
-              $state->end
+          // `else [...]` vs. `else`
+          if (isset($parsed[1])) {
+            $context= $context->inverse()->add($this->blocks->newInstance(
+              array_slice($parsed, 1),
+              $state
             ));
             $state->target= $context->fn();
           } else {