gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-30 08:21:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Mimic OSX handling of what appears to be an ICU bug

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@37793 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2014-04-12 04:38:13 +00:00
parent be29047e59
commit 3df1043cea
5 changed files with 70 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

35
Source/NSRegularExpression.m
View file

@ -300,6 +300,11 @@ prepareResult(NSRegularExpression *regex,
NSUInteger start = uregex_start(r, i, s);
NSUInteger end = uregex_end(r, i, s);
if (end < start)
{
flags |= NSMatchingInternalError;
end = start = NSNotFound;
}
ranges[i] = NSMakeRange(start, end-start);
}
if (uregex_hitEnd(r, s))
@ -344,7 +349,8 @@ prepareResult(NSRegularExpression *regex,
NSTextCheckingResult *result;
flags = prepareResult(self, r, ranges, groups, &s);
result = [NSTextCheckingResult
result = (flags & NSMatchingInternalError) ? nil
: [NSTextCheckingResult
regularExpressionCheckingResultWithRanges: ranges
count: groups
regularExpression: self];
@ -359,7 +365,8 @@ prepareResult(NSRegularExpression *regex,
NSTextCheckingResult *result;
flags = prepareResult(self, r, ranges, groups, &s);
result = [NSTextCheckingResult
result = (flags & NSMatchingInternalError) ? nil
: [NSTextCheckingResult
regularExpressionCheckingResultWithRanges: ranges
count: groups
regularExpression: self];
@ -403,7 +410,8 @@ prepareResult(NSRegularExpression *regex,
NSTextCheckingResult *result;
flags = prepareResult(self, r, ranges, groups, &s);
result = [NSTextCheckingResult
result = (flags & NSMatchingInternalError) ? nil
: [NSTextCheckingResult
regularExpressionCheckingResultWithRanges: ranges
count: groups
regularExpression: self];
@ -418,7 +426,8 @@ prepareResult(NSRegularExpression *regex,
NSTextCheckingResult *result;
flags = prepareResult(self, r, ranges, groups, &s);
result = [NSTextCheckingResult
result = (flags & NSMatchingInternalError) ? nil
: [NSTextCheckingResult
regularExpressionCheckingResultWithRanges: ranges
count: groups
regularExpression: self];
@ -603,8 +612,11 @@ prepareResult(NSRegularExpression *regex,
FAKE_BLOCK_HACK(result,
{
prepareResult(self, r, ranges, groups, &s);
result = [NSTextCheckingResult
uint32_t flags;
flags = prepareResult(self, r, ranges, groups, &s);
result = (flags & NSMatchingInternalError) ? nil
: [NSTextCheckingResult
regularExpressionCheckingResultWithRanges: ranges
count: groups
regularExpression: self];
@ -624,13 +636,18 @@ prepareResult(NSRegularExpression *regex,
FAKE_BLOCK_HACK(array,
{
NSTextCheckingResult *result = NULL;
uint32_t flags;
prepareResult(self, r, ranges, groups, &s);
result = [NSTextCheckingResult
flags = prepareResult(self, r, ranges, groups, &s);
result = (flags & NSMatchingInternalError) ? nil
: [NSTextCheckingResult
regularExpressionCheckingResultWithRanges: ranges
count: groups
regularExpression: self];
[array addObject: result];
if (nil != result)
{
[array addObject: result];
}
});
return array;
}