LLVM3 compatibility

groue · Jun 8, 2011 · d21b6c6 · d21b6c6
1 parent f19ba84
commit d21b6c6
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 20 deletions.
diff --git a/Classes/GRBoolean.m b/Classes/GRBoolean.m
@@ -54,7 +54,7 @@ - (NSUInteger)retainCount {
 	return NSUIntegerMax;  //denotes an object that cannot be released
 }
 
-- (void)release {
+- (oneway void)release {
 	//do nothing
 }
 
@@ -107,7 +107,7 @@ - (NSUInteger)retainCount {
 	return NSUIntegerMax;  //denotes an object that cannot be released
 }
 
-- (void)release {
+- (oneway void)release {
 	//do nothing
 }
 

diff --git a/Classes/GRMustacheBundleTemplateLoader.m b/Classes/GRMustacheBundleTemplateLoader.m
@@ -40,7 +40,7 @@ - (id)templateIdForTemplateNamed:(NSString *)name relativeToTemplateId:(id)baseT
 }
 
 - (NSString *)templateStringForTemplateId:(id)templateId error:(NSError **)outError {
-	NSAssert([templateId isKindOfClass:[NSString class]], nil);
+	NSAssert([templateId isKindOfClass:[NSString class]], @"");
 	return [NSString stringWithContentsOfFile:(NSString*)templateId
 									 encoding:self.encoding
 										error:outError];

diff --git a/Classes/GRMustacheDirectoryTemplateLoader.m b/Classes/GRMustacheDirectoryTemplateLoader.m
@@ -34,7 +34,7 @@ - (id)initWithURL:(NSURL *)theURL extension:(NSString *)ext encoding:(NSStringEn
 
 - (id)templateIdForTemplateNamed:(NSString *)name relativeToTemplateId:(id)baseTemplateId {
 	if (baseTemplateId) {
-		NSAssert([baseTemplateId isKindOfClass:[NSURL class]], nil);
+		NSAssert([baseTemplateId isKindOfClass:[NSURL class]], @"");
 		if (self.extension.length == 0) {
 			return [[NSURL URLWithString:name relativeToURL:(NSURL *)baseTemplateId] URLByStandardizingPath];
 		}
@@ -47,7 +47,7 @@ - (id)templateIdForTemplateNamed:(NSString *)name relativeToTemplateId:(id)baseT
 }
 
 - (NSString *)templateStringForTemplateId:(id)templateId error:(NSError **)outError {
-	NSAssert([templateId isKindOfClass:[NSURL class]], nil);
+	NSAssert([templateId isKindOfClass:[NSURL class]], @"");
 	return [NSString stringWithContentsOfURL:(NSURL*)templateId
 									encoding:self.encoding
 									   error:outError];
@@ -85,7 +85,7 @@ - (id)initWithPath:(NSString *)thePath extension:(NSString *)ext encoding:(NSStr
 
 - (id)templateIdForTemplateNamed:(NSString *)name relativeToTemplateId:(id)baseTemplateId {
 	if (baseTemplateId) {
-		NSAssert([baseTemplateId isKindOfClass:[NSString class]], nil);
+		NSAssert([baseTemplateId isKindOfClass:[NSString class]], @"");
 		NSString *basePath = [(NSString *)baseTemplateId stringByDeletingLastPathComponent];
 		if (self.extension.length == 0) {
 			return [[basePath stringByAppendingPathComponent:name] stringByStandardizingPath];
@@ -99,7 +99,7 @@ - (id)templateIdForTemplateNamed:(NSString *)name relativeToTemplateId:(id)baseT
 }
 
 - (NSString *)templateStringForTemplateId:(id)templateId error:(NSError **)outError {
-	NSAssert([templateId isKindOfClass:[NSString class]], nil);
+	NSAssert([templateId isKindOfClass:[NSString class]], @"");
 	return [NSString stringWithContentsOfFile:(NSString*)templateId
 									 encoding:self.encoding
 										error:outError];

diff --git a/Classes/GRMustacheLambda.m b/Classes/GRMustacheLambda.m
@@ -99,11 +99,6 @@ - (void)dealloc {
 @end
 
 
-id GRMustacheBlockHelperMake(NSString *(^block)(GRMustacheSection* section, id context)) {
-	return [GRMustacheBlockHelper helperWithBlock:block];
-}
-
-
 // =================== DEPRECATED STUFF BELOW ===================
 
 

diff --git a/Classes/GRMustacheRendering.m b/Classes/GRMustacheRendering.m
@@ -76,13 +76,13 @@ - (NSString *)renderContext:(GRMustacheContext *)context {
 
 		case GRMustacheObjectKindLambda:
 			if (!inverted) {
-                result = [[(id<GRMustacheHelper>)value renderObject:context withSection:self] retain];
+                result = [[(id<GRMustacheHelper>)value renderObject:context withSection:self] mutableCopy];
             }
 			break;
 
 		default:
 			// should not be here
-			NSAssert(NO, nil);
+			NSAssert(NO, @"");
 	}
     [pool drain];
     if (!result) {

diff --git a/Classes/GRMustacheTemplate.m b/Classes/GRMustacheTemplate.m
@@ -44,14 +44,14 @@ + (id)parseString:(NSString *)templateString error:(NSError **)outError {
 #if !TARGET_OS_IPHONE || __IPHONE_OS_VERSION_MAX_ALLOWED >= 40000
 + (id)parseContentsOfURL:(NSURL *)url error:(NSError **)outError {
 	id loader = [GRMustacheTemplateLoader templateLoaderWithBaseURL:[url URLByDeletingLastPathComponent] extension:[url pathExtension]];
-	NSAssert([loader isKindOfClass:[GRMustacheDirectoryURLTemplateLoader class]], nil);
+	NSAssert([loader isKindOfClass:[GRMustacheDirectoryURLTemplateLoader class]], @"");
 	return [(GRMustacheDirectoryURLTemplateLoader *)loader parseContentsOfURL:url error:outError];
 }
 #endif
 
 + (id)parseContentsOfFile:(NSString *)path error:(NSError **)outError {
 	id loader = [GRMustacheTemplateLoader templateLoaderWithDirectory:[path stringByDeletingLastPathComponent] extension:[path pathExtension]];
-	NSAssert([loader isKindOfClass:[GRMustacheDirectoryPathTemplateLoader class]], nil);
+	NSAssert([loader isKindOfClass:[GRMustacheDirectoryPathTemplateLoader class]], @"");
 	return [(GRMustacheDirectoryPathTemplateLoader *)loader parseContentsOfFile:path error:outError];
 }
 

diff --git a/Classes/GRMustacheTemplateParser.m b/Classes/GRMustacheTemplateParser.m
@@ -151,7 +151,7 @@ - (BOOL)tokenizer:(GRMustacheTokenizer *)tokenizer shouldContinueAfterParsingTok
 			break;
 
 		default:
-			NSAssert(NO, nil);
+			NSAssert(NO, @"");
 			break;
 
 	}

diff --git a/Tests/Private/GRMustacheContextTest.m b/Tests/Private/GRMustacheContextTest.m
@@ -68,7 +68,7 @@ @implementation ThrowingObject
 
 - (id)valueForKey:(NSString *)key {
 	if ([key isEqualToString:@"NonNSUndefinedKeyException"]) {
-		NSAssert(NO, nil);
+		NSAssert(NO, @"");
 	}
 	if ([key isEqualToString:@"OtherNSUndefinedKeyException"]) {
 		return [@"" valueForKey:@"foo"];

diff --git a/Tests/syck/GSNSDataExtensions.m b/Tests/syck/GSNSDataExtensions.m
@@ -197,7 +197,7 @@ - (NSString *)base64EncodingWithLineLength:(unsigned int)inLineLength
     unsigned long		ixtext;
     unsigned long		lengthData;
     long				ctremaining;
-    unsigned char		inbuf [4], outbuf [3];
+    unsigned char		inbuf [4], outbuf [4];
     short				i;
     short				charsonline = 0, ctcopy;
     unsigned long		ix;

diff --git a/Tests/v1.3/GRMustacheSelectorHelper_v1_3_Test.m b/Tests/v1.3/GRMustacheSelectorHelper_v1_3_Test.m
@@ -45,7 +45,7 @@ @implementation GRMustacheSelectorHelper_v1_3_Test
 
 - (void)testHelperInstanceMethod {
 	NSString *templateString = @"{{#bold}}text{{/bold}}";
-	NSDictionary *context = [[[GRMustacheSelectorHelper_v1_3_TestContext alloc] init] autorelease];
+	id context = [[[GRMustacheSelectorHelper_v1_3_TestContext alloc] init] autorelease];
 	NSString *result = [GRMustacheTemplate renderObject:context fromString:templateString error:nil];
 	STAssertEqualObjects(result, @"<b>text</b>", nil);
 }