Call onTypesRenamed() a little later and update throw message with token

This commit is contained in:
de4dot 2011-11-02 05:57:10 +01:00
parent 78960c759c
commit 2a967dc699

View File

@ -120,6 +120,8 @@ namespace de4dot.renamer {
initAllTypes();
renameTypeDefinitions();
renameTypeReferences();
foreach (var module in modules)
module.onTypesRenamed();
prepareRenameMemberDefinitions();
renameMemberDefinitions();
renameMemberReferences();
@ -218,9 +220,6 @@ namespace de4dot.renamer {
fixClsTypeNames();
renameTypeDefinitions(nonNestedTypes);
foreach (var module in modules)
module.onTypesRenamed();
}
void prepareRenameTypeDefinitions(IEnumerable<TypeDef> typeDefs) {
@ -473,7 +472,7 @@ namespace de4dot.renamer {
}
if (isAutoCreatedType(typeReference))
return null;
throw new ApplicationException(string.Format("Could not resolve TypeReference {0}", typeReference));
throw new ApplicationException(string.Format("Could not resolve TypeReference {0} ({1:X8})", typeReference, typeReference.MetadataToken.ToInt32()));
}
public MethodDefinition resolve(MethodReference methodReference) {
@ -489,7 +488,7 @@ namespace de4dot.renamer {
}
if (isAutoCreatedType(methodReference.DeclaringType))
return null;
throw new ApplicationException(string.Format("Could not resolve MethodReference {0}", methodReference));
throw new ApplicationException(string.Format("Could not resolve MethodReference {0} ({1:X8})", methodReference, methodReference.MetadataToken.ToInt32()));
}
public FieldDefinition resolve(FieldReference fieldReference) {
@ -505,7 +504,7 @@ namespace de4dot.renamer {
}
if (isAutoCreatedType(fieldReference.DeclaringType))
return null;
throw new ApplicationException(string.Format("Could not resolve FieldReference {0}", fieldReference));
throw new ApplicationException(string.Format("Could not resolve FieldReference {0} ({1:X8})", fieldReference, fieldReference.MetadataToken.ToInt32()));
}
public MethodDef findMethod(MethodReference methodReference) {