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

Clean up some compiler messages

Browse Source
This commit is contained in:
Katy Coe
2019-11-28 04:00:32 +01:00
parent f77a9e5289
commit de846ea6db
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Il2CppInspector/Reflection/MethodBase.cs
View File

@@ -150,7 +150,7 @@ namespace Il2CppInspector.Reflection
_ => ""
};
public string GetModifierString(Scope usingScope) {
public string GetModifierString() {
// Interface methods and properties have no visible modifiers (they are always declared 'public abstract')
if (DeclaringType.IsInterface)
return string.Empty;
@@ -176,7 +176,7 @@ namespace Il2CppInspector.Reflection
if ((DeclaringType.BaseType?.GetAllMethods().Any(m => m.GetSignatureString() == GetSignatureString() && m.IsHideBySig) ?? false)
&& (((Attributes & MethodAttributes.VtableLayoutMask) == MethodAttributes.ReuseSlot && !IsVirtual)
|| (Attributes & MethodAttributes.VtableLayoutMask) == MethodAttributes.NewSlot))
modifiers.Append($"new ");
modifiers.Append("new ");
if (Name == "op_Implicit")
modifiers.Append("implicit ");

11
Il2CppInspector/Reflection/TypeInfo.cs
View File

@@ -90,7 +90,7 @@ namespace Il2CppInspector.Reflection {
public List<MethodInfo> DeclaredMethods { get; } = new List<MethodInfo>();
private int[] declaredNestedTypes;
private readonly int[] declaredNestedTypes;
public IEnumerable<TypeInfo> DeclaredNestedTypes => declaredNestedTypes.Select(x => Assembly.Model.TypesByDefinitionIndex[x]);
public List<PropertyInfo> DeclaredProperties { get; } = new List<PropertyInfo>();
@@ -191,8 +191,8 @@ namespace Il2CppInspector.Reflection {
&& usingScope.Substring(0, usingScope.IndexOf('.', diff))
== declaringScope.Substring(0, declaringScope.IndexOf('.', diff)))
diff = usingScope.IndexOf('.', diff) + 1;
usingScope = usingScope.Substring(0, usingScope.Length - 1);
declaringScope = declaringScope.Substring(0, declaringScope.Length - 1);
usingScope = usingScope.Remove(usingScope.Length - 1);
declaringScope = declaringScope.Remove(declaringScope.Length - 1);
// This is the mutual root namespace and optionally nested types that the two scopes share
var mutualRootScope = usingScope.Substring(0, diff - 1);
@@ -656,9 +656,8 @@ namespace Il2CppInspector.Reflection {
}
// Initialize a type that is a generic parameter of a generic method
public TypeInfo(MethodBase declaringMethod, Il2CppGenericParameter param) : this(declaringMethod.DeclaringType, param) {
DeclaringMethod = declaringMethod;
}
public TypeInfo(MethodBase declaringMethod, Il2CppGenericParameter param) : this(declaringMethod.DeclaringType, param)
=> DeclaringMethod = declaringMethod;
// Get all the other types directly referenced by this type (single level depth; no recursion)
public List<TypeInfo> GetAllTypeReferences() {