diff between appledoc/GRMustache v1.1.3 and GRMustache v1.1.3

grmustache.diff

diff GRMustache/GRBoolean.m /Users/stramer/src/GRMustache/Classes/GRBoolean.m
53c53
< - (oneway void)release {
---
> - (void)release {
102c102
< - (oneway void)release  {
---
> - (void)release {
diff GRMustache/GRMustacheBundleTemplateLoader.m /Users/stramer/src/GRMustache/Classes/GRMustacheBundleTemplateLoader.m
29c29
< 	if ((self = [self initWithExtension:ext encoding:encoding])) {
---
> 	if (self = [self initWithExtension:ext encoding:encoding]) {
diff GRMustache/GRMustacheCompiler.m /Users/stramer/src/GRMustache/Classes/GRMustacheCompiler.m
41c41
< - (NSArray *)parseString:(NSString *)theTemplateString withTokenProducer:(id<GRMustacheTokenProducer>)tokenProducer templateLoader:(GRMustacheTemplateLoader *)theTemplateLoader templateId:(id)theTemplateId error:(NSError **)outError {
---
> - (NSArray *)parseString:(NSString *)theTemplateString templateLoader:(GRMustacheTemplateLoader *)theTemplateLoader templateId:(id)theTemplateId error:(NSError **)outError {
51c51,54
< 	[tokenProducer parseTemplateString:templateString forTokenConsumer:self];
---
> 	GRMustacheTokenizer *tokenizer = [[GRMustacheTokenizer alloc] init];
> 	tokenizer.delegate = self;
> 	[tokenizer parseTemplateString:templateString];
> 	[tokenizer release];
77c80
< #pragma mark GRMustacheTokenConsumer
---
> #pragma mark GRMustacheTokenizerDelegate
79c82
< - (BOOL)tokenProducer:(id<GRMustacheTokenProducer>)tokenProducer shouldContinueParsingAfterReadingToken:(GRMustacheToken *)token {
---
> - (BOOL)templateTokenizer:(GRMustacheTokenizer *)tokenizer didReadToken:(GRMustacheToken *)token {
109a113
> 																					  templateLoader:templateLoader
150,153c154
< - (void)tokenProducerDidStart:(id<GRMustacheTokenProducer>)tokenProducer {
< }
< 
< - (void)tokenProducerDidFinish:(id<GRMustacheTokenProducer>)tokenProducer withError:(NSError *)theError {
---
> - (void)templateTokenizerDidFinish:(GRMustacheTokenizer *)tokenizer withError:(NSError *)theError {
157,158d157
< #pragma mark Private
< 
161c160
< 	[userInfo setObject:[NSString stringWithFormat:@"Parse error at line %ld: %@", line, description]
---
> 	[userInfo setObject:[NSString stringWithFormat:@"Parse error at line %d: %@", line, description]
diff GRMustache/GRMustacheCompiler_private.h /Users/stramer/src/GRMustache/Classes/GRMustacheCompiler_private.h
24c24
< #import "GRMustacheToken_private.h"
---
> #import "GRMustacheTokenizer_private.h"
29c29
< @interface GRMustacheCompiler : NSObject<GRMustacheTokenConsumer> {
---
> @interface GRMustacheCompiler : NSObject<GRMustacheTokenizerDelegate> {
40c40
< - (NSArray *)parseString:(NSString *)templateString withTokenProducer:(id<GRMustacheTokenProducer>)tokenProducer templateLoader:(GRMustacheTemplateLoader *)templateLoader templateId:(id)templateId error:(NSError **)outError;
---
> - (NSArray *)parseString:(NSString *)templateString templateLoader:(GRMustacheTemplateLoader *)templateLoader templateId:(id)templateId error:(NSError **)outError;
diff GRMustache/GRMustacheContext.m /Users/stramer/src/GRMustache/Classes/GRMustacheContext.m
69c69
< 	NSMutableDictionary *propertyNames = [classes objectForKey:NSStringFromClass(class)];
---
> 	NSMutableDictionary *propertyNames = [classes objectForKey:class];
72c72
< 		[classes setObject:propertyNames forKey:NSStringFromClass(class)];
---
> 		[classes setObject:propertyNames forKey:class];
114c114
< 	if ((self = [self init])) {
---
> 	if (self = [self init]) {
diff GRMustache/GRMustacheDirectoryTemplateLoader.m /Users/stramer/src/GRMustache/Classes/GRMustacheDirectoryTemplateLoader.m
29c29
< 	if ((self = [super initWithExtension:ext encoding:encoding])) {
---
> 	if (self = [super initWithExtension:ext encoding:encoding]) {
Only in GRMustache: GRMustacheElement.h
Only in GRMustache: GRMustacheElement.m
diff GRMustache/GRMustacheLambda.m /Users/stramer/src/GRMustache/Classes/GRMustacheLambda.m
39c39
< 	if ((self = [self init])) {
---
> 	if (self = [self init]) {
diff GRMustache/GRMustacheSectionElement.m /Users/stramer/src/GRMustache/Classes/GRMustacheSectionElement.m
32a33
> @property (nonatomic, retain) GRMustacheTemplateLoader *templateLoader;
35c36
< - (id)initWithName:(NSString *)name string:(NSString *)templateString inverted:(BOOL)inverted elements:(NSArray *)elems;
---
> - (id)initWithName:(NSString *)name string:(NSString *)templateString templateLoader:(GRMustacheTemplateLoader *)templateLoader inverted:(BOOL)inverted elements:(NSArray *)elems;
39a41
> @synthesize templateLoader;
45,46c47,48
< + (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)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];
49,50c51,52
< - (id)initWithName:(NSString *)theName string:(NSString *)theTemplateString inverted:(BOOL)theInverted elements:(NSArray *)theElems {
< 	if ((self = [self init])) {
---
> - (id)initWithName:(NSString *)theName string:(NSString *)theTemplateString templateLoader:(GRMustacheTemplateLoader *)theTemplateLoader inverted:(BOOL)theInverted elements:(NSArray *)theElems {
> 	if (self = [self init]) {
52a55
> 		self.templateLoader = theTemplateLoader;
94,110c97,102
<                 [value enumerateObjectsUsingBlock:^(id object, NSUInteger index, BOOL *stop) {
<                     GRMustacheContext *innerContext = [GRMustacheContext contextWithObject:object parent:context];
<                     for (NSObject<GRMustacheElement> *elem in elems) {
<                         NSString *rendered = [elem renderContext:innerContext];
<                         
<                         // check for optional enumeration delimiter
<                         if ([rendered hasPrefix: @"[["] && [rendered hasSuffix: @"]]"]) {
<                             if (index < ([value count] - 1)) {
<                                 rendered = [rendered substringWithRange: NSMakeRange(2, rendered.length-4)];
<                             } else {
<                                 rendered = nil;
<                             }
<                         }
<                         
<                         if (rendered != nil) [buffer appendString: rendered];
<                     }
<                 }];
---
> 				for (id object in value) {
> 					GRMustacheContext *innerContext = [GRMustacheContext contextWithObject:object parent:context];
> 					for (NSObject<GRMustacheElement> *elem in elems) {
> 						[buffer appendString:[elem renderContext:innerContext]];
> 					}
> 				}
145a138
> 	[templateLoader release];
diff GRMustache/GRMustacheSectionElement_private.h /Users/stramer/src/GRMustache/Classes/GRMustacheSectionElement_private.h
26a27,28
> @class GRMustacheTemplateLoader;
> 
30a33
> 	GRMustacheTemplateLoader *templateLoader;
34c37
< + (id)sectionElementWithName:(NSString *)name string:(NSString *)templateString inverted:(BOOL)inverted elements:(NSArray *)elems;
---
> + (id)sectionElementWithName:(NSString *)name string:(NSString *)templateString templateLoader:(GRMustacheTemplateLoader *)templateLoader inverted:(BOOL)inverted elements:(NSArray *)elems;
diff GRMustache/GRMustacheTemplate.m /Users/stramer/src/GRMustache/Classes/GRMustacheTemplate.m
29d28
< #import "GRMustacheTokenizer_private.h"
145,147c144
< 
<     self = [super init];
< 	if (self) {
---
> 	if (self == [self init]) {
161d157
< 	GRMustacheTokenizer *tokenProducer = [[GRMustacheTokenizer alloc] init];
164d159
< 							withTokenProducer:tokenProducer
169,170d163
< 	[tokenProducer release];
< 
diff GRMustache/GRMustacheTemplateLoader.m /Users/stramer/src/GRMustache/Classes/GRMustacheTemplateLoader.m
69c69
< 	if ((self = [self init])) {
---
> 	if (self = [self init]) {
diff GRMustache/GRMustacheTextElement.m /Users/stramer/src/GRMustache/Classes/GRMustacheTextElement.m
40c40
< 	if ((self = [self init])) {
---
> 	if (self = [self init]) {
Only in GRMustache: GRMustacheToken.m
Only in GRMustache: GRMustacheToken_private.h
diff GRMustache/GRMustacheTokenizer.m /Users/stramer/src/GRMustache/Classes/GRMustacheTokenizer.m
26a27,60
> @interface GRMustacheToken()
> @property (nonatomic, retain) NSString *content;
> + (id)tokenWithType:(GRMustacheTokenType)type content:(NSString *)content line:(NSUInteger)line range:(NSRange)range;
> - (id)initWithType:(GRMustacheTokenType)type content:(NSString *)content line:(NSUInteger)line range:(NSRange)range;
> @end
> 
> @implementation GRMustacheToken
> @synthesize type;
> @synthesize content;
> @synthesize line;
> @synthesize range;
> 
> + (id)tokenWithType:(GRMustacheTokenType)type content:(NSString *)content line:(NSUInteger)line range:(NSRange)range {
> 	return [[[self alloc] initWithType:type content:content line:line range:range] autorelease];
> }
> 
> - (id)initWithType:(GRMustacheTokenType)theType content:(NSString *)theContent line:(NSUInteger)theLine range:(NSRange)theRange {
> 	if (self = [self init]) {
> 		type = theType;
> 		content = [theContent retain];
> 		line = theLine;
> 		range = theRange;
> 	}
> 	return self;
> }
> 
> - (void)dealloc {
> 	[content release];
> 	[super dealloc];
> }
> 
> @end
> 
> 
30,31c64
< - (BOOL)shouldContinueParsingAfterReadingToken:(GRMustacheToken *)token;
< - (void)didStart;
---
> - (BOOL)didReadToken:(GRMustacheToken *)token;
37a71
> @synthesize delegate;
42c76
< 	if ((self = [super init])) {
---
> 	if (self = [super init]) {
55c89
< - (void)parseTemplateString:(NSString *)templateString forTokenConsumer:(id<GRMustacheTokenConsumer>)theTokenConsumer {
---
> - (void)parseTemplateString:(NSString *)templateString {
65,67d98
< 	tokenConsumer = theTokenConsumer;
< 	[self didStart];
< 	
75c106
< 				if (![self shouldContinueParsingAfterReadingToken:[GRMustacheToken tokenWithType:GRMustacheTokenTypeText
---
> 				if (![self didReadToken:[GRMustacheToken tokenWithType:GRMustacheTokenTypeText
88c119
< 			if (![self shouldContinueParsingAfterReadingToken:[GRMustacheToken tokenWithType:GRMustacheTokenTypeText
---
> 			if (![self didReadToken:[GRMustacheToken tokenWithType:GRMustacheTokenTypeText
133c164
< 				if (![self shouldContinueParsingAfterReadingToken:[GRMustacheToken tokenWithType:GRMustacheTokenTypeComment
---
> 				if (![self didReadToken:[GRMustacheToken tokenWithType:GRMustacheTokenTypeComment
147c178
< 				if (![self shouldContinueParsingAfterReadingToken:[GRMustacheToken tokenWithType:GRMustacheTokenTypeSectionOpening
---
> 				if (![self didReadToken:[GRMustacheToken tokenWithType:GRMustacheTokenTypeSectionOpening
161c192
< 				if (![self shouldContinueParsingAfterReadingToken:[GRMustacheToken tokenWithType:GRMustacheTokenTypeInvertedSectionOpening
---
> 				if (![self didReadToken:[GRMustacheToken tokenWithType:GRMustacheTokenTypeInvertedSectionOpening
175c206
< 				if (![self shouldContinueParsingAfterReadingToken:[GRMustacheToken tokenWithType:GRMustacheTokenTypeSectionClosing
---
> 				if (![self didReadToken:[GRMustacheToken tokenWithType:GRMustacheTokenTypeSectionClosing
189c220
< 				if (![self shouldContinueParsingAfterReadingToken:[GRMustacheToken tokenWithType:GRMustacheTokenTypePartial
---
> 				if (![self didReadToken:[GRMustacheToken tokenWithType:GRMustacheTokenTypePartial
222c253
< 				if (![self shouldContinueParsingAfterReadingToken:[GRMustacheToken tokenWithType:GRMustacheTokenTypeSetDelimiter
---
> 				if (![self didReadToken:[GRMustacheToken tokenWithType:GRMustacheTokenTypeSetDelimiter
236c267
< 				if (![self shouldContinueParsingAfterReadingToken:[GRMustacheToken tokenWithType:GRMustacheTokenTypeUnescapedVariable
---
> 				if (![self didReadToken:[GRMustacheToken tokenWithType:GRMustacheTokenTypeUnescapedVariable
250c281
< 				if (![self shouldContinueParsingAfterReadingToken:[GRMustacheToken tokenWithType:GRMustacheTokenTypeUnescapedVariable
---
> 				if (![self didReadToken:[GRMustacheToken tokenWithType:GRMustacheTokenTypeUnescapedVariable
264c295
< 				if (![self shouldContinueParsingAfterReadingToken:[GRMustacheToken tokenWithType:GRMustacheTokenTypeEscapedVariable
---
> 				if (![self didReadToken:[GRMustacheToken tokenWithType:GRMustacheTokenTypeEscapedVariable
279,281c310,312
< - (BOOL)shouldContinueParsingAfterReadingToken:(GRMustacheToken *)token {
< 	if (tokenConsumer) {
< 		return [tokenConsumer tokenProducer:self shouldContinueParsingAfterReadingToken:token];
---
> - (BOOL)didReadToken:(GRMustacheToken *)token {
> 	if (delegate) {
> 		return [delegate templateTokenizer:self didReadToken:token];
286,291d316
< - (void)didStart {
< 	if (tokenConsumer) {
< 		[tokenConsumer tokenProducerDidStart:self];
< 	}
< }
< 
293,294c318,319
< 	if (tokenConsumer) {
< 		[tokenConsumer tokenProducerDidFinish:self withError:nil];
---
> 	if (delegate) {
> 		[delegate templateTokenizerDidFinish:self withError:nil];
299c324
< 	if (tokenConsumer) {
---
> 	if (delegate) {
301c326
< 		[userInfo setObject:[NSString stringWithFormat:@"Parse error at line %ld: %@", line, description]
---
> 		[userInfo setObject:[NSString stringWithFormat:@"Parse error at line %d: %@", line, description]
305,307c330,332
< 		[tokenConsumer tokenProducerDidFinish:self withError:[NSError errorWithDomain:GRMustacheErrorDomain
< 																					 code:GRMustacheErrorCodeParseError
< 																				 userInfo:userInfo]];
---
> 		[delegate templateTokenizerDidFinish:self withError:[NSError errorWithDomain:GRMustacheErrorDomain
> 																				code:GRMustacheErrorCodeParseError
> 																			userInfo:userInfo]];
diff GRMustache/GRMustacheTokenizer_private.h /Users/stramer/src/GRMustache/Classes/GRMustacheTokenizer_private.h
24d23
< #import "GRMustacheToken_private.h"
27c26,58
< @interface GRMustacheTokenizer : NSObject<GRMustacheTokenProducer> {
---
> typedef enum {
> 	GRMustacheTokenTypeText,
> 	GRMustacheTokenTypeComment,
> 	GRMustacheTokenTypeEscapedVariable,
> 	GRMustacheTokenTypeUnescapedVariable,
> 	GRMustacheTokenTypeSectionOpening,
> 	GRMustacheTokenTypeInvertedSectionOpening,
> 	GRMustacheTokenTypeSectionClosing,
> 	GRMustacheTokenTypePartial,
> 	GRMustacheTokenTypeSetDelimiter,
> } GRMustacheTokenType;
> 
> @interface GRMustacheToken : NSObject {
> 	GRMustacheTokenType type;
> 	NSString *content;
> 	NSUInteger line;
> 	NSRange range;
> }
> @property (nonatomic, readonly) GRMustacheTokenType type;
> @property (nonatomic, readonly, retain) NSString *content;
> @property (nonatomic, readonly) NSUInteger line;
> @property (nonatomic, readonly) NSRange range;
> @end
> 
> @class GRMustacheTokenizer;
> 
> @protocol GRMustacheTokenizerDelegate
> @required
> - (BOOL)templateTokenizer:(GRMustacheTokenizer *)tokenizer didReadToken:(GRMustacheToken *)token;
> - (void)templateTokenizerDidFinish:(GRMustacheTokenizer *)tokenizer withError:(NSError *)error;
> @end
> 
> @interface GRMustacheTokenizer : NSObject {
29c60
< 	id<GRMustacheTokenConsumer> tokenConsumer;
---
> 	id<GRMustacheTokenizerDelegate> delegate;
32a64,65
> @property (nonatomic, assign) id<GRMustacheTokenizerDelegate> delegate;
> - (void)parseTemplateString:(NSString *)templateString;
diff GRMustache/GRMustacheVariableElement.m /Users/stramer/src/GRMustache/Classes/GRMustacheVariableElement.m
44c44
< 	if ((self = [self init])) {
---
> 	if (self = [self init]) {