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

Model: Handle nested types

Browse Source
This commit is contained in:
Katy Coe
2019-10-31 16:02:32 +01:00
parent cb9d391d52
commit 70a541c36c
7 changed files with 53 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Il2CppInspector/Reflection/MemberInfo.cs
View File

@@ -18,7 +18,8 @@ namespace Il2CppInspector.Reflection {
public IEnumerable<CustomAttributeData> CustomAttributes => throw new NotImplementedException();
// Type that this type is declared in for nested types
public TypeInfo DeclaringType { get; }
protected int declaringTypeDefinitionIndex { private get; set; } = -1;
public TypeInfo DeclaringType => declaringTypeDefinitionIndex != -1? Assembly.Model.TypesByIndex[declaringTypeDefinitionIndex] : null;
// What sort of member this is, eg. method, field etc.
public abstract MemberTypes MemberType { get; }
@@ -29,16 +30,13 @@ namespace Il2CppInspector.Reflection {
// TODO: GetCustomAttributes etc.
// For top-level members in an assembly (ie. non-nested types)
protected MemberInfo(Assembly asm, TypeInfo declaringType = null) {
Assembly = asm;
DeclaringType = declaringType;
}
protected MemberInfo(Assembly asm) => Assembly = asm;
// For lower level members, eg. fields, properties etc. and nested types
protected MemberInfo(TypeInfo declaringType) {
protected MemberInfo(TypeInfo declaringType = null) {
if (declaringType != null) {
Assembly = declaringType.Assembly;
DeclaringType = declaringType;
declaringTypeDefinitionIndex = declaringType.Index;
}
}