mirror of
https://github.com/gnustep/libs-base.git
synced 2025-04-22 16:33:29 +00:00
Move GSArray declarations to header for internal use
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/branches/mswin-ng@23986 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Sheldon Gill
parent
db5d115099
commit
3220eb94bd
7 changed files with 30 additions and 71 deletions
|
|
@ -1,3 +1,12 @@
|
|||
2006-10-29 Sheldon Gill <sheldon@westnet.net.au>
|
||||
|
||||
* Source/GSArray.h: added
|
||||
* Source/GSArray.m:
|
||||
Move declarations to header for internal use
|
||||
|
||||
* Source/NSNull.m:
|
||||
Minor coding standards mods
|
||||
|
||||
2006-10-29 Sheldon Gill <sheldon@westnet.net.au>
|
||||
|
||||
* Source/NSTask.m:
|
||||
|
|
|
|||
|
|
@ -49,15 +49,15 @@ extern "C" {
|
|||
/* Private/internal functions */
|
||||
NSStringEncoding *GetAvailableEncodings(void) GS_PRIVATE;
|
||||
NSStringEncoding GetDefEncoding(void) GS_PRIVATE;
|
||||
/* Deprecated functions */
|
||||
GS_EXPORT NSStringEncoding GSEncodingFromLocale(const char *clocale) GS_DEPRECATED;
|
||||
/* Functions deprecated from external API */
|
||||
GS_EXPORT NSStringEncoding GSEncodingFromLocale(const char *clocale);
|
||||
GS_EXPORT NSStringEncoding GSEncodingForRegistry(NSString *registry,
|
||||
NSString *encoding) GS_DEPRECATED;
|
||||
GS_EXPORT unichar uni_tolower(unichar ch) GS_DEPRECATED;
|
||||
GS_EXPORT unichar uni_toupper(unichar ch) GS_DEPRECATED;
|
||||
GS_EXPORT unsigned char uni_cop(unichar u) GS_DEPRECATED;
|
||||
GS_EXPORT BOOL uni_isnonsp(unichar u) GS_DEPRECATED;
|
||||
GS_EXPORT unichar *uni_is_decomp(unichar u) GS_DEPRECATED;
|
||||
NSString *encoding);
|
||||
GS_EXPORT unichar uni_tolower(unichar ch);
|
||||
GS_EXPORT unichar uni_toupper(unichar ch);
|
||||
GS_EXPORT unsigned char uni_cop(unichar u);
|
||||
GS_EXPORT BOOL uni_isnonsp(unichar u);
|
||||
GS_EXPORT unichar *uni_is_decomp(unichar u);
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -36,57 +36,17 @@
|
|||
// For private method _decodeArrayOfObjectsForKey:
|
||||
#include "Foundation/NSKeyedArchiver.h"
|
||||
|
||||
#include "GSArray.h"
|
||||
|
||||
static SEL eqSel;
|
||||
static SEL oaiSel;
|
||||
|
||||
static Class GSInlineArrayClass;
|
||||
|
||||
@class GSArray;
|
||||
|
||||
@interface GSArrayEnumerator : NSEnumerator
|
||||
{
|
||||
GSArray *array;
|
||||
unsigned pos;
|
||||
}
|
||||
- (id) initWithArray: (GSArray*)anArray;
|
||||
@end
|
||||
|
||||
@interface GSArrayEnumeratorReverse : GSArrayEnumerator
|
||||
@end
|
||||
|
||||
|
||||
@interface GSArray : NSArray
|
||||
{
|
||||
@public
|
||||
id *_contents_array;
|
||||
unsigned _count;
|
||||
}
|
||||
@end
|
||||
|
||||
@interface GSInlineArray : GSArray
|
||||
{
|
||||
}
|
||||
@end
|
||||
|
||||
@interface GSMutableArray : NSMutableArray
|
||||
{
|
||||
@public
|
||||
id *_contents_array;
|
||||
unsigned _count;
|
||||
unsigned _capacity;
|
||||
int _grow_factor;
|
||||
}
|
||||
@end
|
||||
|
||||
@interface GSMutableArray (GSArrayBehavior)
|
||||
- (void) _raiseRangeExceptionWithIndex: (unsigned)index from: (SEL)sel;
|
||||
@end
|
||||
|
||||
@interface GSPlaceholderArray : NSArray
|
||||
{
|
||||
}
|
||||
@end
|
||||
|
||||
@implementation GSArray
|
||||
|
||||
- (void) _raiseRangeExceptionWithIndex: (unsigned)index from: (SEL)sel
|
||||
|
|
|
|||
|
|
@ -46,11 +46,14 @@
|
|||
#include "Foundation/NSDebug.h"
|
||||
#include "Foundation/NSValue.h"
|
||||
#include "Foundation/NSNull.h"
|
||||
#include "Foundation/NSUserDefaults.h"
|
||||
// For private method _decodeArrayOfObjectsForKey:
|
||||
#include "Foundation/NSKeyedArchiver.h"
|
||||
#include "GNUstepBase/GSCategories.h"
|
||||
#include "GSPrivate.h"
|
||||
|
||||
#include "GSArray.h"
|
||||
|
||||
extern BOOL GSMacOSXCompatiblePropertyLists(void);
|
||||
extern void GSPropertyListMake(id,NSDictionary*,BOOL,BOOL,unsigned,id*);
|
||||
|
||||
|
|
@ -66,21 +69,6 @@ extern void GSPropertyListMake(id,NSDictionary*,BOOL,BOOL,unsigned,id*);
|
|||
@interface NSArrayEnumeratorReverse : NSArrayEnumerator
|
||||
@end
|
||||
|
||||
|
||||
|
||||
@class GSArray;
|
||||
@interface GSArray : NSObject // Help the compiler
|
||||
@end
|
||||
@class GSInlineArray;
|
||||
@interface GSInlineArray : NSObject // Help the compiler
|
||||
@end
|
||||
@class GSMutableArray;
|
||||
@interface GSMutableArray : NSObject // Help the compiler
|
||||
@end
|
||||
@class GSPlaceholderArray;
|
||||
@interface GSPlaceholderArray : NSObject // Help the compiler
|
||||
@end
|
||||
|
||||
static Class NSArrayClass;
|
||||
static Class GSArrayClass;
|
||||
static Class GSInlineArrayClass;
|
||||
|
|
@ -93,9 +81,9 @@ static NSMapTable *placeholderMap;
|
|||
static NSLock *placeholderLock;
|
||||
|
||||
/**
|
||||
* A simple, low overhead, ordered container for objects. All the objects
|
||||
* A simple, low overhead, container for ordered objects. All the objects
|
||||
* in the container are retained by it. The container may not contain nil
|
||||
* (though it may contain [NSNull+null]).
|
||||
* (though it may contain +[NSNull null]).
|
||||
*/
|
||||
@implementation NSArray
|
||||
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@
|
|||
#include "Foundation/NSDecimalNumber.h"
|
||||
#include "Foundation/NSException.h"
|
||||
#include "Foundation/NSPortCoder.h"
|
||||
#include "Foundation/NSUserDefaults.h"
|
||||
|
||||
#include "GSPrivate.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@
|
|||
#include "Foundation/NSObjCRuntime.h"
|
||||
#include "Foundation/NSValue.h"
|
||||
#include "Foundation/NSKeyValueCoding.h"
|
||||
#include "Foundation/NSUserDefaults.h"
|
||||
// For private method _decodeArrayOfObjectsForKey:
|
||||
#include "Foundation/NSKeyedArchiver.h"
|
||||
#include "GNUstepBase/GSCategories.h"
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ static NSNull *null = 0;
|
|||
* Return an object that can be used as a placeholder in a collection.
|
||||
* This method always returns the same object.
|
||||
*/
|
||||
+ (NSNull*) null
|
||||
+ (NSNull *) null
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
|
@ -66,7 +66,7 @@ static NSNull *null = 0;
|
|||
return self;
|
||||
}
|
||||
|
||||
- (id) copyWithZone: (NSZone*)z
|
||||
- (id) copyWithZone: (NSZone *)z
|
||||
{
|
||||
return self;
|
||||
}
|
||||
|
|
@ -81,11 +81,11 @@ static NSNull *null = 0;
|
|||
GSNOSUPERDEALLOC;
|
||||
}
|
||||
|
||||
- (void) encodeWithCoder: (NSCoder*)aCoder
|
||||
- (void) encodeWithCoder: (NSCoder *)aCoder
|
||||
{
|
||||
}
|
||||
|
||||
- (id) initWithCoder: (NSCoder*)aCoder
|
||||
- (id) initWithCoder: (NSCoder *)aCoder
|
||||
{
|
||||
return self;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue