Revision: 16386
http://sourceforge.net/p/skim-app/code/16386
Author: hofman
Date: 2026-07-03 15:54:11 +0000 (Fri, 03 Jul 2026)
Log Message:
-----------
rename other match type to non empty match type
Modified Paths:
--------------
trunk/SKTemplateParser.m
trunk/SKTemplateTag.h
Modified: trunk/SKTemplateParser.m
===================================================================
--- trunk/SKTemplateParser.m 2026-06-17 09:02:19 UTC (rev 16385)
+++ trunk/SKTemplateParser.m 2026-07-03 15:54:11 UTC (rev 16386)
@@ -202,9 +202,9 @@
else if ([scanner scanString:CONDITION_TAG_NOT_CONTAIN intoString:NULL])
*matchType = SKTemplateTagMatchNotContain;
else
- *matchType = SKTemplateTagMatchOther;
+ *matchType = SKTemplateTagMatchNonEmpty;
- if (*matchType == SKTemplateTagMatchOther || [scanner
scanUpToString:CONDITION_TAG_CLOSE_DELIM intoString:argString] == NO)
+ if (*matchType == SKTemplateTagMatchNonEmpty || [scanner
scanUpToString:CONDITION_TAG_CLOSE_DELIM intoString:argString] == NO)
*argString = @"";
return [scanner scanString:CONDITION_TAG_CLOSE_DELIM intoString:NULL];
@@ -402,7 +402,7 @@
} else {
NSString *matchString = @"";
- SKTemplateTagMatchType matchType = SKTemplateTagMatchOther;
+ SKTemplateTagMatchType matchType = SKTemplateTagMatchNonEmpty;
if (scanConditionTagMatchTypeAndString(scanner, &matchType,
&matchString)) {
@@ -419,7 +419,7 @@
subTemplates = [[NSMutableArray alloc] init];
matchStrings = [[NSMutableArray alloc]
initWithObjects:matchString, nil];
- if (matchType != SKTemplateTagMatchOther) {
+ if (matchType != SKTemplateTagMatchNonEmpty) {
altTag = compareConditionTagWithKeyPath(keyPath,
matchType);
while (findAltConditionTag(subTemplate, altTag,
&matchString, &altTagRange)) {
[subTemplates addObject:[subTemplate
substringToIndex:altTagRange.location]];
@@ -636,7 +636,7 @@
} else {
NSString *matchString = @"";
- SKTemplateTagMatchType matchType = SKTemplateTagMatchOther;
+ SKTemplateTagMatchType matchType = SKTemplateTagMatchNonEmpty;
if (scanConditionTagMatchTypeAndString(scanner, &matchType,
&matchString)) {
@@ -656,7 +656,7 @@
subTemplates = [[NSMutableArray alloc] init];
matchStrings = [[NSMutableArray alloc]
initWithObjects:matchString, nil];
- if (matchType != SKTemplateTagMatchOther) {
+ if (matchType != SKTemplateTagMatchNonEmpty) {
altTag = compareConditionTagWithKeyPath(keyPath,
matchType);
while (findAltConditionTag([subTemplate string],
altTag, &matchString, &altTagRange)) {
[subTemplates addObject:[subTemplate
attributedSubstringFromRange:NSMakeRange(0, altTagRange.location)]];
Modified: trunk/SKTemplateTag.h
===================================================================
--- trunk/SKTemplateTag.h 2026-06-17 09:02:19 UTC (rev 16385)
+++ trunk/SKTemplateTag.h 2026-07-03 15:54:11 UTC (rev 16386)
@@ -48,7 +48,7 @@
};
typedef NS_ENUM(NSInteger, SKTemplateTagMatchType) {
- SKTemplateTagMatchOther,
+ SKTemplateTagMatchNonEmpty,
SKTemplateTagMatchEqual,
SKTemplateTagMatchContain,
SKTemplateTagMatchSmaller,
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
