Use named constructors for infix and prefix function calls

eventjet · Mar 25, 2024 · ddff1b4 · ddff1b4
1 parent 926287d
commit ddff1b4
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 13 deletions.
diff --git a/src/Call.php b/src/Call.php
@@ -39,6 +39,29 @@ public function __construct(
         $this->location = $location;
     }
 
+    /**
+     * @template U
+     * @param Expression<mixed> $left
+     * @param Expression<mixed> $right
+     * @param Type<U> $type
+     * @return self<U>
+     */
+    public static function infix(string $name, Expression $left, Expression $right, Type $type): self
+    {
+        return new self($left, $name, $type, [$right], $left->location()->to($right->location()), CallType::Infix);
+    }
+
+    /**
+     * @template U
+     * @param Expression<mixed> $argument
+     * @param Type<U> $type
+     * @return self<U>
+     */
+    public static function prefix(string $name, Expression $argument, Type $type, Span $location): self
+    {
+        return new self($argument, $name, $type, [], $location, CallType::Prefix);
+    }
+
     /**
      * @param list<Expression<mixed>> $a
      * @param list<Expression<mixed>> $b

diff --git a/src/Expr.php b/src/Expr.php
@@ -30,7 +30,7 @@ private function __construct()
      */
     public static function eq(Expression $left, Expression $right): Expression
     {
-        return new Call($left, '===', Type::bool(), [$right], $left->location()->to($right->location()), CallType::Infix);
+        return Call::infix('===', $left, $right, Type::bool());
     }
 
     /**
@@ -85,7 +85,7 @@ public static function call(Expression $target, string $name, Type $type, array
      */
     public static function or_(Expression $left, Expression $right): Expression
     {
-        return new Call($left, '||', Type::bool(), [$right], $left->location()->to($right->location()), CallType::Infix);
+        return Call::infix('||', $left, $right, Type::bool());
     }
 
     /**
@@ -109,14 +109,7 @@ public static function lambda(Expression $body, array $parameters = [], Span|nul
      */
     public static function subtract(Expression $minuend, Expression $subtrahend): Expression
     {
-        return new Call(
-            $minuend,
-            '-',
-            $minuend->getType(),
-            [$subtrahend],
-            $minuend->location()->to($subtrahend->location()),
-            CallType::Infix,
-        );
+        return Call::infix('-', $minuend, $subtrahend, $minuend->getType());
     }
 
     /**
@@ -127,7 +120,7 @@ public static function subtract(Expression $minuend, Expression $subtrahend): Ex
      */
     public static function gt(Expression $left, Expression $right): Expression
     {
-        return new Call($left, '>', Type::bool(), [$right], $left->location()->to($right->location()), CallType::Infix);
+        return Call::infix('>', $left, $right, Type::bool());
     }
 
     /**
@@ -137,8 +130,7 @@ public static function gt(Expression $left, Expression $right): Expression
      */
     public static function negative(Expression $expression, Span|null $location = null): Expression
     {
-        $location ??= self::dummySpan();
-        return new Call($expression, '-', $expression->getType(), [], $location, CallType::Prefix);
+        return Call::prefix('-', $expression, $expression->getType(), $location ?? self::dummySpan());
     }
 
     private static function dummySpan(): Span