mirror of
https://github.com/gnustep/libs-gdl2.git
synced 2025-02-23 03:10:55 +00:00
Fixed assignment in while loop as reported by Stephane Corthesy. * EOControl/EOAndQualifier.m ([EOAndQualifier +qualifierWithQualifiers:]), ([EOAndQualifier -initWithQualifiers:]): Use GS_USEIDLIST to optimize vararg list to array conversion. * EOControl/EOOrQualifier.m ([EOOrQualifier +qualifierWithQualifiers:]), ([EOOrQualifier -initWithQualifiers:]): Ditto. * EOControl/EOClassDescription.m ([EOClassDescription +classDelegate]): Make access to static variable thread safe. * EOControl/EOEdtitingContext.m: Added declarations to avoid compiler warnings. 2003-05-02 Stephane Corthesy <stephane at sente dot ch> * EOControl/EOControl.h: Added inclusion of EOArrayDataSource.h. * EOControl/EOEdtitingContext.m: Added declaration of +[EOEditingContext(EOEditingContextPrivate) _observeUndoManagerNotifications] to avoid compiler warnings. * EOControl/EONSAddOns.m ([NSObject -resultsOfPerformingSelector:withEachObjectInArray:defaultResult:]): Added cast to avoid compiler warning. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@16613 72102866-910b-0410-8b05-ffd578937521
586 lines
14 KiB
Objective-C
586 lines
14 KiB
Objective-C
/**
|
|
EONSAddOns.m <title>EONSAddOns</title>
|
|
|
|
Copyright (C) 2000-2002 Free Software Foundation, Inc.
|
|
|
|
Author: Manuel Guesdon <mguesdon@orange-concept.com>
|
|
Date: October 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/NSString.h>
|
|
#include <Foundation/NSArray.h>
|
|
#include <Foundation/NSLock.h>
|
|
#include <Foundation/NSUserDefaults.h>
|
|
#include <Foundation/NSNotification.h>
|
|
#include <Foundation/NSThread.h>
|
|
#include <Foundation/NSException.h>
|
|
#include <Foundation/NSDebug.h>
|
|
#else
|
|
#include <Foundation/Foundation.h>
|
|
#endif
|
|
|
|
#include <EOControl/EONSAddOns.h>
|
|
#include <EOControl/EODebug.h>
|
|
|
|
static BOOL GSStrictWO451Flag = NO;
|
|
|
|
BOOL
|
|
GSUseStrictWO451Compatibility (NSString *key)
|
|
{
|
|
static BOOL read = NO;
|
|
if (read == NO)
|
|
{
|
|
NSLock *lock = GDL2GlobalLock();
|
|
if (lock!=nil)
|
|
{
|
|
[lock lock];
|
|
}
|
|
NS_DURING
|
|
if (read == NO)
|
|
{
|
|
NSUserDefaults *defaults;
|
|
defaults = [NSUserDefaults standardUserDefaults];
|
|
GSStrictWO451Flag
|
|
= [defaults boolForKey: @"GSUseStrictWO451Compatibility"];
|
|
read = YES;
|
|
}
|
|
NS_HANDLER
|
|
if (lock != nil)
|
|
{
|
|
[lock unlock];
|
|
}
|
|
[localException raise];
|
|
NS_ENDHANDLER
|
|
if (lock != nil)
|
|
{
|
|
[lock unlock];
|
|
}
|
|
}
|
|
return GSStrictWO451Flag;
|
|
}
|
|
|
|
/* We use this helper class because the runtime
|
|
guarantees to call +initialize under a mutex,
|
|
allowing for clean setup of the global locks.*/
|
|
|
|
@interface GDL2GlobalLockVendor : NSObject
|
|
+ (NSLock *) globalLock;
|
|
+ (NSRecursiveLock *) globalRecursiveLock;
|
|
@end
|
|
|
|
NSLock *
|
|
GDL2GlobalLock()
|
|
{
|
|
return [GDL2GlobalLockVendor globalLock];
|
|
}
|
|
|
|
NSRecursiveLock *
|
|
GDL2GlobalRecursiveLock()
|
|
{
|
|
return [GDL2GlobalLockVendor globalRecursiveLock];
|
|
}
|
|
|
|
|
|
@implementation NSObject (NSObjectPerformingSelector)
|
|
|
|
- (NSArray*)resultsOfPerformingSelector: (SEL)sel
|
|
withEachObjectInArray: (NSArray*)array
|
|
{
|
|
return [self resultsOfPerformingSelector: sel
|
|
withEachObjectInArray: array
|
|
defaultResult: nil];
|
|
}
|
|
|
|
- (NSArray*)resultsOfPerformingSelector: (SEL)sel
|
|
withEachObjectInArray: (NSArray*)array
|
|
defaultResult: (id)defaultResult
|
|
{
|
|
NSMutableArray *results = nil;
|
|
|
|
if (array)
|
|
{
|
|
int i, count = [array count];
|
|
volatile id object = nil;
|
|
|
|
results = [NSMutableArray array];
|
|
|
|
//OPTIMIZE
|
|
NS_DURING
|
|
{
|
|
for(i = 0; i < count; i++)
|
|
{
|
|
id result;
|
|
|
|
object = [array objectAtIndex: i];
|
|
result = [self performSelector: sel
|
|
withObject: (id)object];
|
|
if (!result)
|
|
result = defaultResult;
|
|
|
|
NSAssert3(result,
|
|
@"%@: No result for object %@ resultOfPerformingSelector:\"%s\" withEachObjectInArray:",
|
|
self,
|
|
object,
|
|
sel_get_name(sel));
|
|
|
|
[results addObject: result]; //TODO What to do if nil ??
|
|
}
|
|
}
|
|
NS_HANDLER
|
|
{
|
|
NSWarnLog(@"object %p %@ may not support %@",
|
|
object,
|
|
[object class],
|
|
NSStringFromSelector(sel));
|
|
NSLog(@"%@ (%@)",localException,[localException reason]);
|
|
[localException raise];
|
|
}
|
|
NS_ENDHANDLER;
|
|
}
|
|
|
|
return results;
|
|
}
|
|
|
|
@end
|
|
|
|
@implementation NSArray (NSArrayPerformingSelector)
|
|
|
|
- (id)firstObject
|
|
{
|
|
NSAssert1([self count] > 0, @"no object in %@", self);
|
|
return [self objectAtIndex: 0];
|
|
}
|
|
|
|
- (NSArray*)resultsOfPerformingSelector: (SEL)sel
|
|
{
|
|
return [self resultsOfPerformingSelector: sel
|
|
defaultResult: nil];
|
|
}
|
|
|
|
- (NSArray*)resultsOfPerformingSelector: (SEL)sel
|
|
defaultResult: (id)defaultResult
|
|
{
|
|
NSMutableArray *results=[NSMutableArray array];
|
|
int i, count = [self count];
|
|
volatile id object = nil;
|
|
|
|
NSDebugMLLog(@"gsdb", @"self:%p (%@) results:%p (%@)",
|
|
self, [self class], results, [results class]);
|
|
|
|
//OPTIMIZE
|
|
NS_DURING
|
|
{
|
|
for(i = 0; i < count; i++)
|
|
{
|
|
id result;
|
|
|
|
object = [self objectAtIndex: i];
|
|
result = [object performSelector: sel];
|
|
|
|
if (!result)
|
|
result = defaultResult;
|
|
|
|
NSAssert3(result,
|
|
@"%@: No result for object %@ resultOfPerformingSelector:\"%s\"",
|
|
self,
|
|
object,
|
|
sel_get_name(sel));
|
|
|
|
[results addObject: result]; //TODO What to do if nil ??
|
|
}
|
|
}
|
|
NS_HANDLER
|
|
{
|
|
NSWarnLog(@"object %p %@ may doesn't support %@",
|
|
object,
|
|
[object class],
|
|
NSStringFromSelector(sel));
|
|
|
|
NSLog(@"%@ (%@)", localException, [localException reason]);
|
|
|
|
[localException raise];
|
|
}
|
|
NS_ENDHANDLER;
|
|
|
|
NSDebugMLLog(@"gsdb", @"self:%p (%@) results:%p (%@)",
|
|
self, [self class], results, [results class]);
|
|
|
|
return results;
|
|
}
|
|
|
|
- (NSArray*)resultsOfPerformingSelector: (SEL)sel
|
|
withObject: (id)obj1
|
|
{
|
|
return [self resultsOfPerformingSelector: sel
|
|
withObject: obj1
|
|
defaultResult: nil];
|
|
}
|
|
|
|
- (NSArray*)resultsOfPerformingSelector:(SEL)sel
|
|
withObject:(id)obj1
|
|
defaultResult:(id)defaultResult
|
|
{
|
|
NSMutableArray *results = [NSMutableArray array];
|
|
int i, count = [self count];
|
|
volatile id object = nil;
|
|
|
|
//OPTIMIZE
|
|
NS_DURING
|
|
{
|
|
for(i = 0; i < count; i++)
|
|
{
|
|
id result;
|
|
|
|
object = [self objectAtIndex: i];
|
|
result = [object performSelector: sel
|
|
withObject: obj1];
|
|
|
|
if (!result)
|
|
result = defaultResult;
|
|
|
|
NSAssert3(result,
|
|
@"%@: No result for object %@ resultOfPerformingSelector:\"%s\"",
|
|
self,
|
|
object,
|
|
sel_get_name(sel));
|
|
|
|
[results addObject: result]; //TODO What to do if nil ??
|
|
}
|
|
}
|
|
NS_HANDLER
|
|
{
|
|
NSWarnLog(@"object %p %@ may doesn't support %@",
|
|
object,
|
|
[object class],
|
|
NSStringFromSelector(sel));
|
|
|
|
NSLog(@"%@ (%@)", localException, [localException reason]);
|
|
|
|
[localException raise];
|
|
}
|
|
NS_ENDHANDLER;
|
|
|
|
return results;
|
|
}
|
|
|
|
- (NSArray*)resultsOfPerformingSelector: (SEL)sel
|
|
withObject: (id)obj1
|
|
withObject: (id)obj2
|
|
{
|
|
return [self resultsOfPerformingSelector: sel
|
|
withObject: obj1
|
|
withObject: obj2
|
|
defaultResult: nil];
|
|
}
|
|
|
|
- (NSArray*)resultsOfPerformingSelector: (SEL)sel
|
|
withObject: (id)obj1
|
|
withObject: (id)obj2
|
|
defaultResult: (id)defaultResult
|
|
{
|
|
NSMutableArray *results = [NSMutableArray array];
|
|
int i, count = [self count];
|
|
volatile id object = nil;
|
|
|
|
//OPTIMIZE
|
|
NS_DURING
|
|
{
|
|
for(i = 0; i < count; i++)
|
|
{
|
|
id result;
|
|
|
|
object = [self objectAtIndex: i];
|
|
result = [object performSelector: sel
|
|
withObject: obj1
|
|
withObject: obj2];
|
|
|
|
if (!result)
|
|
result = defaultResult;
|
|
|
|
NSAssert3(result,
|
|
@"%@: No result for object %@ resultOfPerformingSelector:\"%s\"",
|
|
self,
|
|
object,
|
|
sel_get_name(sel));
|
|
|
|
[results addObject: result]; //TODO What to do if nil ??
|
|
}
|
|
}
|
|
NS_HANDLER
|
|
{
|
|
NSWarnLog(@"object %p %@ may doesn't support %@",
|
|
object,
|
|
[object class],
|
|
NSStringFromSelector(sel));
|
|
|
|
NSLog(@"%@ (%@)", localException, [localException reason]);
|
|
|
|
[localException raise];
|
|
}
|
|
NS_ENDHANDLER;
|
|
|
|
return results;
|
|
}
|
|
|
|
- (NSArray*)arrayExcludingObjectsInArray: (NSArray*)array
|
|
{
|
|
//Verify: mutable/non mutable,..
|
|
NSArray *result = nil;
|
|
unsigned int selfCount = [self count];
|
|
|
|
if (selfCount > 0) //else return nil
|
|
{
|
|
unsigned int arrayCount = [array count];
|
|
|
|
if (arrayCount == 0) //Nothing to exclude ?
|
|
result = self;
|
|
else
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < selfCount; i++)
|
|
{
|
|
id object = [self objectAtIndex: i];
|
|
int index = [array indexOfObjectIdenticalTo: object];
|
|
|
|
if (index == NSNotFound)
|
|
{
|
|
if (result)
|
|
[(NSMutableArray*)result addObject: object];
|
|
else
|
|
result = [NSMutableArray arrayWithObject: object];
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
- (NSArray *)arrayExcludingObject: (id)anObject
|
|
{
|
|
//Verify: mutable/non mutable,..
|
|
NSArray *result = nil;
|
|
unsigned int selfCount = [self count];
|
|
|
|
if (selfCount > 0 && anObject) //else return nil
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < selfCount; i++)
|
|
{
|
|
id object = [self objectAtIndex: i];
|
|
|
|
if (object != anObject)
|
|
{
|
|
if (result)
|
|
[(NSMutableArray *)result addObject: object];
|
|
else
|
|
result = [NSMutableArray arrayWithObject: object];
|
|
}
|
|
}
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
- (NSArray*)arrayByReplacingObject: (id)object1
|
|
withObject: (id)object2
|
|
{
|
|
NSArray *array = nil;
|
|
int count;
|
|
|
|
count = [self count];
|
|
|
|
if (count > 0)
|
|
{
|
|
int i;
|
|
id o = nil;
|
|
NSMutableArray *tmpArray = [NSMutableArray arrayWithCapacity: count];
|
|
|
|
for (i = 0; i < count; i++)
|
|
{
|
|
o = [self objectAtIndex: i];
|
|
|
|
if ([o isEqual: object1])
|
|
[tmpArray addObject: object2];
|
|
else
|
|
[tmpArray addObject: o];
|
|
}
|
|
|
|
array = [NSArray arrayWithArray: tmpArray];
|
|
}
|
|
else
|
|
array = self;
|
|
|
|
return array;
|
|
}
|
|
|
|
/** return YES if the 2 arrays contains exactly identical objects (compared by address) (i.e. only the order may change), NO otherwise
|
|
**/
|
|
- (BOOL)containsIdenticalObjectsWithArray: (NSArray *)array
|
|
{
|
|
BOOL ret = NO;
|
|
int selfCount = [self count];
|
|
int arrayCount = [array count];
|
|
|
|
if (selfCount == arrayCount)
|
|
{
|
|
BOOL foundInArray[arrayCount];
|
|
int i, j;
|
|
|
|
memset(foundInArray, 0, sizeof(BOOL) * arrayCount);
|
|
ret = YES;
|
|
|
|
for (i = 0; ret && i < selfCount; i++)
|
|
{
|
|
id selfObj = [self objectAtIndex: i];
|
|
|
|
ret = NO;
|
|
|
|
for (j = 0; j < arrayCount; j++)
|
|
{
|
|
id arrayObj = [array objectAtIndex: j];
|
|
|
|
if (arrayObj == selfObj && !foundInArray[j])
|
|
{
|
|
foundInArray[j] = YES;
|
|
ret = YES;
|
|
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
@end
|
|
|
|
@interface NSObject (EOCOmpareOnNameSupport)
|
|
- (NSString *)name;
|
|
@end
|
|
@implementation NSObject (EOCompareOnName)
|
|
|
|
- (NSComparisonResult)eoCompareOnName: (id)object
|
|
{
|
|
return [[self name] compare: [(NSObject *)object name]];
|
|
}
|
|
|
|
@end
|
|
|
|
@implementation NSString (YorYes)
|
|
|
|
- (BOOL)isYorYES
|
|
{
|
|
return ([self isEqual: @"Y"] || [self isEqual: @"YES"]);
|
|
}
|
|
|
|
@end
|
|
|
|
@interface GDL2GlobalLockVendor (private)
|
|
+ (void) _setupLocks: (NSNotification *)notif;
|
|
@end
|
|
|
|
@implementation GDL2GlobalLockVendor
|
|
|
|
static NSLock *lock = nil;
|
|
static NSRecursiveLock *rlock = nil;
|
|
|
|
/*
|
|
* Depending on whether we are multithreaded or not, we
|
|
* setup for the becomeMultithreadedNotification to
|
|
* invoke _setupLocks: or invoke it directly. This method
|
|
* is invoked once by the runtime under a lock and
|
|
* therefor allows thread safe access to global variables.
|
|
*/
|
|
+ (void) initialize
|
|
{
|
|
if (self == [GDL2GlobalLockVendor class])
|
|
{
|
|
if ([NSThread isMultiThreaded] == YES)
|
|
{
|
|
[self _setupLocks: nil];
|
|
}
|
|
else
|
|
{
|
|
NSNotificationCenter *nc;
|
|
nc = [NSNotificationCenter defaultCenter];
|
|
[nc addObserver: self
|
|
selector:@selector(_setupLocks:)
|
|
name: NSWillBecomeMultiThreadedNotification
|
|
object: nil];
|
|
}
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Setup globalLock and globalRecursiveLock. This method should
|
|
* only be called from a thread safe context (i.e. from +initialze
|
|
* or during NSWillBecomeMultiThreadedNotification).
|
|
*/
|
|
+ (void) _setupLocks: (NSNotification *)notif
|
|
{
|
|
if (lock == nil && rlock == nil)
|
|
{
|
|
lock = [NSLock new];
|
|
rlock = [NSRecursiveLock new];
|
|
}
|
|
else
|
|
{
|
|
NSLog(@"%@ - +%@ called multiple times!",
|
|
NSStringFromClass([self class]),
|
|
NSStringFromSelector(_cmd));
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Returns a global NSLock, if the process is multithreaded.
|
|
* Otherwise returns nil.
|
|
*/
|
|
+ (NSLock *) globalLock
|
|
{
|
|
return lock;
|
|
}
|
|
|
|
/**
|
|
* Returns a global NSRecursiveLock, if the process is multithreaded.
|
|
* Otherwise returns nil.
|
|
*/
|
|
+ (NSRecursiveLock *) globalRecursiveLock
|
|
{
|
|
return rlock;
|
|
}
|
|
|
|
@end
|
|
|