zune/ZuneUIXTools
0
0
Fork 0
mirror of https://github.com/ZuneDev/ZuneUIXTools.git synced 2026-07-27 13:11:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Unify invocation and member access type inference, add support for chained accesses

Browse Source
This commit is contained in:
Joshua "Yoshi" Askharoun
2025-11-24 02:10:55 -06:00
parent d8c073bd3d
commit f0f067759a
1 changed files with 49 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/UIX.DecompXml/Mock/IrisObject.cs
+49 -37
View File
@@ -51,20 +51,61 @@ internal record IrisObject(object Object, TypeSchema Type)
if (expr is ParenthesizedExpressionSyntax parenExpr) if (expr is ParenthesizedExpressionSyntax parenExpr)
expr = parenExpr.Expression; expr = parenExpr.Expression;
if (expr is MemberAccessExpressionSyntax memberAccessExpression) if (expr is InvocationExpressionSyntax or MemberAccessExpressionSyntax)
{ {
// TODO: Handle member access on instances // TODO: Handle invocation of instance methods
try try
{ {
var sourceExpr = (IdentifierNameSyntax)memberAccessExpression.Expression; ExpressionSyntax sourceExpr = expr;
var sourceTypeName = QualifiedTypeName.Parse(sourceExpr.ToString());
Stack<ArgumentListSyntax> argumentLists = [];
List<NameSyntax> names = [];
while (sourceExpr is not NameSyntax)
{
if (sourceExpr is MemberAccessExpressionSyntax innerSourceExpr)
{
names.Add(innerSourceExpr.Name);
sourceExpr = innerSourceExpr.Expression;
}
else if (sourceExpr is InvocationExpressionSyntax innerInvocationExpr)
{
argumentLists.Push(innerInvocationExpr.ArgumentList);
sourceExpr = innerInvocationExpr.Expression;
}
}
if (sourceExpr is not NameSyntax sourceName)
return null;
names.Reverse();
var sourceTypeName = QualifiedTypeName.Parse(sourceName.ToString());
var sourceType = ctx.GetImportedType(sourceTypeName); var sourceType = ctx.GetImportedType(sourceTypeName);
var memberName = memberAccessExpression.TryGetInferredMemberName(); foreach (var name in names)
{
var memberName = name.ToString();
var property = sourceType.FindPropertyDeep(memberName); var prop = sourceType.FindPropertyDeep(memberName);
if (property is not null) if (prop is not null)
return property.PropertyType; {
sourceType = prop.PropertyType;
continue;
}
var argumentList = argumentLists.Pop();
// Try to disambiguate overloads using number of parameters
var parameterCount = argumentList.Arguments.Count;
var method = sourceType.Methods.FirstOrDefault(
m => m.Name == memberName && m.ParameterTypes.Length == parameterCount);
sourceType = method.ReturnType;
}
return sourceType;
} }
catch { } catch { }
} }
@@ -91,35 +132,6 @@ internal record IrisObject(object Object, TypeSchema Type)
_ => throw new System.NotImplementedException(), _ => throw new System.NotImplementedException(),
}; };
} }
else if (expr is InvocationExpressionSyntax invocationExpression)
{
// TODO: Handle invocation of instance methods
try
{
var sourceExpr = invocationExpression.Expression;
List<NameSyntax> names = [];
while (sourceExpr is MemberAccessExpressionSyntax innerSourceExpr)
{
names.Add(innerSourceExpr.Name);
sourceExpr = innerSourceExpr.Expression;
}
var sourceTypeName = QualifiedTypeName.Parse(sourceExpr.ToString());
var sourceType = ctx.GetImportedType(sourceTypeName);
var memberName = names[^1].ToString();
// Try to disambiguate overloads using number of parameters
var parameterCount = invocationExpression.ArgumentList.Arguments.Count;
var method = sourceType.Methods.FirstOrDefault(
m => m.Name == memberName && m.ParameterTypes.Length == parameterCount);
return method?.ReturnType;
}
catch { }
}
return null; return null;
} }