libs-gdl2/EOControl/EODebug.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

412 lines
8.6 KiB
Objective-C

/* EODebug.m - <title>debug</title>
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Jan 1999
$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; if not, write to the Free
Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
</license>
**/
#include "config.h"
RCS_ID("$Id$")
#ifndef NeXT_Foundation_LIBRARY
#include <Foundation/NSThread.h>
#include <Foundation/NSAutoreleasePool.h>
#include <Foundation/NSDebug.h>
#else
#include <Foundation/Foundation.h>
#endif
#include <unistd.h>
#include <EOControl/EODebug.h>
#define USTART NSAutoreleasePool* arp=[NSAutoreleasePool new];
#define USTOP DESTROY(arp);
@interface NSObject (GSISA)
-(Class)isa;
@end
@implementation NSObject (GSISA)
-(Class)isa
{
return self->isa;
}
@end
#ifdef DEBUG
void EOFLogC_(const char *file, int line, const char *string)
{
int len = 0;
if ([NSThread isMultiThreaded])
{
NSThread *t = [NSThread currentThread];
fprintf(stderr,"TID=");
#if 0
if (t && t->_thread_id)
fprintf(stderr,"%p [%ld] (%d) ",(void*)t->_thread_id,(long)t->_thread_id,(int)getpid());
else
#endif
{
void *tid = (void*)objc_thread_id();
fprintf(stderr, "%p [%ld] (%d) ", tid, (long)tid, (int)getpid());
}
}
fprintf(stderr, "File %s: %d. ", file, line);
fprintf(stderr, string);
len = strlen(string);
if (len <= 0 || string[len-1] != '\n')
fprintf(stderr, "\n");
fflush(stderr);
}
#endif
#ifdef DEBUG
NSString *objectDescription(id object)
{
NSString *description = nil;
if ([object respondsToSelector: @selector(description)])
{
NS_DURING
description = [object description];
NS_HANDLER
NS_ENDHANDLER;
}
return description;
}
NSString *IVarInString(const char* _type, void* _value)
{
if (_type && _value)
{
switch (*_type)
{
case _C_ID:
{
id *pvalue = (id*)_value;
return [NSString stringWithFormat:
@"object:%ld Class:%s Description:%@",
(long)(*pvalue),
[*pvalue class],
objectDescription(*pvalue)];
}
break;
case _C_CLASS:
{
Class *pvalue = (Class*)_value;
return [NSString stringWithFormat: @"Class:%s",
class_get_class_name(*pvalue)];
}
break;
case _C_SEL:
{
SEL *pvalue = (SEL*)_value;
return [NSString stringWithFormat: @"SEL:%s",
sel_get_name(*pvalue)];
}
break;
case _C_CHR:
{
char *pvalue = (char*)_value;
return [NSString stringWithFormat: @"CHAR:%c",
*pvalue];
}
break;
case _C_UCHR:
{
unsigned char *pvalue = (unsigned char*)_value;
return [NSString stringWithFormat: @"UCHAR:%d",
(int)*pvalue];
}
break;
case _C_SHT:
{
short *pvalue = (short*)_value;
return [NSString stringWithFormat: @"SHORT:%d",
(int)*pvalue];
}
break;
case _C_USHT:
{
unsigned short *pvalue = (unsigned short*)_value;
return [NSString stringWithFormat: @"USHORT:%d",
(int)*pvalue];
}
break;
case _C_INT:
{
int *pvalue = (int*)_value;
return [NSString stringWithFormat: @"INT:%d",
*pvalue];
}
break;
case _C_UINT:
{
unsigned int *pvalue = (unsigned int*)_value;
return [NSString stringWithFormat: @"UINT:%u",
*pvalue];
}
break;
case _C_LNG:
{
long *pvalue = (long*)_value;
return [NSString stringWithFormat: @"LONG:%ld",
*pvalue];
}
break;
case _C_ULNG:
{
unsigned long *pvalue = (unsigned long*)_value;
return [NSString stringWithFormat: @"ULONG:%lu",
*pvalue];
}
break;
case _C_FLT:
{
float *pvalue = (float*)_value;
return [NSString stringWithFormat: @"FLOAT:%f",
(double)*pvalue];
}
break;
case _C_DBL:
{
double *pvalue = (double*)_value;
return [NSString stringWithFormat: @"DOUBLE:%f",
*pvalue];
}
break;
case _C_VOID:
{
void *pvalue = (void*)_value;
return [NSString stringWithFormat: @"VOID:*%lX",
(unsigned long)pvalue];
}
break;
case _C_CHARPTR:
{
char *pvalue = (void*)_value;
return [NSString stringWithFormat: @"CHAR*:%s",
pvalue];
}
break;
case _C_PTR:
{
return [NSString stringWithFormat: @"PTR"];
}
break;
case _C_STRUCT_B:
{
return [NSString stringWithFormat: @"STRUCT"];
}
break;
default:
return [NSString stringWithFormat: @"Unknown"];
}
}
else
return [NSString stringWithString: @"NULL type or NULL pValue"];
}
NSString *TypeToNSString(const char* _type)
{
if (_type)
{
switch (*_type)
{
case _C_ID:
{ // '@'
const char *t = _type + 1;
if (*t == '"')
{
const char *start = t + 1;
do
{
t++;
}
while ((*t != '"') && (*t != '\0'));
return [[NSString stringWithCString: start
length: (t - start)]
stringByAppendingString: @" *"];
}
else
return @"id";
};
break;
case _C_CLASS: return @"Class";
case _C_SEL: return @"SEL";
case _C_CHR: return @"char";
case _C_UCHR: return @"unsigned char";
case _C_SHT: return @"short";
case _C_USHT: return @"unsigned short";
case _C_INT: return @"int";
case _C_UINT: return @"unsigned int";
case _C_LNG: return @"long";
case _C_ULNG: return @"unsigned long";
// case _C_LNG_LNG: return @"long long";
// case _C_ULNG_LNG: return @"unsigned long long";
case _C_FLT: return @"float";
case _C_DBL: return @"double";
case _C_VOID: return @"void";
case _C_CHARPTR: return @"char *";
case _C_PTR:
return [NSString stringWithFormat: @"%@ *",
TypeToNSString(_type + 1)];
break;
case _C_STRUCT_B:
{
NSString *structName = nil;
const char *t = _type + 1;
if (*t == '?')
structName = @"?";
else
{
const char *beg = t;
while ((*t != '=') && (*t != '\0') && (*t != _C_STRUCT_E))
t++;
structName = [NSString stringWithCString:beg length:(t - beg)];
}
return [NSString stringWithFormat: @"struct %@ {...}", structName];
}
default:
return [NSString stringWithFormat: @"%s", _type];
}
}
else
return [NSString stringWithString: @"NULL type"];
}
void DumpIVar(id object, struct objc_ivar *ivar, int deep)
{
if (ivar && object && deep >= 0)
{
void *pValue = ((void*)object) + ivar->ivar_offset;
NSString *pType = TypeToNSString(ivar->ivar_type);
NSString *pIVar = IVarInString(ivar->ivar_type,pValue);
NSDebugFLog(@"IVar %s type:%@ value:%@\n",
ivar->ivar_name,
pType,
pIVar);
if (deep > 0 && ivar->ivar_type && *ivar->ivar_type == _C_ID && pValue)
{
EOFLogDumpObject_(NULL, 0, *((id*)pValue), deep);
}
}
}
//Dump object
void EOFLogDumpObject_(const char *file, int line, id object, int deep)
{
USTART
if (object && deep > 0)
{
struct objc_ivar_list *ivars = NULL;
Class class = [object class];
if (class)
{
NSDebugFLog(@"--%s %d [%d] Dumping object %p of Class %s Description:%@\n",
(file && isalpha(*file) && line >= 0
&& line<=20000) ? file :"",
line,
deep,
(void*)object,
class->name,
objectDescription(object));
while (class)
{
ivars = class->ivars;
class = class->super_class;
if (ivars)
{
int i;
for (i = 0; i < ivars->ivar_count; i++)
{
DumpIVar(object,&ivars->ivar_list[i],deep-1);
}
}
}
}
}
USTOP
}
void EOFLogAssertGood_(const char *file, int line, NSObject *object)
{
if (object)
{
if ([object isa] == ((Class)0xdeadface))
{
NSLog(@"DEAD FACE: object %p isa=%p in %s at %d\n",
(void*)object,
(void*)[object isa],
file,
line);
NSCParameterAssert([object isa] == (Class)0xdeadface);
}
}
else
{
NSLog(@"NULL: object %p in %s at %d\n",
(void*)object,
file,
line);
NSCParameterAssert(object);
}
}
#endif