From 3d6ab10b6de33b9a6d345dc5acf86e2f78521be7 Mon Sep 17 00:00:00 2001 From: Mike Bierlee Date: Sat, 28 Feb 2015 16:09:32 +0100 Subject: [PATCH] Extracting debug info printing to separate functions --- source/poodinis/autowire.d | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/source/poodinis/autowire.d b/source/poodinis/autowire.d index 7ee8814..79d5c76 100644 --- a/source/poodinis/autowire.d +++ b/source/poodinis/autowire.d @@ -64,6 +64,10 @@ struct Autowire(QualifierType = UseMemberType) { QualifierType qualifier; }; +private void printDebugAutowiredInstance(TypeInfo instanceType, void* instanceAddress) { + writeln(format("DEBUG: Autowiring members of [%s@%s]", instanceType, instanceAddress)); +} + /** * Autowires members of a given instance using dependencies registered in the given container. * @@ -78,9 +82,7 @@ struct Autowire(QualifierType = UseMemberType) { */ public void autowire(Type)(DependencyContainer container, Type instance) { debug(poodinisVerbose) { - auto instanceType = typeid(Type); - auto instanceAddress = &instance; - writeln(format("DEBUG: Autowiring members of [%s@%s]", instanceType, instanceAddress)); + printDebugAutowiredInstance(typeid(Type), &instance); } foreach (member ; __traits(allMembers, Type)) { @@ -88,6 +90,10 @@ public void autowire(Type)(DependencyContainer container, Type instance) { } } +private void printDebugAutowiringCandidate(TypeInfo candidateInstanceType, void* candidateInstanceAddress, TypeInfo instanceType, void* instanceAddress, string member) { + writeln(format("DEBUG: Autowired instance [%s@%s] to [%s@%s].%s", candidateInstanceType, candidateInstanceAddress, instanceType, instanceAddress, member)); +} + private void autowireMember(string member, Type)(DependencyContainer container, Type instance) { // For the love of god, refactor this! <-- Doing it, bro! static if(__traits(compiles, __traits(getMember, Type, member)) && __traits(compiles, __traits(getAttributes, __traits(getMember, Type, member)))) { @@ -98,7 +104,7 @@ private void autowireMember(string member, Type)(DependencyContainer container, alias MemberType = typeof(memberReference)[0]; debug(poodinisVerbose) { - string qualifiedInstanceTypeString = typeid(MemberType).toString; + TypeInfo qualifiedInstanceType = typeid(MemberType); } MemberType qualifiedInstance; @@ -106,7 +112,7 @@ private void autowireMember(string member, Type)(DependencyContainer container, alias QualifierType = typeof(autowireAttribute.qualifier); qualifiedInstance = container.resolve!(typeof(memberReference), QualifierType); debug(poodinisVerbose) { - qualifiedInstanceTypeString = typeid(QualifierType).toString; + qualifiedInstanceType = typeid(QualifierType); } } else { qualifiedInstance = container.resolve!(typeof(memberReference)); @@ -115,10 +121,7 @@ private void autowireMember(string member, Type)(DependencyContainer container, __traits(getMember, instance, member) = qualifiedInstance; debug(poodinisVerbose) { - auto instanceType = typeid(Type); - auto instanceAddress = &instance; - auto qualifiedInstanceAddress = &qualifiedInstance; - writeln(format("DEBUG: Autowired instance [%s@%s] to [%s@%s].%s", qualifiedInstanceTypeString, qualifiedInstanceAddress, instanceType, instanceAddress, member)); + printDebugAutowiringCandidate(qualifiedInstanceType, &qualifiedInstance, typeid(Type), &instance, member); } }