gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 16:33:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

([NSString -substringFromRange:]): Implement it using CString's for

Browse source 
now so we can get it working; (we'll fix everything for Unichar's in
the next release).


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@1690 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Andrew McCallum 1996-09-02 19:31:44 +00:00
parent 7d17cc4dc6
commit a0c92b588e
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Source/NSString.m
View file

@ -206,7 +206,7 @@ handle_printf_atsign (FILE *stream,
+ (NSString*) stringWithCharacters: (const unichar*)chars
length: (unsigned int)length
{
[self notImplemented:_cmd];
[self notImplemented:_cmd];
return self;
}
@ -483,15 +483,19 @@ handle_printf_atsign (FILE *stream,
- (NSString*) substringFromRange: (NSRange)aRange
{
unichar buffer[aRange.length];
char buffer[aRange.length];
int count = [self length];
if (aRange.location > count)
[NSException raise: NSRangeException format: @"Invalid location."];
if (aRange.length > (count - aRange.location))
[NSException raise: NSRangeException format: @"Invalid location+length."];
[self getCharacters: buffer range: aRange];
return [[self class] stringWithCharacters: buffer length: aRange.length];
/* This will only DTRT for CString's... but that's all we have right now. */
[self getCString: buffer
maxLength: aRange.length
range: aRange
remainingRange: NULL];
return [[self class] stringWithCString: buffer length: aRange.length];
}
- (NSString*) substringToIndex: (unsigned int)index
@ -933,7 +937,7 @@ handle_printf_atsign (FILE *stream,
int len;
/* xxx check to make sure aRange is within self; raise NSStringBoundsError */
assert(aRange.location + aRange.length < [self cStringLength]);
assert(aRange.location + aRange.length <= [self cStringLength]);
if (maxLength < aRange.length)
{
len = maxLength;