Skip to content

Commit

Permalink
Added notEqualsString operation for "if" markers, for convenience.
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.cocoasourcecode.com/MGTemplateEngine@71 fad7f400-0e54-0410-bf1d-e368f886e4d4
  • Loading branch information
mattgemmell committed Aug 5, 2010
1 parent 6a5c972 commit 509005f
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion MGTemplateStandardMarkers.m
Expand Up @@ -389,7 +389,7 @@ - (NSObject *)markerEncountered:(NSString *)marker withArguments:(NSArray *)args
argTrue = (num1 <= num2);
} else if ([op isEqualToString:@"\%"]) {
argTrue = ((num1 % num2) > 0);
} else if ([op isEqualToString:@"equalsstring"]) {
} else if ([op isEqualToString:@"equalsstring"] || [op isEqualToString:@"notequalsstring"]) {
NSObject *firstVal = [engine resolveVariable:firstArg];
NSObject *secondVal = [engine resolveVariable:secondArg];
if (!firstVal) {
Expand All @@ -401,6 +401,9 @@ - (NSObject *)markerEncountered:(NSString *)marker withArguments:(NSArray *)args
if (firstVal && secondVal) {
//NSLog(@"%@ %@", [NSString stringWithFormat:@"%@", firstVal], [NSString stringWithFormat:@"%@", secondVal]);
argTrue = [[NSString stringWithFormat:@"%@", firstVal] isEqualToString:[NSString stringWithFormat:@"%@", secondVal]];
if ([op isEqualToString:@"notequalsstring"]) {
argTrue = !argTrue;
}
}
}
}
Expand Down

0 comments on commit 509005f

Please sign in to comment.