Fix type resolution failures on as casts using procedural types

Author: fourls

CHANGELOG.md

@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Name resolution failures on generic routine invocations where later type parameters are constrained by earlier type parameters.
+- Type resolution failures on `as` casts where the type is returned from a routine invocation.
 
 ## [1.16.0] - 2025-05-09
 

delphi-frontend/src/main/java/au/com/integradev/delphi/symbol/resolve/ExpressionTypeResolver.java

@@ -121,9 +121,14 @@ public Type resolve(PrimaryExpressionNode expression) {
   }
 
   private static Type classReferenceValueType(Type type) {
+    if (type.isProcedural()) {
+      type = ((ProceduralType) type).returnType();
+    }
+
     if (type.isClassReference()) {
       return ((ClassReferenceType) type).classType();
     }
+
     return unknownType();
   }
 

delphi-frontend/src/test/java/au/com/integradev/delphi/executor/DelphiSymbolTableExecutorTest.java

@@ -517,7 +517,7 @@ void testCharTypeResolution() {
   @Test
   void testCastTypeResolution() {
     execute("typeResolution/Casts.pas");
-    verifyUsages(8, 14, reference(15, 12), reference(16, 16));
+    verifyUsages(8, 14, reference(22, 12), reference(23, 16), reference(24, 20));
   }
 
   @Test

delphi-frontend/src/test/resources/au/com/integradev/delphi/symbol/typeResolution/Casts.pas

@@ -8,12 +8,20 @@   TFoo = class(TObject)
     procedure Bar;
   end;
 
+  TFooClass = class of TFoo;
+
 implementation
 
+function GetClass: TFooClass;
+begin
+  Result := TFoo;
+end;
+
 procedure Test(Arg: TObject);
 begin
   TFoo(Arg).Bar;
   (Arg as TFoo).Bar;
+  (Arg as GetClass).Bar;
 end;
 
 end.