Revision: 5050
http://skim-app.svn.sourceforge.net/skim-app/?rev=5050&view=rev
Author: hofman
Date: 2008-12-12 10:50:28 +0000 (Fri, 12 Dec 2008)
Log Message:
-----------
shorten code
Modified Paths:
--------------
trunk/SKTemplateParser.m
Modified: trunk/SKTemplateParser.m
===================================================================
--- trunk/SKTemplateParser.m 2008-12-11 18:13:45 UTC (rev 5049)
+++ trunk/SKTemplateParser.m 2008-12-12 10:50:28 UTC (rev 5050)
@@ -323,20 +323,18 @@
NSString *matchString = @"";
SKTemplateTagMatchType matchType = SKTemplateTagMatchOther;
- if ([scanner scanString:CONDITION_TAG_EQUAL intoString:nil]) {
- [scanner scanUpToString:CONDITION_TAG_CLOSE_DELIM
intoString:&matchString];
+ if ([scanner scanString:CONDITION_TAG_EQUAL intoString:nil])
matchType = SKTemplateTagMatchEqual;
- } else if ([scanner scanString:CONDITION_TAG_CONTAIN
intoString:nil]) {
- [scanner scanUpToString:CONDITION_TAG_CLOSE_DELIM
intoString:&matchString];
+ else if ([scanner scanString:CONDITION_TAG_CONTAIN
intoString:nil])
matchType = SKTemplateTagMatchContain;
- } else if ([scanner scanString:CONDITION_TAG_SMALLER_OR_EQUAL
intoString:nil]) {
- [scanner scanUpToString:CONDITION_TAG_CLOSE_DELIM
intoString:&matchString];
+ else if ([scanner scanString:CONDITION_TAG_SMALLER_OR_EQUAL
intoString:nil])
matchType = SKTemplateTagMatchSmallerOrEqual;
- } else if ([scanner scanString:CONDITION_TAG_SMALLER
intoString:nil]) {
- [scanner scanUpToString:CONDITION_TAG_CLOSE_DELIM
intoString:&matchString];
+ else if ([scanner scanString:CONDITION_TAG_SMALLER
intoString:nil])
matchType = SKTemplateTagMatchSmaller;
- }
+ if (matchType != SKTemplateTagMatchOther)
+ [scanner scanUpToString:CONDITION_TAG_CLOSE_DELIM
intoString:&matchString];
+
if ([scanner scanString:CONDITION_TAG_CLOSE_DELIM
intoString:nil]) {
NSMutableArray *subTemplates, *matchStrings;
@@ -582,20 +580,18 @@
NSString *matchString = @"";
SKTemplateTagMatchType matchType = SKTemplateTagMatchOther;
- if ([scanner scanString:CONDITION_TAG_EQUAL intoString:nil]) {
- [scanner scanUpToString:CONDITION_TAG_CLOSE_DELIM
intoString:&matchString];
+ if ([scanner scanString:CONDITION_TAG_EQUAL intoString:nil])
matchType = SKTemplateTagMatchEqual;
- } else if ([scanner scanString:CONDITION_TAG_CONTAIN
intoString:nil]) {
- [scanner scanUpToString:CONDITION_TAG_CLOSE_DELIM
intoString:&matchString];
+ else if ([scanner scanString:CONDITION_TAG_CONTAIN
intoString:nil])
matchType = SKTemplateTagMatchContain;
- } else if ([scanner scanString:CONDITION_TAG_SMALLER_OR_EQUAL
intoString:nil]) {
- [scanner scanUpToString:CONDITION_TAG_CLOSE_DELIM
intoString:&matchString];
+ else if ([scanner scanString:CONDITION_TAG_SMALLER_OR_EQUAL
intoString:nil])
matchType = SKTemplateTagMatchSmallerOrEqual;
- } else if ([scanner scanString:CONDITION_TAG_SMALLER
intoString:nil]) {
- [scanner scanUpToString:CONDITION_TAG_CLOSE_DELIM
intoString:&matchString];
+ else if ([scanner scanString:CONDITION_TAG_SMALLER
intoString:nil])
matchType = SKTemplateTagMatchSmaller;
- }
+ if (matchType != SKTemplateTagMatchOther)
+ [scanner scanUpToString:CONDITION_TAG_CLOSE_DELIM
intoString:&matchString];
+
if ([scanner scanString:CONDITION_TAG_CLOSE_DELIM
intoString:nil]) {
NSMutableArray *subTemplates, *matchStrings;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada.
The future of the web can't happen without you. Join us at MIX09 to help
pave the way to the Next Web now. Learn more and register at
http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
