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

Output: Show enum usages as their corresponding member names (CS0266, CS1750)

Browse Source
This commit is contained in:
Katy Coe
2019-11-29 08:37:46 +01:00
parent b36ccda9b9
commit da9252a68c
3 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Il2CppInspector/Reflection/Extensions.cs
View File

@@ -63,7 +63,7 @@ namespace Il2CppInspector.Reflection
}; };
// Output a value in C#-friendly syntax // Output a value in C#-friendly syntax
public static string ToCSharpValue(this object value) { public static string ToCSharpValue(this object value, TypeInfo type, Scope usingScope = null) {
if (value is bool) if (value is bool)
return (bool) value ? "true" : "false"; return (bool) value ? "true" : "false";
if (value is float) if (value is float)
@@ -79,12 +79,27 @@ namespace Il2CppInspector.Reflection
: str[i].ToString()); : str[i].ToString());
return $"\"{s}\""; return $"\"{s}\"";
} }
if (!(value is char)) if (value is char) {
return (value?.ToString() ?? "null"); var cValue = (int) (char) value;
var cValue = (int) (char) value; if (cValue < 32 || cValue > 126)
if (cValue < 32 || cValue > 126) return $"'\\x{cValue:x4}'";
return $"'\\x{cValue:x4}'"; return $"'{value}'";
return $"'{value}'"; }
if (type.IsEnum) {
var flags = type.GetCustomAttributes("System.FlagsAttribute").Any();
var values = type.GetEnumNames().Zip(type.GetEnumValues().OfType<object>(), (k, v) => new {k, v}).ToDictionary(x => x.k, x => x.v);
var typePrefix = type.GetScopedCSharpName(usingScope) + ".";
// We don't know what type the enumeration or value is, so we use Object.Equals() to do content-based equality testing
if (!flags)
return typePrefix + values.First(v => v.Value.Equals(value)).Key;
// Logical OR a series of flags together
var flagValue = Convert.ToInt64(value);
var setFlags = values.Where(x => (Convert.ToInt64(x.Value) & flagValue) == Convert.ToInt64(x.Value)).Select(x => typePrefix + x.Key);
return string.Join(" | ", setFlags);
}
return (value?.ToString() ?? "null");
} }
} }
} }

2
Il2CppInspector/Reflection/FieldInfo.cs
View File

@@ -24,7 +24,7 @@ namespace Il2CppInspector.Reflection {
public bool HasDefaultValue => (Attributes & FieldAttributes.HasDefault) != 0; public bool HasDefaultValue => (Attributes & FieldAttributes.HasDefault) != 0;
public object DefaultValue { get; } public object DefaultValue { get; }
public string DefaultValueString => HasDefaultValue ? DefaultValue.ToCSharpValue() : ""; public string DefaultValueString => HasDefaultValue ? DefaultValue.ToCSharpValue(FieldType) : "";
// Information/flags about the field // Information/flags about the field
public FieldAttributes Attributes { get; } public FieldAttributes Attributes { get; }

3
Il2CppInspector/Reflection/ParameterInfo.cs
View File

@@ -108,7 +108,8 @@ namespace Il2CppInspector.Reflection
(Position == 0 && DeclaringMethod.GetCustomAttributes("System.Runtime.CompilerServices.ExtensionAttribute").Any()? "this ":"") (Position == 0 && DeclaringMethod.GetCustomAttributes("System.Runtime.CompilerServices.ExtensionAttribute").Any()? "this ":"")
+ $"{CustomAttributes.ToString(usingScope, inline: true, emitPointer: emitPointer, mustCompile: compileAttributes).Replace("[ParamArray]", "params")}" + $"{CustomAttributes.ToString(usingScope, inline: true, emitPointer: emitPointer, mustCompile: compileAttributes).Replace("[ParamArray]", "params")}"
+ $"{getCSharpSignatureString(usingScope)} {Name}" + $"{getCSharpSignatureString(usingScope)} {Name}"
+ (HasDefaultValue ? " = " + DefaultValue.ToCSharpValue() + (emitPointer && !(DefaultValue is null)? $" /* Metadata: 0x{(uint) DefaultValueMetadataAddress:X8} */" : "") : ""); + (HasDefaultValue ? " = " + DefaultValue.ToCSharpValue(ParameterType, usingScope)
+ (emitPointer && !(DefaultValue is null)? $" /* Metadata: 0x{(uint) DefaultValueMetadataAddress:X8} */" : "") : "");
public string GetReturnParameterString(Scope scope) => !IsRetval? null : getCSharpSignatureString(scope); public string GetReturnParameterString(Scope scope) => !IsRetval? null : getCSharpSignatureString(scope);
} }