Adapt to AST type refactoring

See xp-framework/ast#39

Author: thekid

ChangeLog.md

@@ -3,6 +3,10 @@ XP records for PHP - ChangeLog
 
 ## ?.?.? / ????-??-??
 
+## 2.4.0 / 2022-12-04
+
+* Adapt to AST type refactoring (xp-framework/ast#39) - @thekid
+
 ## 2.3.0 / 2022-02-05
 
 * Add support for `readonly` record parameters. See issue #7 - @thekid

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

@@ -14,7 +14,7 @@
   Variable
 };
 use lang\ast\syntax\Extension;
-use lang\ast\types\{IsArray, IsLiteral};
+use lang\ast\types\{IsArray, IsLiteral, IsValue};
 
 class Records implements Extension {
 
@@ -26,30 +26,26 @@ public static function inject(&$type, $name, $signature, $body) {
 
   public function setup($language, $emitter) {
     $language->stmt('record', function($parse, $token) {
-      $type= $parse->scope->resolve($parse->token->value);
-      $parse->forward();
-
       $comment= $parse->comment;
-      $parse->comment= null;
       $line= $parse->token->line;
+      $parse->comment= null;
 
+      $type= $this->type($parse, false);
       $parse->expecting('(', 'record');
       $components= $this->parameters($parse, []);
       $parse->expecting(')', 'record');
 
       $parent= null;
       if ('extends' === $parse->token->value) {
         $parse->forward();
-        $parent= $parse->scope->resolve($parse->token->value);
-        $parse->forward();
+        $parent= $this->type($parse, false);
       }
 
       $implements= [];
       if ('implements' === $parse->token->value) {
         $parse->forward();
         do {
-          $implements[]= $parse->scope->resolve($parse->token->value);
-          $parse->forward();
+          $implements[]= $this->type($parse, false);
           if (',' === $parse->token->value) {
             $parse->forward();
           } else if ('{' === $parse->token->value) {
@@ -136,6 +132,7 @@ public function setup($language, $emitter) {
       self::inject($body, 'compareTo', new Signature([new Parameter('value', null)], new IsLiteral('int')), new Code(
         '$value instanceof self ? \\util\\Objects::compare(['.substr($object, 2).'], ['.substr($value, 2).']) : 1'
       ));
+      $node->implements[]= new IsValue('\\lang\\Value');
 
       // Add decomposition
       self::inject($body, '__invoke', new Signature([new Parameter('map', new IsLiteral('callable'), new Literal('null'))], null), new Code(
@@ -146,7 +143,7 @@ public function setup($language, $emitter) {
         ['final'],
         $node->name,
         $node->parent,
-        array_merge(['\\lang\\Value'], $node->implements),
+        $node->implements,
         $body,
         $node->annotations,
         $node->comment,