chizui/Il2CppInspectorRedux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Model: Generate ConstructorInfo for generic class constructors from MethodSpecs

Browse Source
This commit is contained in:
Katy Coe
2020-02-02 05:17:47 +01:00
parent 63fb345bb1
commit 7b1d46644d
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Il2CppInspector/Reflection/ConstructorInfo.cs
View File

@@ -20,6 +20,8 @@ namespace Il2CppInspector.Reflection
public ConstructorInfo(Il2CppInspector pkg, int methodIndex, TypeInfo declaringType) : base(pkg, methodIndex, declaringType) { } public ConstructorInfo(Il2CppInspector pkg, int methodIndex, TypeInfo declaringType) : base(pkg, methodIndex, declaringType) { }
public ConstructorInfo(Il2CppModel model, Il2CppMethodSpec spec, TypeInfo declaringType) : base(model, spec, declaringType) { }
public override string ToString() => DeclaringType.Name + GetFullTypeParametersString() public override string ToString() => DeclaringType.Name + GetFullTypeParametersString()
+ "(" + string.Join(", ", DeclaredParameters.Select(x => x.ParameterType.Name)) + ")"; + "(" + string.Join(", ", DeclaredParameters.Select(x => x.ParameterType.Name)) + ")";

11
Il2CppInspector/Reflection/Il2CppModel.cs
View File

@@ -27,7 +27,7 @@ namespace Il2CppInspector.Reflection
public Dictionary<int, TypeInfo> TypesByMethodSpecClassIndex { get; } = new Dictionary<int, TypeInfo>(); public Dictionary<int, TypeInfo> TypesByMethodSpecClassIndex { get; } = new Dictionary<int, TypeInfo>();
// List of all methods from MethodSpecs (closed generic methods that can be called; does not need to be in a generic class) // List of all methods from MethodSpecs (closed generic methods that can be called; does not need to be in a generic class)
public Dictionary<TypeInfo, List<MethodInfo>> GenericMethods { get; } = new Dictionary<TypeInfo, List<MethodInfo>>(); public Dictionary<TypeInfo, List<MethodBase>> GenericMethods { get; } = new Dictionary<TypeInfo, List<MethodBase>>();
// List of all type definitions by fully qualified name (TypeDefs only) // List of all type definitions by fully qualified name (TypeDefs only)
public Dictionary<string, TypeInfo> TypesByFullName { get; } = new Dictionary<string, TypeInfo>(); public Dictionary<string, TypeInfo> TypesByFullName { get; } = new Dictionary<string, TypeInfo>();
@@ -90,9 +90,14 @@ namespace Il2CppInspector.Reflection
// First generic method declaration in this class? // First generic method declaration in this class?
if (!GenericMethods.ContainsKey(declaringType)) if (!GenericMethods.ContainsKey(declaringType))
GenericMethods.Add(declaringType, new List<MethodInfo>()); GenericMethods.Add(declaringType, new List<MethodBase>());
GenericMethods[declaringType].Add(new MethodInfo(this, spec, declaringType)); // Method or constructor
var concreteMethod = new MethodInfo(this, spec, declaringType);
if (concreteMethod.Name == ConstructorInfo.ConstructorName || concreteMethod.Name == ConstructorInfo.TypeConstructorName)
GenericMethods[declaringType].Add(new ConstructorInfo(this, spec, declaringType));
else
GenericMethods[declaringType].Add(concreteMethod);
} }
} }
} }