Inline map and array updates.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@4447 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
richard 1999-06-21 08:30:26 +00:00
parent 984e50ff8c
commit 7fffe7ce03
22 changed files with 829 additions and 914 deletions

View file

@ -38,6 +38,7 @@
#include <Foundation/NSData.h>
#include <Foundation/NSDictionary.h>
#include <Foundation/NSCharacterSet.h>
#include <Foundation/NSRange.h>
#include <base/IndexedCollection.h>
#include <base/IndexedCollectionPrivate.h>
#include <Foundation/NSValue.h>
@ -248,10 +249,7 @@
- (void)getCharacters: (unichar*)buffer range: (NSRange)aRange
{
if (aRange.location >= _count)
[NSException raise: NSRangeException format:@"Invalid location."];
if (aRange.length > (_count - aRange.location))
[NSException raise: NSRangeException format:@"Invalid location+length."];
GS_RANGE_CHECK(aRange, _count);
memcpy(buffer, _contents_chars + aRange.location, aRange.length*2);
}
@ -259,10 +257,7 @@
- (NSString*) substringFromRange: (NSRange)aRange
{
if (aRange.location > _count)
[NSException raise: NSRangeException format:@"Invalid location."];
if (aRange.length > (_count - aRange.location))
[NSException raise: NSRangeException format:@"Invalid location+length."];
GS_RANGE_CHECK(aRange, _count);
return [[self class] stringWithCharacters: _contents_chars + aRange.location
length: aRange.length];
}
@ -622,10 +617,7 @@ stringDecrementCountAndFillHoleAt(NSGMutableStringStruct *self,
int offset;
unsigned stringLength;
if (aRange.location > _count)
[NSException raise: NSRangeException format:@"Invalid location."];
if (aRange.length > (_count - aRange.location))
[NSException raise: NSRangeException format:@"Invalid location+length."];
GS_RANGE_CHECK(aRange, _count);
stringLength = (aString == nil) ? 0 : [aString length];
offset = stringLength - aRange.length;