Implement +[NSRegularExpression escapedPatternForString:] and -[NSString enumerateSubstringsInRange:options:usingBlock] #370
Conversation
Source/NSString.m
Outdated
| NSUInteger end; | ||
| // contains the index of the first character of the terminator of the line containing the end of aRange. | ||
| NSUInteger contentsEnd; | ||
| NSRange currentLocationRange = (NSRange){ |
There was a problem hiding this comment.
Why not use NSMakeRange(currentLocation, 0); ?
There was a problem hiding this comment.
Is this a stylistic choice? I find
(NSRange){
.location = currentLocation,
.length = 0,
}more readable, but I can change this if this is the standard style or if it causes problems with old compilers.
There was a problem hiding this comment.
As Richard wrote, changing this and a lot of other style difference would be great.
There was a problem hiding this comment.
@fredkiefer I see in a lot of other places in the code the use of (NSRange){location, length}. Is this also an issue, or are there cases in which the (NSRange){location, length} syntax is applicable?
|
Apple's Swift implementations:
See also CoreFoundation: |
|
I believe a15fa66 has solved many of the stylistic issues. |
| // However, valid words seem to be UBRK_WORD_NONE, and invalid words | ||
| // seem to be UBRK_WORD_NONE_LIMIT. | ||
| isValidSubstring = ruleStatus != UBRK_WORD_NONE_LIMIT; | ||
| NSLog(@"Status for position %d (%d): %d", (int)currentLocation, (int)ubrk_current(breakIterator), (int) ruleStatus); |
There was a problem hiding this comment.
Are you planing to leave these log statements in? In that case you should turn them into debug logs.
|
Apart from the NSLog statements this looks fine for me now. |
|
This has been outstanding for a while ... I'll tweak any minor remaining issues. |
|
Sorry, I've been very busy. You can remove the log statements; I don't think they'd be useful for anyone debugging other than me. |
No description provided.