Verify first-class callable and PFAs both return Closure instances

Author: thekid

src/test/php/lang/ast/unittest/emit/CallableSyntaxTest.class.php

@@ -1,5 +1,6 @@
 <?php namespace lang\ast\unittest\emit;
 
+use Closure;
 use lang\Error;
 use test\verify\Runtime;
 use test\{Assert, Expect, Test, Values};
@@ -23,33 +24,33 @@ private function verify($code) {
     Assert::equals(4, $this->run($code)('Test'));
   }
 
-  #[Test]
-  public function native_function_variadic() {
-    $this->verify('class %T {
-      public function run() { return strlen(...); }
-    }');
+  #[Test, Values(['strlen(...)', 'strlen(?)'])]
+  public function returns_closure($notation) {
+    Assert::instance(Closure::class, $this->run('class %T {
+      public function run() { return '.$notation.'; }
+    }'));
   }
 
-  #[Test]
-  public function native_function_argument() {
+  #[Test, Values(['strlen(...)', 'strlen(?)'])]
+  public function native_function($notation) {
     $this->verify('class %T {
-      public function run() { return strlen(?); }
+      public function run() { return '.$notation.'; }
     }');
   }
 
-  #[Test]
-  public function instance_method() {
+  #[Test, Values(['$this->length(...)', '$this->length(?)'])]
+  public function instance_method($notation) {
     $this->verify('class %T {
       public function length($arg) { return strlen($arg); }
-      public function run() { return $this->length(...); }
+      public function run() { return '.$notation.'; }
     }');
   }
 
-  #[Test]
-  public function class_method() {
+  #[Test, Values(['self::length(...)', 'self::length(?)'])]
+  public function class_method($notation) {
     $this->verify('class %T {
       public static function length($arg) { return strlen($arg); }
-      public function run() { return self::length(...); }
+      public function run() { return '.$notation.'; }
     }');
   }
 
@@ -159,8 +160,8 @@ public function run() {
     }');
   }
 
-  #[Test]
-  public function instantiation_variadic() {
+  #[Test, Values(['new Handle(...)', 'new Handle(?)'])]
+  public function instantiation($notation) {
     $f= $this->run('use lang\ast\unittest\emit\Handle; class %T {
       public function run() {
         return new Handle(...);
@@ -169,16 +170,6 @@ public function run() {
     Assert::equals(new Handle(1), $f(1));
   }
 
-  #[Test]
-  public function instantiation_argument() {
-    $f= $this->run('use lang\ast\unittest\emit\Handle; class %T {
-      public function run() {
-        return new Handle(?);
-      }
-    }');
-    Assert::equals(new Handle(1), $f(1));
-  }
-
   #[Test]
   public function instantiation_in_map() {
     $r= $this->run('use lang\ast\unittest\emit\Handle; class %T {