Adjust to changes in lang.ast.types.IsGeneric

See xp-framework/ast@ff700b3

Author: thekid

ChangeLog.md

@@ -3,6 +3,10 @@ XP generics for PHP - ChangeLog
 
 ## ?.?.? / ????-??-??
 
+## 0.2.1 / 2022-11-06
+
+* Adjust to changes in `lang.ast.types.IsGeneric` - @thekid
+
 ## 0.2.0 / 2022-11-06
 
 * Added support for generic function types such as `function(T, T): int`.

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

@@ -150,7 +150,7 @@ public function setup($language, $emitter) {
               new InstanceExpression(
                 new InvokeExpression(
                   new ScopeExpression('\\lang\\XPClass', new Literal('forName')),
-                  [new ScopeExpression($node->type->base, new Literal('class'))]
+                  [new ScopeExpression($node->type->base->literal(), new Literal('class'))]
                 ),
                 new Literal('newGenericType')
               ),
@@ -183,8 +183,8 @@ public function setup($language, $emitter) {
           self::annotate($method, self::method($method, $node->name->components));
         }
 
-        // Rewrite class name
-        $node->name= new IsValue($node->name->base);
+        // Rewrite class name to the generic's base type
+        $node->name= $node->name->base;
       }
       return $node;
     });