Refactoring: GRMustacheSectionElement no longer needs any GRMustacheT…

…emplateLoader
groue · Nov 22, 2010 · ff21770 · ff21770
1 parent aa6b2b6
commit ff21770
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 13 deletions.
diff --git a/Classes/GRMustacheCompiler.m b/Classes/GRMustacheCompiler.m
@@ -110,7 +110,6 @@ - (BOOL)templateTokenizer:(GRMustacheTokenizer *)tokenizer didReadToken:(GRMusta
 				NSRange currentSectionOpeningTokenRange = currentSectionOpeningToken.range;
 				GRMustacheSectionElement *section = [GRMustacheSectionElement sectionElementWithName:currentSectionOpeningToken.content
 																							  string:[templateString substringWithRange:NSMakeRange(currentSectionOpeningTokenRange.location + currentSectionOpeningTokenRange.length, token.range.location - currentSectionOpeningTokenRange.location - currentSectionOpeningTokenRange.length)]
-																					  templateLoader:templateLoader
 																							inverted:currentSectionOpeningToken.type == GRMustacheTokenTypeInvertedSectionOpening
 																							elements:currentElements];
 				[sectionOpeningTokenStack removeLastObject];

diff --git a/Classes/GRMustacheSectionElement.m b/Classes/GRMustacheSectionElement.m
@@ -30,29 +30,26 @@
 @interface GRMustacheSectionElement()
 @property (nonatomic, retain) NSString *name;
 @property (nonatomic, retain) NSString *templateString;
-@property (nonatomic, retain) GRMustacheTemplateLoader *templateLoader;
 @property (nonatomic) BOOL inverted;
 @property (nonatomic, retain) NSArray *elems;
-- (id)initWithName:(NSString *)name string:(NSString *)templateString templateLoader:(GRMustacheTemplateLoader *)templateLoader inverted:(BOOL)inverted elements:(NSArray *)elems;
+- (id)initWithName:(NSString *)name string:(NSString *)templateString inverted:(BOOL)inverted elements:(NSArray *)elems;
 @end
 
 
 @implementation GRMustacheSectionElement
-@synthesize templateLoader;
 @synthesize templateString;
 @synthesize name;
 @synthesize inverted;
 @synthesize elems;
 
-+ (id)sectionElementWithName:(NSString *)name string:(NSString *)templateString templateLoader:(GRMustacheTemplateLoader *)templateLoader inverted:(BOOL)inverted elements:(NSArray *)elems {
-	return [[[self alloc] initWithName:name string:templateString templateLoader:templateLoader inverted:inverted elements:elems] autorelease];
++ (id)sectionElementWithName:(NSString *)name string:(NSString *)templateString inverted:(BOOL)inverted elements:(NSArray *)elems {
+	return [[[self alloc] initWithName:name string:templateString inverted:inverted elements:elems] autorelease];
 }
 
-- (id)initWithName:(NSString *)theName string:(NSString *)theTemplateString templateLoader:(GRMustacheTemplateLoader *)theTemplateLoader inverted:(BOOL)theInverted elements:(NSArray *)theElems {
+- (id)initWithName:(NSString *)theName string:(NSString *)theTemplateString inverted:(BOOL)theInverted elements:(NSArray *)theElems {
 	if (self = [self init]) {
 		self.name = theName;
 		self.templateString = theTemplateString;
-		self.templateLoader = theTemplateLoader;
 		self.inverted = theInverted;
 		self.elems = theElems;
 	}
@@ -135,7 +132,6 @@ - (NSString *)renderContext:(GRMustacheContext *)context {
 - (void)dealloc {
 	[name release];
 	[templateString release];
-	[templateLoader release];
 	[elems release];
 	[super dealloc];
 }

diff --git a/Classes/GRMustacheSectionElement_private.h b/Classes/GRMustacheSectionElement_private.h
@@ -24,15 +24,12 @@
 #import "GRMustacheElement_private.h"
 
 
-@class GRMustacheTemplateLoader;
-
 @interface GRMustacheSectionElement: NSObject<GRMustacheElement> {
 @private
 	NSString *name;
 	NSString *templateString;
-	GRMustacheTemplateLoader *templateLoader;
 	BOOL inverted;
 	NSArray *elems;
 }
-+ (id)sectionElementWithName:(NSString *)name string:(NSString *)templateString templateLoader:(GRMustacheTemplateLoader *)templateLoader inverted:(BOOL)inverted elements:(NSArray *)elems;
++ (id)sectionElementWithName:(NSString *)name string:(NSString *)templateString inverted:(BOOL)inverted elements:(NSArray *)elems;
 @end