Change lang.ast.types.IsGeneric::$base to lang.ast.Type

Author: thekid

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

@@ -1227,7 +1227,7 @@ private function type0($parse, $optional) {
       if ('array' === $type) {
         return 1 === sizeof($components) ? new IsArray($components[0]) : new IsMap($components[0], $components[1]);
       } else {
-        return new IsGeneric($type, $components);
+        return new IsGeneric(new IsValue($type), $components);
       }
     }
 

src/main/php/lang/ast/types/IsGeneric.class.php

@@ -8,7 +8,7 @@ class IsGeneric extends Type {
   /**
    * Creates a new type
    *
-   * @param  string $base
+   * @param  parent $base
    * @param  parent[] $components
    */
   public function __construct($base, $components= []) {

src/test/php/lang/ast/unittest/TypeTest.class.php

@@ -44,12 +44,26 @@ public function nullable($t) {
 
   #[Test, Values(['int', 'string'])]
   public function generic_list($t) {
-    Assert::equals(new IsGeneric('List', [new IsLiteral($t)]), $this->parse('List<'.$t.'>'));
+    Assert::equals(
+      new IsGeneric(new IsValue('List'), [new IsLiteral($t)]),
+      $this->parse('List<'.$t.'>')
+    );
   }
 
   #[Test, Values(['int', 'string'])]
   public function generic_map($t) {
-    Assert::equals(new IsGeneric('Map', [new IsLiteral('string'), new IsLiteral($t)]), $this->parse('Map<string, '.$t.'>'));
+    Assert::equals(
+      new IsGeneric(new IsValue('Map'), [new IsLiteral('string'), new IsLiteral($t)]),
+      $this->parse('Map<string, '.$t.'>')
+    );
+  }
+
+  #[Test]
+  public function nested_generic() {
+    Assert::equals(
+      new IsGeneric(new IsValue('Filter'), [new IsGeneric(new IsValue('Set'), [new IsLiteral('T')])]),
+      $this->parse('Filter<Set<T>>')
+    );
   }
 
   #[Test, Values(['self', 'static', 'parent', 'Value', '\\lang\\Value',])]