Make addReturn and addReturnCase take a value renderer

Consistency; previously was always literals; replace with one of:

 - `addReturn($any_literal, HackBuilderValues::literal())`
 - `addReturnf('some literal with no placeholders')`
 - `addReturnf('%s', $any_literal)`

Similar for addReturnCase.

Fixes #32

Author: fredemmott

examples/dorm/CodegenDorm.php

@@ -95,7 +95,7 @@ private function getLoad(): CodegenMethod {
       ->addMultilineCall('$conn->query', Vector {"\"$sql\""}, true)
       ->addLine('$result = $cursor->fetch(PDO::FETCH_ASSOC);')
       ->startIfBlock('!$result')
-      ->addReturn('null')
+      ->addReturnf('null')
       ->endIfBlock()
       ->addAssignment(
         '$ts',
@@ -168,7 +168,7 @@ private function getGetters(): Vector<CodegenMethod> {
               $data,
               HackBuilderValues::literal(),
             )
-            ->addReturn($return_data)
+            ->addReturn($return_data, HackBuilderValues::literal())
             ->getCode();
       }
       $methods[] = $cg->codegenMethod('get'.$name)

examples/dorm/CodegenMutator.php

@@ -182,7 +182,7 @@ private function getSaveMethod(): CodegenMethod {
         $this->schema->getTableName(),
       )
       ->addLine('$conn->exec($st);')
-      ->addReturn('(int) $conn->lastInsertId()')
+      ->addReturnf('(int) $conn->lastInsertId()')
       ->addElseBlock()
       ->addAssignment(
         '$pairs',
@@ -195,7 +195,7 @@ private function getSaveMethod(): CodegenMethod {
         $this->schema->getIdField(),
       )
       ->addLine('$conn->exec($st);')
-      ->addReturn('$id')
+      ->addReturnf('$id')
       ->endIfBlock();
 
     return $cg->codegenMethod('save')
@@ -267,7 +267,7 @@ private function getSetters(): Vector<CodegenMethod> {
         $body->endManualSection();
       }
 
-      $body->addReturn('$this');
+      $body->addReturnf('$this');
 
       $methods[] = $cg->codegenMethod('set'.$name)
         ->setReturnType('this')

src/HackBuilder.php

@@ -158,14 +158,23 @@ private function addWrappedStringImpl(
     return $this;
   }
 
-  public function addReturn(string $value): this {
-    return $this->addLineImpl('return %s;', [$value]);
+  public function addReturn<T>(
+    T $value,
+    IHackBuilderValueRenderer<T> $renderer,
+  ): this {
+    return $this
+      ->add('return ')
+      ->addValue($value, $renderer)
+      ->addLine(';');
   }
   public function addReturnf(
     SprintfFormatString $value,
     mixed ...$args
   ): this {
-    return $this->addReturn(vsprintf($value, $args));
+    return $this->addReturn(
+      vsprintf($value, $args),
+      HackBuilderValues::literal(),
+    );
   }
 
   public function addAssignment<T>(
@@ -353,8 +362,21 @@ public function endDefault(): this {
     return $this->unindent();
   }
 
-  public function returnCase(string $statement): this {
-    return $this->addReturn($statement)->unindent();
+  public function returnCase<T>(
+    T $value,
+    IHackBuilderValueRenderer<T> $r,
+  ): this {
+    return $this->addReturn($value, $r)->unindent();
+  }
+
+  public function returnCasef(
+    SprintfFormatString $value,
+    mixed ...$args
+  ): this {
+    return $this->returnCase(
+      vsprintf($value, $args),
+      HackBuilderValues::literal(),
+    );
   }
 
   public function breakCase(): this {

test/HackBuilderTest.php

@@ -250,7 +250,7 @@ public function testSwitchBodyWithReturnsInCaseAndDefault(): void {
         ($player, $body) ==> {
           $body->addCase(sprintf('\'%s\'', $player['name']))
             ->addLinef('$shot = new Shot(\'%s\');', $player['favorite_shot'])
-            ->returnCase('$shot->execute()');
+            ->returnCasef('$shot->execute()');
         },
       )
       ->addDefault()