libs-gdl2/EOControl/EOCheapArray.m
David Ayers f3e520ee9a 2003-03-30 David Ayers <d.ayers@inode.at>
* *.h/m, *.h/m):
	Used #include instead of depricated #import.  Avoid including
	entire library headers.  Use export macro where applicable.

	* EOControl/GNUmakefile: Removed EOKeyValueCodingBase.m/h and
	EOUndoMananger.h.  Added EOArrayDataSource.m/h, EODefines.h
	and EODepricated.h.
	* EOControl/EODefines.h: Updated for GDL2 & gnustep-make.
	* EOControl/EODebug.h: Updated.
	* EOControl/EODepricated.h: Updated for current state of GDL2.
	([NSObject +flushClassKeyBindings]): Added declaration.
	([EOClassDescription +setDelegate:]): Added declaration.
	([EOClassDescription +delegate]): Added declaration.
	(EOUndoManager): Moved declaration of interface here.
	* EOControl/EOKeyValueCoding.m
	([EOClassDescription +flushClassKeyBindings]): Added empty
	implementation.
	([NSObject takeStoredValuesFromDictionary:]): Cache EONull
	instance and use it instead of isKindOfClass:.
	* EOControl/EOEditingContext.m
	([EOEditingContext +initialize]): Tidied.
	([EOEditingContest -deleteObject]): Use NSUndoManager instead of
	EOUndoManager.
	* EOControl/EOQualifier.m
	([NSArray -filteredArrayUsingQualifier:]): Added minor
	optimization tweak.
	* EOControl/EOClassDescription.m: Removed inactive commented
	code.  Added private declerations of EOAccess methods to avoid
	compiler warnings.
	([EOClassDescription +initialize]): Tidied.
	([EOClassDescription -classDescriptionForClass:]): Use
	GSObjCName() instead of objc runtime routines.
	* EOControl/EOFault.m: Exchanged direct usages of ObjC runtime
	routines with NS/GSObjCRuntime abstraction API.
	([EOFault +superclass]): Ditto.
	([EOFault +targetClassForFault:]): Ditto.
	([EOFault -respondsToSelector:]): Ditto.
	([EOFault +initialize]): Cache static class variable.
	([EOFault +isKindOfClass]): Use static class variable.
	([EOFault +handlerForFault:]): Ditto.
	([EOFault +targetClassForFault:]): Ditto.
	([EOFault -dealloc]): Ditto.
	* EOControl/EOGenericRecord.m:
	([EOGenericRecord +initialize]): Tidied.
	* EOControl/EOKeyComparisonQualifier.m: Tidied documentation.
	* EOControl/EOKeyValueQualifier.m: Ditto.
	* EOControl/EONSAddOns.h/m: Added declarations to surpress
	compiler warnings.
	([NSObject -eoCompareOnName:]): Adjusted casts to surpress
	compiler warnings.
	(GSUseStrictWO451Compatibility): Added function.
	(GDL2GlobalLock, GDL2GlobalRecursive): Ditto.
	* EOControl/EONull: Remove implementations for foundation
	libraries without key value coding and fully rely on NSNull.
	Added assertions in all intance methods as instances should never
	be created.
	([EONull +allocWithZone:]) Corrected method name so it will
	actually be used.
	* EOControl/EOSortOrdering.m
	([NSArray sortedArrayUsingKeyOrderArray:]): Tidied.
	([NSMutableArray sortUsingKeyOrderArray:]): Ditto.
	([EONull compareAscending:]): Sync with referencs implementation.
	([EONull compareDescending:]): Ditto.
	([EONull compareCaseInsensitiveAscending:]): Ditto.
	([EONull compareCaseInsensitiveDescending:]): Ditto.

	* EOAccess/EOAdaptor.h: Added comment about API compatibility.
	* EOAccess/EOAdaptor.m ([EOAdaptor -contexts]): Return array of
	adaptor contexts rather tham GC-wrapper objects containing adaptor
	contexts.
	([EOAdaptor -databaseEncoding]): Use GSEncodingName() instead of
	GetEncodingName().
	* EOAccess/EODatabaseContext.m
	([EODatabaseContext -_turnFault:gid:editingContext:isComplete:]):
	Use GSObjCClass() instead of trying to access isa by dereferencing
	from id with incorrect member.
	* EOAccess/EOModel.m ([EOModel -entityNames]): Sort returned array
	to insure comparable output.
	* EOAccess/EOSQLExpression.m
	([EOSQLExpression sqlStringForArrayOfQualifiers:operation:]):
	Added cast to surpress compiler warning.
	* EOAccess/EOUtilities.m
	([EOObjectStoreCoordinator setModelGroup:]): Ditto.
	* EOAccess/EORelationship.h ([EORelationship -docComment]):
	Added declaration.
	* EOAccess/GNUmakefile: Added EODefines.h and EODepricated.h.

	* Tools/*.m: Use RCS_ID macro.
	* Tools/EOAttribute+GSDoc.h:
	([EOAttribute gsdocContentWithTagName:idPtr:]): Corrected Typo.
	* Tools/EOModel+GSDoc.h/m:
	([EOModel gsdocContentSplittedByEntities:idPtr:]): Ditto.
	* Tools/EORelationship+GSDoc.m:
	([EORelationship gsdocContentWithTagName:idPtr:]): Change variable
	type to supress compiler warnings.
	* Tools/eoutil.m (dump): Initialize variables to supress compiler
	warnings.
	* Tools/gsdoc-model.m: Include GSCategories.h to supress compiler
	warnings.
	(main): Added cast to supress compiler warning.  Fixed typo in
	method invocation.

2003-03-25  Stephane Corthesy  <stephane@sente.ch>

	* EOControl/EODefines.h: Added new file for export/win32 support.
	* EOControl/EODepricated.h: Added new file for depricated features.
	* EOControl/EOControl.h: Added EOArrayDataSource.h and EODefines.h.
	* EOControl/EOArrayDataSource.h/m: Added new files.  Some methods
	(<NSCoding> and qualifier bindings) are empty stubs.
	* EOControl/EODebug.h: Use export macro instead of explicit extern for
	function and symbol declarations.
	* EOControl/EOGlobalID.h: Ditto.
	* EOControl/EONull.h: Ditto.
	* EOControl/EOObjectStore.h: Ditto.
	* EOControl/EOOrQualifier.m: Replaced autorelease by AUTORELEASE
	and fixed typo.
	* EOControl/EOQualifier.m
	([NSArray -filteredArrayUsingQualifier:]): Implemented.
	* EOControl/EONSAddOns.m: Use volatile in some exception handlers
	(man longjmp for more info).
	* EOControl/EOSortOrdering.h/m
	([EOSortOrdering -copyWithZone:]): Implemented <NSCopying>.
	([EOSortOrdering -encodeWithKeyValueArchiver:]): Implemented.

	* EOAccess/EODefines.h: Added new file for export/win32 support.
	* EOAccess/EODepricated.h: Added new file for depricated features.
	* EOAccess/EOAccess.h: Added EODefines.h.
	* EOAccess/EOSQLExpression.h/m: Fixed typo for
	EOPrimaryKeyConstraintKey.
	* EOAccess/EOExpressionArray.h/m: Use volatile for variables usein
	in exception handlers. (man longjmp for more info)
	* EOAccess/EODatabase.h: Use export macro instead of explicit
	extern for function and symbol declarations.
	* EOAccess/EOEntity.h: Ditto.
	* EOAccess/EOModel.h: Ditto.
	* EOAccess/EOSchemaGeneration.h: Ditto.
	* EOAccess/EOSQLExpression.h: Ditto.
	* EOAccess/EOUtilities.h: Ditto.
	* Tools/eoutil.m (dump): Implemented use of -postinstall option.
	Corrected bug when getting adaptor's expression class.  Renamed
	symbol EOPrimaryKeyContraintsKey into EOPrimaryKeyConstraintsKey.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@16298 72102866-910b-0410-8b05-ffd578937521
2003-03-31 00:24:15 +00:00

518 lines
11 KiB
Objective-C

/**
EOCheapArray.m <title>EOCheapCopyArray Classes</title>
Copyright (C) 2000 Free Software Foundation, Inc.
Author: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Sep 2000
$Revision$
$Date$
<abstract></abstract>
This file is part of the GNUstep Database Library.
<license>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with this library; see the file COPYING.LIB.
If not, write to the Free Software Foundation,
59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
</license>
**/
#include "config.h"
RCS_ID("$Id$")
#ifndef NeXT_Foundation_LIBRARY
#include <Foundation/NSArray.h>
#include <Foundation/NSString.h>
#include <Foundation/NSZone.h>
#include <Foundation/NSException.h>
#include <Foundation/NSDebug.h>
#else
#include <Foundation/Foundation.h>
#endif
#include <EOControl/EOCheapArray.h>
#include <EOControl/EODebug.h>
@implementation EOCheapCopyArray : NSArray
- (id) init
{
#ifdef DEBUG
NSDebugFLog(@"Init EOCheapCopyArray %p",
self);
#endif
return [super init];
};
- (id) initWithArray: (id)array
{
#ifdef DEBUG
NSDebugFLog(@"initWithArray EOCheapCopyArray %p",
self);
#endif
if ((self = [super initWithArray: array]))
{
}
return self;
}
- (id) initWithObjects: (id*)objects
count: (unsigned int)count
{
#ifdef DEBUG
NSDebugFLog(@"initWithObjects EOCheapCopyArray %p",
self);
#endif
if (count > 0)
{
unsigned i;
_contents_array = NSZoneMalloc([self zone], sizeof(id) * count);
if (_contents_array == 0)
{
RELEASE(self);
return nil;
}
for (i = 0; i < count; i++)
{
if ((_contents_array[i] = RETAIN(objects[i])) == nil)
{
_count = i;
RELEASE(self);
[NSException raise: NSInvalidArgumentException
format: @"Tried to add nil"];
}
}
_count = count;
}
return self;
}
- (void) dealloc
{
#ifdef DEBUG
NSDebugFLog(@"Deallocate EOCheapCopyArray %p zone=%p _contents_array=%p _count=%d _refcount=%d",
self, [self zone], _contents_array, _count, _refcount);
#endif
if (_contents_array)
{
#if !GS_WITH_GC
unsigned i;
for (i = 0; i < _count; i++)
{
[_contents_array[i] release];
}
#endif
NSZoneFree([self zone], _contents_array);
}
NSDeallocateObject(self);
#ifdef DEBUG
NSDebugFLog(@"Stop Dealloc EOCheapCopyArray %p. ThreadID=%p",
(void*)self,(void*)objc_thread_id());
#endif
}
- (id) autorelease
{
#ifdef DEBUG
NSDebugFLog(@"autorelease EOCheapCopyArray %p. ThreadID=%p [super retainCount]=%d",
(void*)self,(void*)objc_thread_id(),[super retainCount]);
#endif
return [super autorelease];
}
- (void) release
{
#ifdef DEBUG
NSDebugFLog(@"Release EOCheapCopyArray %p. ThreadID=%p [super retainCount]=%d",
(void*)self,(void*)objc_thread_id(),[super retainCount]);
#endif
[super release];
}
- (unsigned int) retainCount
{
#ifdef DEBUG
NSDebugFLog(@"retainCount EOCheapCopyArray %p. ThreadID=%p",
(void*)self,(void*)objc_thread_id());
#endif
return [super retainCount];
}
- (id) retain
{
#ifdef DEBUG
NSDebugFLog(@"retain EOCheapCopyArray %p. ThreadID=%p, [super retainCount]=%d",
(void*)self,(void*)objc_thread_id(),[super retainCount]);
#endif
return [super retain];
}
- (id) objectAtIndex: (unsigned int)index
{
if (index >= _count)
{
[NSException raise: NSRangeException
format: @"Index out of bounds"];
}
return _contents_array[index];
}
//- (id) copyWithZone: (NSZone*)zone;
- (unsigned int) count
{
return _count;
}
//- (BOOL) containsObject: (id)obejct;
@end
@implementation EOCheapCopyMutableArray
- (id) initWithCapacity: (unsigned int)capacity
{
if (capacity == 0)
{
capacity = 1;
}
_contents_array = NSZoneMalloc([self zone], sizeof(id) * capacity);
_capacity = capacity;
_grow_factor = capacity > 1 ? capacity/2 : 1;
return self;
}
- (id) initWithObjects: (id*)objects
count: (unsigned int)count
{
self = [self initWithCapacity: count];
if (self != nil && count > 0)
{
unsigned i;
for (i = 0; i < count; i++)
{
if ((_contents_array[i] = RETAIN(objects[i])) == nil)
{
_count = i;
RELEASE(self);
[NSException raise: NSInvalidArgumentException
format: @"Tried to add nil"];
}
}
_count = count;
}
return self;
}
- (id) initWithArray:(NSArray*)array
{
_grow_factor = 5;
if ((self = [super initWithArray: array]))
{
}
return self;
}
- (void) dealloc
{
#ifdef DEBUG
NSDebugFLog(@"Deallocate EOCheapCopyMutableArray %p zone=%p _contents_array=%p _count=%d _capacity=%d",
self, [self zone], _contents_array, _count, _capacity);
#endif
if (_contents_array)
{
#if !GS_WITH_GC
unsigned i;
for (i = 0; i < _count; i++)
{
[_contents_array[i] release];
}
#endif
NSZoneFree([self zone], _contents_array);
}
DESTROY(_immutableCopy);
NSDeallocateObject(self);
#ifdef DEBUG
NSDebugFLog(@"Stop Dealloc EOCheapCopyMutableArray %p. ThreadID=%p",
(void*)self,(void*)objc_thread_id());
#endif
}
- (id) shallowCopy
{
#ifdef DEBUG
NSDebugFLog(@"Start shallowCopy EOCheapCopyMutableArray %p. ThreadID=%p immutableCopy=%p",
(void*)self,(void*)objc_thread_id(),_immutableCopy);
#endif
//OK
if (!_immutableCopy)
{
// OK. It's retained for us.
_immutableCopy= [[EOCheapCopyArray alloc]
initWithObjects: _contents_array
count: _count];
//Next will retain for caller
}
RETAIN(_immutableCopy); // Because copy return a not autoreleased object. Retain for request caller
#ifdef DEBUG
NSDebugFLog(@"Stop shallowCopy EOCheapCopyMutableArray %p. ThreadID=%p immutableCopy=%p",
(void*)self,(void*)objc_thread_id(),_immutableCopy);
#endif
return _immutableCopy;
}
- (void) _setCopy: (id)param0
{
//TODO
}
- (void) _mutate
{
DESTROY(_immutableCopy);
}
- (unsigned int) count
{
return _count;
}
- (id) objectAtIndex: (unsigned int)index
{
if (index >= _count)
{
[NSException raise: NSRangeException
format: @"Index out of bounds"];
}
return _contents_array[index];
}
- (void)addObject: (id)object
{
//7d0
//im=530
EOFLOGObjectFnStart();
NSDebugMLLog(@"gsdb", @"self %p=%@", self, self);
NSDebugMLLog(@"gsdb", @"object %p of class %@=%@",
object,
[object class],
object);
if (!object)
{
[NSException raise: NSInvalidArgumentException
format: @"Tried to add nil"];
}
NSDebugMLLog(@"gsdb", @"self %p=%@", self, self);
[self _mutate];
NSDebugMLLog(@"gsdb",@"self %p=%@", self, self);
if (_count >= _capacity)
{
unsigned int grow = (_grow_factor>5 ? _grow_factor : 5);
size_t size = (_capacity + grow) * sizeof(id);
id *ptr;
ptr = NSZoneRealloc([self zone], _contents_array, size);
if (ptr == 0)
{
[NSException raise: NSMallocException
format: @"Unable to grow"];
}
_contents_array = ptr;
_capacity += _grow_factor;
_grow_factor = _capacity / 2;
}
_contents_array[_count] = RETAIN(object);
_count++; // Do this AFTER we have retained the object.
NSDebugMLLog(@"gsdb", @"self %p=%@", self, self);
EOFLOGObjectFnStop();
}
- (void) insertObject: (id)object
atIndex: (unsigned int)index
{
unsigned i;
if (!object)
{
[NSException raise: NSInvalidArgumentException
format: @"Tried to insert nil"];
}
if (index > _count)
{
[NSException raise: NSRangeException
format:
@"in insertObject:atIndex:, index %d is out of range",
index];
}
[self _mutate];
if (_count == _capacity)
{
id *ptr;
size_t size = (_capacity + _grow_factor) * sizeof(id);
ptr = NSZoneRealloc([self zone], _contents_array, size);
if (ptr == 0)
{
[NSException raise: NSMallocException
format: @"Unable to grow"];
}
_contents_array = ptr;
_capacity += _grow_factor;
_grow_factor = _capacity / 2;
}
for (i = _count; i > index; i--)
{
_contents_array[i] = _contents_array[i - 1];
}
/*
* Make sure the array is 'sane' so that it can be deallocated
* safely by an autorelease pool if the '[anObject retain]' causes
* an exception.
*/
_contents_array[index] = nil;
_count++;
_contents_array[index] = RETAIN(object);
}
- (void) removeLastObject
{
if (_count == 0)
{
[NSException raise: NSRangeException
format: @"Trying to remove from an empty array."];
}
[self _mutate];
_count--;
RELEASE(_contents_array[_count]);
}
- (void) removeObjectAtIndex: (unsigned int)index
{
id obj;
if (index >= _count)
{
[NSException raise: NSRangeException
format: @"in removeObjectAtIndex:, index %d is out of range",
index];
}
obj = _contents_array[index];
[self _mutate];
_count--;
while (index < _count)
{
_contents_array[index] = _contents_array[index+1];
index++;
}
RELEASE(obj); /* Adjust array BEFORE releasing object. */
}
- (void) replaceObjectAtIndex: (unsigned int)index
withObject: (id)object;
{
id obj;
if (index >= _count)
{
[NSException raise: NSRangeException format:
@"in replaceObjectAtIndex:withObject:, index %d is out of range",
index];
}
/*
* Swap objects in order so that there is always a valid object in the
* array in case a retain or release causes an exception.
*/
obj = _contents_array[index];
[self _mutate];
IF_NO_GC(RETAIN(object));
_contents_array[index] = object;
RELEASE(obj);
}
//TODO implement it for speed ?? - (BOOL) containsObject:(id)object
//TODO implement it for speed ?? - (unsigned int) indexOfObjectIdenticalTo:(id)object
//TODO implement it for speed ?? - (void) removeAllObjects;
- (void) exchangeObjectAtIndex: (unsigned int)index1
withObjectAtIndex: (unsigned int)index2
{
id obj = nil;
if (index1 >= _count || index2>=_count)
{
[NSException raise: NSRangeException format:
@"in exchangeObjectAtIndex:withObjectAtIndex:, index %d is out of range",
(index1 >= _count ? index1 : index2)];
}
obj = _contents_array[index1];
[self _mutate];
_contents_array[index1] = _contents_array[index2];
_contents_array[index2] = obj;
}
@end