Revision: 29823
http://sourceforge.net/p/bibdesk/svn/29823
Author: hofman
Date: 2025-11-16 16:36:49 +0000 (Sun, 16 Nov 2025)
Log Message:
-----------
use type
Modified Paths:
--------------
trunk/bibdesk/BDSKComplexString.h
trunk/bibdesk/BDSKComplexString.m
Modified: trunk/bibdesk/BDSKComplexString.h
===================================================================
--- trunk/bibdesk/BDSKComplexString.h 2025-11-16 15:56:34 UTC (rev 29822)
+++ trunk/bibdesk/BDSKComplexString.h 2025-11-16 16:36:49 UTC (rev 29823)
@@ -142,7 +142,7 @@
@param mask The search options to use in the comparison. These are
the same as for normal string compare methods.
@result -
*/
-- (NSComparisonResult)compareAsComplexString:(nullable NSString *)other
options:(NSUInteger)mask;
+- (NSComparisonResult)compareAsComplexString:(nullable NSString *)other
options:(NSStringCompareOptions)mask;
/*!
@method stringAsBibTeXString
@@ -174,7 +174,7 @@
@discussion When the receiver is not complex and target is complex always
returns NO.
@result (description)
*/
-- (BOOL)hasSubstring:(NSString *)target options:(NSUInteger)opts;
+- (BOOL)hasSubstring:(NSString *)target options:(NSStringCompareOptions)opts;
/*!
@method
stringByReplacingOccurrencesOfString:withString:options:replacements:
@@ -183,7 +183,7 @@
When the receiver is complex, only whole node matches are
replaced.
@result (description)
*/
-- (NSString *)stringByReplacingOccurrencesOfString:(NSString *)target
withString:(NSString *)replacement options:(NSUInteger)opts
replacements:(NSUInteger * _Nullable)number;
+- (NSString *)stringByReplacingOccurrencesOfString:(NSString *)target
withString:(NSString *)replacement options:(NSStringCompareOptions)opts
replacements:(NSUInteger * _Nullable)number;
- (NSString *)complexStringByAppendingString:(NSString *)string;
Modified: trunk/bibdesk/BDSKComplexString.m
===================================================================
--- trunk/bibdesk/BDSKComplexString.m 2025-11-16 15:56:34 UTC (rev 29822)
+++ trunk/bibdesk/BDSKComplexString.m 2025-11-16 16:36:49 UTC (rev 29823)
@@ -65,7 +65,7 @@
unsigned long long defaultModification;
}
- (instancetype)initWithNodes:(NSArray *)nodesArray
macroResolver:(BDSKMacroResolver *)aMacroResolver isComplex:(BOOL)aIsComplex
isInherited:(BOOL)aIsInherited;
-- (BDSKMacroResolver *)macroResolver;
+@property (nonatomic, nullable, readonly) BDSKMacroResolver *macroResolver;
@end
#pragma mark -
@@ -302,6 +302,8 @@
@implementation BDSKComplexString
+@synthesize macroResolver;
+
+ (void)initialize{
BDSKINITIALIZE;
@@ -440,7 +442,7 @@
return [self isEqualToString:other];
}
-- (NSComparisonResult)compareAsComplexString:(NSString *)other
options:(NSUInteger)mask{
+- (NSComparisonResult)compareAsComplexString:(NSString *)other
options:(NSStringCompareOptions)mask{
if ([self isComplex]) {
if (NO == [other isComplex])
return NSOrderedDescending;
@@ -496,7 +498,7 @@
return retStr;
}
-- (BOOL)hasSubstring:(NSString *)target options:(NSUInteger)opts{
+- (BOOL)hasSubstring:(NSString *)target options:(NSStringCompareOptions)opts{
if ([self isComplex] == NO)
return [[(BDSKStringNode *)[nodes firstObject] value]
hasSubstring:target options:opts];
@@ -531,7 +533,7 @@
return NO;
}
-- (NSString *)stringByReplacingOccurrencesOfString:(NSString *)target
withString:(NSString *)replacement options:(NSUInteger)opts
replacements:(NSUInteger *)number{
+- (NSString *)stringByReplacingOccurrencesOfString:(NSString *)target
withString:(NSString *)replacement options:(NSStringCompareOptions)opts
replacements:(NSUInteger *)number{
NSArray *targetNodes;
NSArray *replNodes;
NSMutableArray *newNodes;
@@ -711,10 +713,6 @@
return string;
}
-- (BDSKMacroResolver *)macroResolver{
- return macroResolver;
-}
-
@end
#pragma mark -
@@ -769,9 +767,7 @@
}
- (NSArray *)nodes{
- BDSKStringNode *node = [[BDSKStringNode alloc] initWithQuotedString:self];
- NSArray *nodes = @[node];
- return nodes;
+ return @[[[BDSKStringNode alloc] initWithQuotedString:self]];
}
+ (BOOL)isEmptyAsComplexString:(NSString *)aString{
@@ -789,7 +785,7 @@
return [self compareAsComplexString:other options:0];
}
-- (NSComparisonResult)compareAsComplexString:(NSString *)other
options:(NSUInteger)mask{
+- (NSComparisonResult)compareAsComplexString:(NSString *)other
options:(NSStringCompareOptions)mask{
if ([other isComplex])
return NSOrderedAscending;
return [self compare:other options:mask];
@@ -811,13 +807,13 @@
return [[BDSKComplexString alloc] initWithNodes:[self nodes]
macroResolver:nil isComplex:NO isInherited:YES];
}
-- (BOOL)hasSubstring:(NSString *)target options:(NSUInteger)opts{
+- (BOOL)hasSubstring:(NSString *)target options:(NSStringCompareOptions)opts{
if ([target isComplex])
return NO;
return [self rangeOfString:target options:opts].location != NSNotFound;
}
-- (NSString *)stringByReplacingOccurrencesOfString:(NSString *)target
withString:(NSString *)replacement options:(NSUInteger)opts
replacements:(NSUInteger *)number{
+- (NSString *)stringByReplacingOccurrencesOfString:(NSString *)target
withString:(NSString *)replacement options:(NSStringCompareOptions)opts
replacements:(NSUInteger *)number{
if ([target isComplex] || [self length] < [target length]) {// we need
this last check for anchored search
if (number) *number = 0;
return self;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
