Refactor line handling to lang.ast.emit.Result base class

This prevents a parent::emitOne() call for each node

Author: thekid

src/main/php/lang/ast/Emitter.class.php

@@ -108,7 +108,7 @@ protected function emit() {
   /**
    * Standalone operators
    *
-   * @param  lang.ast.Result $result
+   * @param  lang.ast.emit.Result $result
    * @param  lang.ast.Token $operator
    * @return void
    */
@@ -119,7 +119,7 @@ protected function emitOperator($result, $operator) {
   /**
    * Emit nodes seperated as statements
    *
-   * @param  lang.ast.Result $result
+   * @param  lang.ast.emit.Result $result
    * @param  iterable $nodes
    * @return void
    */
@@ -133,23 +133,21 @@ public function emitAll($result, $nodes) {
   /**
    * Emit single nodes
    *
-   * @param  lang.ast.Result $result
+   * @param  lang.ast.emit.Result $result
    * @param  lang.ast.Node $node
    * @return void
    */
   public function emitOne($result, $node) {
-
-    // Check for transformations
-    if (isset($this->transformations[$node->kind])) {
-      foreach ($this->transformations[$node->kind] as $transformation) {
+    if ($transformations= $this->transformations[$node->kind] ?? null) {
+      foreach ($transformations as $transformation) {
         $r= $transformation($result->codegen, $node);
         if ($r instanceof Node) {
           if ($r->kind === $node->kind) continue;
-          $this->{'emit'.$r->kind}($result, $r);
+          $this->{'emit'.$r->kind}($result->at($r->line), $r);
           return;
         } else if ($r) {
           foreach ($r as $s => $n) {
-            $this->{'emit'.$n->kind}($result, $n);
+            $this->{'emit'.$n->kind}($result->at($n->line), $n);
             null === $s || $result->out->write(';');
           }
           return;
@@ -158,14 +156,14 @@ public function emitOne($result, $node) {
       // Fall through, use default
     }
 
-    $this->{'emit'.$node->kind}($result, $node);
+    $this->{'emit'.$node->kind}($result->at($node->line), $node);
   }
 
   /**
    * Creates result
    *
    * @param  io.streams.OutputStream $target
-   * @return lang.ast.Result
+   * @return lang.ast.emit.Result
    */
   protected abstract function result($target);
 

src/main/php/lang/ast/emit/GeneratedCode.class.php

@@ -2,7 +2,6 @@
 
 class GeneratedCode extends Result {
   private $prolog, $epilog;
-  public $line= 1;
 
   /**
    * Starts a result stream, including an optional prolog and epilog
@@ -36,20 +35,6 @@ protected function finalize() {
     '' === $this->epilog || $this->out->write($this->epilog);
   }
 
-  /**
-   * Forwards output line to given line number
-   *
-   * @param  int $line
-   * @return self
-   */
-  public function at($line) {
-    if ($line > $this->line) {
-      $this->out->write(str_repeat("\n", $line - $this->line));
-      $this->line= $line;
-    }
-    return $this;
-  }
-
   /**
    * Creates a temporary variable and returns its name
    *

src/main/php/lang/ast/emit/PHP.class.php

@@ -32,7 +32,7 @@ abstract class PHP extends Emitter {
    * Creates result
    *
    * @param  io.streams.OutputStream $target
-   * @return lang.ast.Result
+   * @return lang.ast.emit.Result
    */
   protected function result($target) {
     return new GeneratedCode($target, '<?php ');
@@ -57,7 +57,7 @@ public function literal($type) {
    * - Binary expression where left- and right hand side are literals
    *
    * @see    https://wiki.php.net/rfc/const_scalar_exprs
-   * @param  lang.ast.Result $result
+   * @param  lang.ast.emit.Result $result
    * @param  lang.ast.Node $node
    * @return bool
    */
@@ -116,11 +116,11 @@ protected function constantType($type) {
   /**
    * Enclose a node inside a closure
    *
-   * @param  lang.ast.Result $result
+   * @param  lang.ast.emit.Result $result
    * @param  lang.ast.Node $node
    * @param  ?lang.ast.nodes.Signature $signature
    * @param  bool $static
-   * @param  function(lang.ast.Result, lang.ast.Node): void $emit
+   * @param  function(lang.ast.emit.Result, lang.ast.Node): void $emit
    */
   protected function enclose($result, $node, $signature, $static, $emit) {
     $capture= [];
@@ -159,7 +159,7 @@ protected function enclose($result, $node, $signature, $static, $emit) {
   /**
    * Emits local initializations
    *
-   * @param  lang.ast.Result $result
+   * @param  lang.ast.emit.Result $result
    * @param  [:lang.ast.Node] $init
    * @return void
    */
@@ -175,7 +175,7 @@ protected function emitInitializations($result, $init) {
    * Convert blocks to IIFEs to allow a list of statements where PHP syntactically
    * doesn't, e.g. `fn`-style lambdas or match expressions.
    *
-   * @param  lang.ast.Result $result
+   * @param  lang.ast.emit.Result $result
    * @param  lang.ast.Node $expression
    * @return void
    */
@@ -1208,15 +1208,4 @@ protected function emitFrom($result, $from) {
     $result->out->write('yield from ');
     $this->emitOne($result, $from->iterable);
   }
-
-  /**
-   * Emit single nodes
-   *
-   * @param  lang.ast.Result $result
-   * @param  lang.ast.Node $node
-   * @return void
-   */
-  public function emitOne($result, $node) {
-    parent::emitOne($result->at($node->line), $node);
-  }
 }

src/main/php/lang/ast/emit/Result.class.php

@@ -7,6 +7,7 @@
 class Result implements Closeable {
   public $out;
   public $codegen;
+  public $line= 1;
   public $locals= [];
 
   /**
@@ -31,6 +32,19 @@ public function from($file) {
     return $this;
   }
 
+  /**
+   * Forwards output line to given line number
+   *
+   * @param  int $line
+   * @return self
+   */
+  public function at($line) {
+    if ($line > $this->line) {
+      $this->out->write(str_repeat("\n", $line - $this->line));
+      $this->line= $line;
+    }
+    return $this;
+  }
 
   /**
    * Initialize result. Guaranteed to be called *once* from constructor.