BALocalization/Il2CppInspectorRedux
19
0
Fork 0
mirror of https://github.com/LukeFZ/Il2CppInspectorRedux.git synced 2026-01-03 00:59:40 +05:00
Code Issues Packages Projects Releases Wiki Activity

Model: UnmangledBaseName / CSharpSafeName refactoring (#70)

Browse Source
This commit is contained in:
Katy Coe
2020-09-13 14:51:20 +02:00
parent 8e00e47ccd
commit e511b99dec
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Il2CppInspector.Common/Reflection/MemberInfo.cs
View File

@@ -29,7 +29,7 @@ namespace Il2CppInspector.Reflection {
public virtual string Name { get; protected set; }
// Name of the member with @ prepended if the name is a C# reserved keyword
public string CSharpSafeName => Constants.Keywords.Contains(Name) ? "@" + Name : Name;
public virtual string CSharpName => Constants.Keywords.Contains(Name) ? "@" + Name : Name;
// For top-level members in an assembly (ie. non-nested types)
protected MemberInfo(Assembly asm) => Assembly = asm;

2
Il2CppInspector.Common/Reflection/MethodBase.cs
View File

@@ -92,7 +92,7 @@ namespace Il2CppInspector.Reflection
return image.ReadMappedBytes(VirtualAddress.Value.Start, (int) (VirtualAddress.Value.End - VirtualAddress.Value.Start));
}
public string CSharpName =>
public override string CSharpName =>
// Operator overload or user-defined conversion operator
OperatorMethodNames.ContainsKey(Name)? "operator " + OperatorMethodNames[Name]

8
Il2CppInspector.Common/Reflection/PropertyInfo.cs
View File

@@ -31,14 +31,14 @@ namespace Il2CppInspector.Reflection {
public override string Name { get; protected set; }
public string CSharpName {
public override string CSharpName {
get {
// Explicit interface implementation
if (DeclaringType.ImplementedInterfaces
.FirstOrDefault(i => CSharpSafeName.IndexOf("." + i.CSharpName, StringComparison.Ordinal) != -1) is TypeInfo @interface)
return CSharpSafeName.Substring(CSharpSafeName.IndexOf("." + @interface.CSharpName, StringComparison.Ordinal) + 1);
.FirstOrDefault(i => Name.IndexOf("." + i.CSharpName, StringComparison.Ordinal) != -1) is TypeInfo @interface)
return Name.Substring(Name.IndexOf("." + @interface.CSharpName, StringComparison.Ordinal) + 1);
// Regular method
// Regular property
return Name;
}
}

4
Il2CppInspector.Common/Reflection/TypeInfo.cs
View File

@@ -298,10 +298,10 @@ namespace Il2CppInspector.Reflection
}
// Get rid of generic backticks
public string UnmangledBaseName => unmangleName(base.Name);
public string CSharpBaseName => unmangleName(base.Name);
// C# colloquial name of the type (if available)
public string CSharpName {
public override string CSharpName {
get {
if (HasElementType) {
var n = ElementType.CSharpName;