Fix string reference to types

Fix #51
yck1509 · Jul 30, 2014 · f3c1406 · f3c1406
1 parent 78af582
commit f3c1406
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 0 deletions.
diff --git a/Confuser.Renamer/Analyzers/LdtokenEnumAnalyzer.cs b/Confuser.Renamer/Analyzers/LdtokenEnumAnalyzer.cs
@@ -1,5 +1,6 @@
 using System;
 using Confuser.Core;
+using Confuser.Renamer.References;
 using dnlib.DotNet;
 using dnlib.DotNet.Emit;
 
@@ -41,6 +42,10 @@ public void Analyze(ConfuserContext context, INameService service, IDnlibDef def
 				} else if ((instr.OpCode.Code == Code.Call || instr.OpCode.Code == Code.Callvirt) &&
 				           ((IMethod)instr.Operand).Name == "ToString") {
 					HandleEnum(context, service, method, i);
+				} else if (instr.OpCode.Code == Code.Ldstr) {
+					TypeDef typeDef = method.Module.FindReflection((string)instr.Operand);
+					if (typeDef != null)
+						service.AddReference(typeDef, new StringTypeReference(instr, typeDef));
 				}
 			}
 		}

diff --git a/Confuser.Renamer/Confuser.Renamer.csproj b/Confuser.Renamer/Confuser.Renamer.csproj
@@ -76,6 +76,7 @@
     <Compile Include="References\BAMLAttributeReference.cs" />
     <Compile Include="References\BAMLConverterTypeReference.cs" />
     <Compile Include="References\BAMLConverterMemberReference.cs" />
+    <Compile Include="References\StringTypeReference.cs" />
     <Compile Include="References\TypeRefReference.cs" />
     <Compile Include="References\OverrideDirectiveReference.cs" />
     <Compile Include="References\MemberRefReference.cs" />

diff --git a/Confuser.Renamer/References/StringTypeReference.cs b/Confuser.Renamer/References/StringTypeReference.cs
@@ -0,0 +1,25 @@
+using System;
+using Confuser.Core;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
+
+namespace Confuser.Renamer.References {
+	public class StringTypeReference : INameReference<TypeDef> {
+		private readonly Instruction reference;
+		private readonly TypeDef typeDef;
+
+		public StringTypeReference(Instruction reference, TypeDef typeDef) {
+			this.reference = reference;
+			this.typeDef = typeDef;
+		}
+
+		public bool UpdateNameReference(ConfuserContext context, INameService service) {
+			reference.Operand = typeDef.ReflectionFullName;
+			return true;
+		}
+
+		public bool ShouldCancelRename() {
+			return false;
+		}
+	}
+}