Output: Prepend fields, events, properties and parameter names using reserved C# keywords with @

This commit is contained in:
Katy Coe
2019-12-12 10:18:55 +01:00
parent f10d52bdd2
commit f60047a55a
6 changed files with 53 additions and 5 deletions

View File

@@ -228,11 +228,11 @@ namespace Il2CppInspector
if (field.GetCustomAttributes(FBAttribute).Any()) {
if (!SuppressMetadata)
sb.Append($"/* {field.GetCustomAttributes(FBAttribute)[0].VirtualAddress.ToAddressString()} */ ");
sb.Append($"{field.FieldType.DeclaredFields[0].FieldType.GetScopedCSharpName(scope)} {field.Name}[0]"); // FixedElementField
sb.Append($"{field.FieldType.DeclaredFields[0].FieldType.GetScopedCSharpName(scope)} {field.CSharpSafeName}[0]"); // FixedElementField
}
// Regular fields
else
sb.Append($"{field.FieldType.GetScopedCSharpName(scope)} {field.Name}");
sb.Append($"{field.FieldType.GetScopedCSharpName(scope)} {field.CSharpSafeName}");
if (field.HasDefaultValue)
sb.Append($" = {field.DefaultValueString}");
sb.Append(";");
@@ -308,7 +308,7 @@ namespace Il2CppInspector
.ToString(scope, prefix + "\t", emitPointer: !SuppressMetadata, mustCompile: MustCompile));
string modifiers = evt.AddMethod?.GetModifierString();
sb.Append($"{prefix}\t{modifiers}event {evt.EventHandlerType.GetScopedCSharpName(scope)} {evt.Name}");
sb.Append($"{prefix}\t{modifiers}event {evt.EventHandlerType.GetScopedCSharpName(scope)} {evt.CSharpSafeName}");
if (!MustCompile) {
sb.Append(" {{\n");