gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 00:41:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

([NSString -getCharacters:range:]): Fix bug in buffer index.

Browse source 
(Reported by Eric Norum <Eric.Norum@usask.ca>.)
([NSString -rangeOfString:aStringoptions:maskrange:aRange]):
Implemented.  (By Eric Norum.)


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@1664 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Andrew McCallum 1996-09-02 13:38:19 +00:00
parent a25ebe26bf
commit b18987af6c
1 changed files with 96 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

104
Source/NSString.m
View file

@ -418,9 +418,9 @@ handle_printf_atsign (FILE *stream,
range: (NSRange)aRange
{
int i;
for (i = aRange.location + aRange.length - 1; i >= aRange.location; i--)
for (i = 0; i < aRange.length; i++)
{
buffer[i] = [self characterAtIndex:i];
buffer[i] = [self characterAtIndex: aRange.location+i];
}
}
@ -564,14 +564,102 @@ handle_printf_atsign (FILE *stream,
range:all];
}
- (NSRange) rangeOfString: (NSString*)aString
options: (unsigned int)mask
range: (NSRange)aRange
- (NSRange) rangeOfString:(NSString *) aString
options:(unsigned int) mask
range:(NSRange) aRange
{
[self notImplemented:_cmd];
return ((NSRange){0,0});
}
int stepDirection;
unsigned int myIndex, myLength, myEndIndex;
unsigned int strLength;
unichar strFirstCharacter;
/* Check that the search range is reasonable */
myLength = [self length];
if (aRange.location > myLength)
[NSException raise: NSRangeException format:@"Invalid location."];
if (aRange.length > (myLength - aRange.location))
[NSException raise: NSRangeException format:@"Invalid location+length."];
/* Ensure the string can be found */
strLength = [aString length];
if (strLength > aRange.length)
return (NSRange){0, 0};
/* Decide where to start and end the search */
if (mask & NSBackwardsSearch)
{
stepDirection = -1;
myIndex = aRange.location + aRange.length - strLength;
myEndIndex = aRange.location;
}
else
{
stepDirection = 1;
myIndex = aRange.location;
myEndIndex = aRange.location + aRange.length - strLength;
}
/* FIXME: I am guessing that this is what NSAnchoredSearch does. */
if (mask & NSAnchoredSearch)
myEndIndex = myIndex;
/* Start searching. For efficiency there are separate loops for
case-sensitive and case-insensitive searches. */
strFirstCharacter = [aString characterAtIndex:0];
if (mask & NSCaseInsensitiveSearch)
{
for (;;)
{
unsigned int i = 1;
unichar myCharacter = [self characterAtIndex:myIndex];
unichar strCharacter = strFirstCharacter;
for (;;)
{
/* FIXME: I have no idea how to make case-insensitive
comparisons work over the full range of Unicode characters. */
if ((myCharacter != strCharacter) &&
(!isascii (myCharacter)
|| !isalpha (myCharacter)
|| !isascii (strCharacter)
|| !isalpha (strCharacter)
|| (tolower (myCharacter) != tolower (strCharacter))))
break;
if (i == strLength)
return (NSRange){myIndex, strLength};
myCharacter = [self characterAtIndex:myIndex + i];
strCharacter = [aString characterAtIndex:i];
i++;
}
if (myIndex == myEndIndex)
break;
myIndex += stepDirection;
}
}
else
{
for (;;)
{
unsigned int i = 1;
unichar myCharacter = [self characterAtIndex:myIndex];
unichar strCharacter = strFirstCharacter;
for (;;)
{
if (myCharacter != strCharacter)
break;
if (i == strLength)
return (NSRange){myIndex, strLength};
myCharacter = [self characterAtIndex:myIndex + i];
strCharacter = [aString characterAtIndex:i];
i++;
}
if (myIndex == myEndIndex)
break;
myIndex += stepDirection;
}
}
return (NSRange){0, 0};
}
// Determining Composed Character Sequences