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

Change names from "Concrete"-style to "G"-style.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@368 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Andrew McCallum 1995-04-15 19:48:46 +00:00
parent d596d043fc
commit 958c22dda8
5 changed files with 21 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Headers/gnustep/base/NSGArray.h
View file

@ -1,4 +1,4 @@
/* Interface to concrete implementation of NSArray.
/* Interface to concrete implementation of NSArray based on GNU Array
Copyright (C) 1995 Free Software Foundation, Inc.
Written by: R. Andrew McCallum <mccallum@gnu.ai.mit.edu>
@ -21,14 +21,14 @@
Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#ifndef __NSConcreteArray_h_OBJECTS_INCLUDE
#define __NSConcreteArray_h_OBJECTS_INCLUDE
#ifndef __NSGArray_h_OBJECTS_INCLUDE
#define __NSGArray_h_OBJECTS_INCLUDE
#include <objects/stdobjects.h>
#include <foundation/NSArray.h>
#include <objects/elt.h>
@interface NSConcreteArray : NSArray
@interface NSGArray : NSArray
{
/* For now, these must match the instance variables in objects/Array.h.
This will change. */
@ -41,7 +41,7 @@
@end
@interface NSConcreteMutableArray : NSArray
@interface NSGMutableArray : NSMutableArray
{
/* For now, these must match the instance variables in objects/Array.h.
This will change. */
@ -54,4 +54,4 @@
@end
#endif /* __NSConcreteArray_h_OBJECTS_INCLUDE */
#endif /* __NSGArray_h_OBJECTS_INCLUDE */

12
Source/NSArray.m
View file

@ -24,7 +24,7 @@
#include <foundation/NSArray.h>
#include <foundation/NSString.h>
#include <foundation/NSConcreteArray.h>
#include <foundation/NSGArray.h>
#include <foundation/NSArrayEnumerator.h>
#include <limits.h>
@ -32,12 +32,12 @@
+ array
{
return [[[NSConcreteArray alloc] init] autorelease];
return [[[NSGArray alloc] init] autorelease];
}
+ arrayWithObject: anObject
{
id a = [[[NSConcreteArray class] alloc] init];
id a = [[[NSGArray class] alloc] init];
[a addObject: anObject];
return [a autorelease];
}
@ -88,7 +88,7 @@
{
va_list ap;
va_start(ap, firstObject);
self = [[NSConcreteArray alloc] initWithObjects:firstObject rest:ap];
self = [[NSGArray alloc] initWithObjects:firstObject rest:ap];
va_end(ap);
return [self autorelease];
}
@ -263,7 +263,7 @@
- mutableCopyWithZone: (NSZone*)zone
{
return [[NSConcreteMutableArray allocWithZone:zone] initWithArray:self];
return [[NSGMutableArray allocWithZone:zone] initWithArray:self];
}
@end
@ -272,7 +272,7 @@
+ arrayWithCapacity: (unsigned)numItems
{
return [[[[NSConcreteMutableArray class] alloc] initWithCapacity:numItems]
return [[[[NSGMutableArray class] alloc] initWithCapacity:numItems]
autorelease];
}

2
Source/NSCoder.m
View file

@ -24,7 +24,7 @@
#include <objects/stdobjects.h>
#include <foundation/NSCoder.h>
#include <foundation/NSConcreteCoder.h>
#include <foundation/NSGCoder.h>
#include <objects/NSCoder.h>
@implementation NSCoder

15
Source/NSGArray.m
View file

@ -1,4 +1,4 @@
/* NSArray - Array object to hold other objects.
/* Concrete implementation of NSArray based on GNU Array class
Copyright (C) 1995 Free Software Foundation, Inc.
Written by: R. Andrew McCallum <mccallum@gnu.ai.mit.edu>
@ -21,13 +21,13 @@
Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <foundation/NSConcreteArray.h>
#include <foundation/NSGArray.h>
#include <objects/NSArray.h>
#include <objects/behavior.h>
#include <objects/Array.h>
#include <objects/ArrayPrivate.h>
@implementation NSConcreteArray
@implementation NSGArray
+ (void) initialize
{
@ -36,7 +36,7 @@
if (!done)
{
done = 1;
class_add_behavior([NSConcreteArray class], [Array class]);
class_add_behavior([NSGArray class], [Array class]);
}
}
@ -74,7 +74,7 @@
@end
@implementation NSConcreteMutableArray
@implementation NSGMutableArray
+ (void) initialize
{
@ -82,9 +82,8 @@
if (!done)
{
done = 1;
class_add_behavior([NSConcreteMutableArray class],
[NSConcreteArray class]);
class_add_behavior([NSConcreteMutableArray class], [Array class]);
class_add_behavior([NSGMutableArray class], [NSGArray class]);
class_add_behavior([NSGMutableArray class], [Array class]);
}
}

2
Source/NSGCoder.m
View file

@ -34,7 +34,7 @@
if (!done)
{
done = 1;
class_add_behavior([NSConcreteCoder class], [Coder class]);
class_add_behavior([NSGCoder class], [Coder class]);
}
}