From d07a28093d11da2474a0d26620260f915d1082a5 Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Tue, 22 Feb 2011 16:58:25 +0100 Subject: [PATCH] Pass field names through CleanUpVariableName before using them as variable names. --- ICSharpCode.Decompiler/Ast/NameVariables.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ICSharpCode.Decompiler/Ast/NameVariables.cs b/ICSharpCode.Decompiler/Ast/NameVariables.cs index 6e5805435..bea32a6a2 100644 --- a/ICSharpCode.Decompiler/Ast/NameVariables.cs +++ b/ICSharpCode.Decompiler/Ast/NameVariables.cs @@ -99,10 +99,10 @@ namespace Decompiler case ILCode.Ldfld: // Use the field name only if it's not a field on this (avoid confusion between local variables and fields) if (!(expr.Arguments[0].Code == ILCode.Ldarg && ((ParameterDefinition)expr.Arguments[0].Operand).Index < 0)) - return ((FieldReference)expr.Operand).Name; + return CleanUpVariableName(((FieldReference)expr.Operand).Name); break; case ILCode.Ldsfld: - return ((FieldReference)expr.Operand).Name; + return CleanUpVariableName(((FieldReference)expr.Operand).Name); case ILCode.Call: case ILCode.Callvirt: MethodReference mr = (MethodReference)expr.Operand;