New split view, other fixes.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@2869 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fedor 1998-07-28 17:51:55 +00:00
parent 8b141999ba
commit 86dbd2aa63
14 changed files with 37 additions and 56 deletions

View file

@ -1,3 +1,16 @@
Tue Jul 28 12:57:54 1998 Adam Fedor <fedor@ultra.doc.com>
* src/GNUmakefile: Remove NEXTSTEP classes.
* src/NSConcreteNumber [-copy]: Removed.
[-copyWithZone:]: Likewise.
* src/NSNumber: [-copy]: Implement
[-copyWithZone:]: Likewise.
* src/NSDate.m [-copyWithZone:]: Correct implementation.
* src/NSException.m [-copyWithZone:]: Likewise.
* src/NSPort.m: [-copyWithZone:]: Likewise.
* src/NSValue.m: [-copyWithZone:]: Likewise.
Tue Jul 21 09:15:32 1998 Adam Fedor <fedor@ultra.doc.com> Tue Jul 21 09:15:32 1998 Adam Fedor <fedor@ultra.doc.com>
* src/GNUmakefile: Removed redundant classes. * src/GNUmakefile: Removed redundant classes.

View file

@ -10,6 +10,12 @@
@itemize @bullet @itemize @bullet
@item Implement Formatter classes (NSDateFormatter, etc) [5] (980722).
@item Check that every class implements coding (correctly). [2, NSCoder] (980721).
@item Check that every class implements copying (correctly) - i.e. non-mutable classes should just retain, etc. [1, NSCopying] (980721).
@item Implement [NSDeserializer +deserializePropertyListLazilyFromData:atCursor:length:mutableContainers:] @item Implement [NSDeserializer +deserializePropertyListLazilyFromData:atCursor:length:mutableContainers:]
[3 NSProxy] (980712) [3 NSProxy] (980712)

View file

@ -460,7 +460,6 @@ unicode/decomp.h \
unicode/nextstep.h unicode/nextstep.h
HEADERS_INSTALL = $(GNU_HEADERS) \ HEADERS_INSTALL = $(GNU_HEADERS) \
$(NEXTSTEP_HEADERS) \
$(BASE_HEADERS) $(BASE_HEADERS)
DIST_FILES = \ DIST_FILES = \
@ -470,11 +469,6 @@ DIST_FILES = \
$(GNU_MFILES) \ $(GNU_MFILES) \
$(GNU_CFILES) \ $(GNU_CFILES) \
$(GNU_OTHER_SRCFILES) \ $(GNU_OTHER_SRCFILES) \
$(NEXTSTEP_MFILES) \
$(NEXTSTEP_CFILES) \
$(NEXTSTEP_DERIVED_CFILES) \
$(NEXTSTEP_HEADERS) \
$(NEXTSTEP_OTHER_SRCFILES) \
$(BASE_MFILES) \ $(BASE_MFILES) \
$(BASE_CFILES) \ $(BASE_CFILES) \
$(BASE_OTHER_SRCFILES) \ $(BASE_OTHER_SRCFILES) \
@ -490,17 +484,16 @@ include/o_map.h \
$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/config.h $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/config.h
# The C source files to be compiled # The C source files to be compiled
libgnustep-base_C_FILES = $(GNU_CFILES) $(NEXTSTEP_CFILES) \ libgnustep-base_C_FILES = $(GNU_CFILES) $(BASE_CFILES)
$(NEXTSTEP_DERIVED_CFILES) $(BASE_CFILES)
# The Objective-C source files to be compiled # The Objective-C source files to be compiled
libgnustep-base_OBJC_FILES = $(GNU_MFILES) $(NEXTSTEP_MFILES) \ libgnustep-base_OBJC_FILES = $(GNU_MFILES) \
$(BASE_MFILES) $(NSVALUE_MFILES) $(NSNUMBER_MFILES) $(BASE_MFILES) $(NSVALUE_MFILES) $(NSNUMBER_MFILES)
libgnustep-base_HEADER_FILES_DIR = . libgnustep-base_HEADER_FILES_DIR = .
libgnustep-base_HEADER_FILES_INSTALL_DIR = /gnustep libgnustep-base_HEADER_FILES_INSTALL_DIR = /gnustep
libgnustep-base_HEADER_FILES = $(NEXTSTEP_HEADERS) $(BASE_HEADERS) libgnustep-base_HEADER_FILES = $(BASE_HEADERS)
-include Makefile.preamble -include Makefile.preamble

View file

@ -64,5 +64,4 @@ ADDITIONAL_LIB_DIRS =
# Additional directories to be created during installation # Additional directories to be created during installation
ADDITIONAL_INSTALL_DIRS = $(GNUSTEP_HEADERS)/gnustep/base \ ADDITIONAL_INSTALL_DIRS = $(GNUSTEP_HEADERS)/gnustep/base \
$(GNUSTEP_HEADERS)/gnustep/Foundation \ $(GNUSTEP_HEADERS)/gnustep/Foundation \
$(GNUSTEP_HEADERS)/gnustep/objc \
$(GNUSTEP_HEADERS)/gnustep/unicode \ $(GNUSTEP_HEADERS)/gnustep/unicode \

View file

@ -46,23 +46,6 @@
#include <sys/param.h> /* Needed by sys/stat */ #include <sys/param.h> /* Needed by sys/stat */
#endif #endif
/* Deal with strchr: */
#if STDC_HEADERS || HAVE_STRING_H
#include <string.h>
/* An ANSI string.h and pre-ANSI memory.h might conflict. */
#if !STDC_HEADERS && HAVE_MEMORY_H
#include <memory.h>
#endif /* not STDC_HEADERS and HAVE_MEMORY_H */
#define rindex strrchr
#define index strchr
#define bcopy(s, d, n) memcpy ((d), (s), (n))
#define bcmp(s1, s2, n) memcmp ((s1), (s2), (n))
#define bzero(s, n) memset ((s), 0, (n))
#else /* not STDC_HEADERS and not HAVE_STRING_H */
#include <strings.h>
/* memory.h and strings.h conflict on some systems. */
#endif /* not STDC_HEADERS and not HAVE_STRING_H */
/* For DIR and diropen() */ /* For DIR and diropen() */
#if HAVE_DIRENT_H #if HAVE_DIRENT_H
# include <dirent.h> # include <dirent.h>

View file

@ -304,21 +304,6 @@
return [super isEqual: o]; return [super isEqual: o];
} }
- (id) copy
{
return [self copyWithZone: NSDefaultMallocZone()];
}
- copyWithZone: (NSZone*)zone
{
if (NSShouldRetainWithZone(self, zone)) {
return [self retain];
}
else {
return NSCopyObject(self, 0, zone);
}
}
- (NSString *)descriptionWithLocale: (NSDictionary*)locale - (NSString *)descriptionWithLocale: (NSDictionary*)locale
{ {
return [NSString stringWithFormat:TYPE_FORMAT, data]; return [NSString stringWithFormat:TYPE_FORMAT, data];

View file

@ -154,7 +154,7 @@
if (NSShouldRetainWithZone(self, zone)) if (NSShouldRetainWithZone(self, zone))
return [self retain]; return [self retain];
else else
return [super copyWithZone: zone]; return NSCopyObject(self, 0, zone);
} }
- (Class) classForConnectedCoder: aRmc - (Class) classForConnectedCoder: aRmc

View file

@ -166,7 +166,7 @@ _NSFoundationUncaughtExceptionHandler(NSException *exception)
if (NSShouldRetainWithZone(self, zone)) if (NSShouldRetainWithZone(self, zone))
return [self retain]; return [self retain];
else else
return [[super copyWithZone:zone] deepen]; return [NSCopyObject(self, 0, zone) deepen];
} }

View file

@ -23,6 +23,7 @@
#include <config.h> #include <config.h>
#include <Foundation/NSNotification.h> #include <Foundation/NSNotification.h>
#include <Foundation/NSString.h>
@implementation NSNotification @implementation NSNotification

View file

@ -23,7 +23,7 @@
#include <config.h> #include <config.h>
#include <Foundation/NSNotification.h> #include <Foundation/NSNotification.h>
#include <gnustep/base/Notification.h> #include <gnustep/base/NotificationDispatcher.h>
#include <gnustep/base/behavior.h> #include <gnustep/base/behavior.h>
@implementation NSNotificationCenter @implementation NSNotificationCenter

View file

@ -262,14 +262,17 @@
- (id) copy - (id) copy
{ {
[self subclassResponsibility:_cmd]; return [self retain];
return nil;
} }
- copyWithZone: (NSZone*)zone - copyWithZone: (NSZone*)zone
{ {
[self subclassResponsibility:_cmd]; if (NSShouldRetainWithZone(self, zone)) {
return nil; return [self retain];
}
else {
return NSCopyObject(self, 0, zone);
}
} }
- (NSString*) description - (NSString*) description

View file

@ -46,7 +46,7 @@ NSString *NSPortTimeoutException
- copyWithZone: (NSZone*)aZone - copyWithZone: (NSZone*)aZone
{ {
return [super copyWithZone:aZone]; return NSCopyObject(self, 0, zone);
} }
- delegate - delegate
@ -56,7 +56,6 @@ NSString *NSPortTimeoutException
- (void) encodeWithCoder: (NSCoder*)aCoder - (void) encodeWithCoder: (NSCoder*)aCoder
{ {
[super encodeWithCoder: aCoder];
} }
- init - init
@ -67,7 +66,6 @@ NSString *NSPortTimeoutException
- initWithCoder: (NSCoder*)aCoder - initWithCoder: (NSCoder*)aCoder
{ {
self = [super initWithCoder: aCoder];
return self; return self;
} }

View file

@ -90,7 +90,7 @@
- (id)copy - (id)copy
{ {
return [self copyWithZone: NSDefaultMallocZone()]; return [self retain];
} }
- (id)copyWithZone:(NSZone *)zone - (id)copyWithZone:(NSZone *)zone
@ -98,7 +98,7 @@
if (NSShouldRetainWithZone(self, zone)) if (NSShouldRetainWithZone(self, zone))
return [self retain]; return [self retain];
else else
return [[super copyWithZone:zone] deepen]; return [NSCopyObject(self, 0, zone) deepen];
} }
/* Returns the concrete class associated with the type encoding */ /* Returns the concrete class associated with the type encoding */

View file

@ -558,7 +558,7 @@ static NotificationDispatcher *default_notification_dispatcher = nil;
- (void) postNotification: notification - (void) postNotification: notification
{ {
id notification_name = [notification name]; id notification_name = [(NSNotification *)notification name];
id notification_object = [notification object]; id notification_object = [notification object];
id nr; id nr;
LinkedList *nr_list; LinkedList *nr_list;