diff --git a/ChangeLog b/ChangeLog index 2508cfd52..ba5a7f6c4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,139 @@ +2001-12-17 Richard Frith-Macdonald + + * Headers/gnustep/base/GSMime.h: Updates for autogsdoc + * Headers/gnustep/base/GSXML.h: ditto + * Headers/gnustep/base/NSArray.h: ditto + * Headers/gnustep/base/NSAttributedString.h: ditto + * Headers/gnustep/base/NSAutoreleasePool.h: ditto + * Headers/gnustep/base/NSCalendarDate.h: ditto + * Headers/gnustep/base/NSCharacterSet.h: ditto + * Headers/gnustep/base/NSCoder.h: ditto + * Headers/gnustep/base/NSConnection.h: ditto + * Headers/gnustep/base/NSData.h: ditto + * Headers/gnustep/base/NSDate.h: ditto + * Headers/gnustep/base/NSDistantObject.h: ditto + * Headers/gnustep/base/NSDistributedNotificationCenter.h: ditto + * Headers/gnustep/base/NSInvocation.h: ditto + * Headers/gnustep/base/NSLock.h: ditto + * Headers/gnustep/base/NSMethodSignature.h: ditto + * Headers/gnustep/base/NSNotification.h: ditto + * Headers/gnustep/base/NSObject.h: ditto + * Headers/gnustep/base/NSProxy.h: ditto + * Headers/gnustep/base/NSRunLoop.h: ditto + * Headers/gnustep/base/NSSet.h: ditto + * Headers/gnustep/base/NSTimeZone.h: ditto + * Headers/gnustep/base/NSTimer.h: ditto + * Headers/gnustep/base/NSURL.h: ditto + * Headers/gnustep/base/NSUndoManager.h: ditto + * Headers/gnustep/base/NSUserDefaults.h: ditto + * Headers/gnustep/base/NSValue.h: ditto + * Source/GSArray.m: ditto + * Source/GSAttributedString.m: ditto + * Source/GSCompatibility.m: ditto + * Source/GSCountedSet.m: ditto + * Source/GSDictionary.m: ditto + * Source/GSFFCallInvocation.m: ditto + * Source/GSFFIInvocation.m: ditto + * Source/GSFormat.m: ditto + * Source/GSHTTPURLHandle.m: ditto + * Source/GSLocale.m: ditto + * Source/GSMime.m: ditto + * Source/GSSet.m: ditto + * Source/GSString.m: ditto + * Source/GSTcpPort.m: ditto + * Source/GSUnixSSLHandle.m: ditto + * Source/GSValue.m: ditto + * Source/GSXML.m: ditto + * Source/NSArchiver.m: ditto + * Source/NSArray.m: ditto + * Source/NSAssertionHandler.m: ditto + * Source/NSAttributedString.m: ditto + * Source/NSAutoreleasePool.m: ditto + * Source/NSBitmapCharSet.m: ditto + * Source/NSBundle.m: ditto + * Source/NSCalendarDate.m: ditto + * Source/NSCallBacks.m: ditto + * Source/NSCharacterSet.m: ditto + * Source/NSClassDescription.m: ditto + * Source/NSCoder.m: ditto + * Source/NSConnection.m: ditto + * Source/NSCopyObject.m: ditto + * Source/NSCountedSet.m: ditto + * Source/NSData.m: ditto + * Source/NSDate.m: ditto + * Source/NSDateFormatter.m: ditto + * Source/NSDebug.m: ditto + * Source/NSDecimal.m: ditto + * Source/NSDecimalNumber.m: ditto + * Source/NSDictionary.m: ditto + * Source/NSDistantObject.m: ditto + * Source/NSDistributedLock.m: ditto + * Source/NSDistributedNotificationCenter.m: ditto + * Source/NSEnumerator.m: ditto + * Source/NSException.m: ditto + * Source/NSFileHandle.m: ditto + * Source/NSFileManager.m: ditto + * Source/NSFormatter.m: ditto + * Source/NSGeometry.m: ditto + * Source/NSHashTable.m: ditto + * Source/NSHost.m: ditto + * Source/NSInvocation.m: ditto + * Source/NSLock.m: ditto + * Source/NSLog.m: ditto + * Source/NSMapTable.m: ditto + * Source/NSMethodSignature.m: ditto + * Source/NSNotification.m: ditto + * Source/NSNotificationCenter.m: ditto + * Source/NSNotificationQueue.m: ditto + * Source/NSNull.m: ditto + * Source/NSNumber.m: ditto + * Source/NSNumberFormatter.m: ditto + * Source/NSObjCRuntime.m: ditto + * Source/NSPage.m: ditto + * Source/NSPipe.m: ditto + * Source/NSPort.m: ditto + * Source/NSPortCoder.m: ditto + * Source/NSPortMessage.m: ditto + * Source/NSPortNameServer.m: ditto + * Source/NSProcessInfo.m: ditto + * Source/NSProtocolChecker.m: ditto + * Source/NSProxy.m: ditto + * Source/NSRange.m: ditto + * Source/NSRunLoop.m: ditto + * Source/NSScanner.m: ditto + * Source/NSSerializer.m: ditto + * Source/NSSet.m: ditto + * Source/NSString.m: ditto + * Source/NSTask.m: ditto + * Source/NSThread.m: ditto + * Source/NSTimeZone.m: ditto + * Source/NSTimer.m: ditto + * Source/NSURL.m: ditto + * Source/NSURLHandle.m: ditto + * Source/NSUnarchiver.m: ditto + * Source/NSUndoManager.m: ditto + * Source/NSUser.m: ditto + * Source/NSUserDefaults.m: ditto + * Source/NSValue.m: ditto + * Source/NSZone.m: ditto + * Source/Unicode.m: ditto + * Source/UnixFileHandle.m: ditto + * Source/WindowsFileHandle.m: ditto + * Source/behavior.m: ditto + * Source/callframe.m: ditto + * Source/cifframe.m: ditto + * Source/externs.m: ditto + * Source/libgnustep-base-entry.m: ditto + * Source/mframe.m: ditto + * Source/o_array.m: ditto + * Tools/AGSParser.m: ditto + Ensure that initial comments in source code are sutogsdoc comments + so copyright and author information will be used. + Fix inconsistencies between arguments in headers and source files. + Fix various bugs exposed by autogsdoc ... mostly cases where there + is a semicolon after a method name in a method implementation + (this is illegal, but the gcc compiler currently ignores it). + 2001-12-17 Richard Frith-Macdonald * Tools/AGSHtml.m: Provide list of methods in each class. @@ -6,7 +142,8 @@ * Tools/AGSOutput.m: Support (name) syntax for specifying a protocol cross reference using [(name)-method] * Tools/autogsdoc.m: Improve documentation of method references. - * Tools/AGSparser.m: Handle @class statements. + * Tools/AGSparser.m: Handle @class statements. Improve standardisation + of the format of types. 2001-12-16 Richard Frith-Macdonald diff --git a/Headers/gnustep/base/GSMime.h b/Headers/gnustep/base/GSMime.h index 6a2f944cc..3c474fdde 100644 --- a/Headers/gnustep/base/GSMime.h +++ b/Headers/gnustep/base/GSMime.h @@ -59,15 +59,15 @@ + (GSMimeDocument*) mimeDocument; -- (BOOL) addHeader: (NSDictionary*)headerInfo; +- (BOOL) addHeader: (NSDictionary*)info; - (NSArray*) allHeaders; - (id) content; -- (void) deleteHeader: (NSString*)rawHeader; -- (void) deleteHeaderNamed: (NSString*)aName; +- (void) deleteHeader: (NSString*)aHeader; +- (void) deleteHeaderNamed: (NSString*)name; - (NSDictionary*) headerNamed: (NSString*)name; - (NSArray*) headersNamed: (NSString*)name; - (BOOL) setContent: (id)newContent; -- (BOOL) setHeader: (NSDictionary*)headerInfo; +- (BOOL) setHeader: (NSDictionary*)info; @end @@ -92,25 +92,25 @@ + (GSMimeParser*) mimeParser; -- (GSMimeCodingContext*) contextFor: (NSDictionary*)headerInfo; +- (GSMimeCodingContext*) contextFor: (NSDictionary*)info; - (NSData*) data; - (BOOL) decodeData: (NSData*)sData fromRange: (NSRange)aRange intoData: (NSMutableData*)dData - withContext: (GSMimeCodingContext*)ctxt; + withContext: (GSMimeCodingContext*)con; - (GSMimeDocument*) document; - (BOOL) isComplete; - (BOOL) isInBody; - (BOOL) isInHeaders; -- (BOOL) parse: (NSData*)input; -- (BOOL) parseHeader: (NSString*)aRawHeader; +- (BOOL) parse: (NSData*)d; +- (BOOL) parseHeader: (NSString*)aHeader; - (BOOL) parsedHeaders; -- (BOOL) scanHeader: (NSScanner*)aScanner - named: (NSString*)headerName +- (BOOL) scanHeader: (NSScanner*)scanner + named: (NSString*)name inTo: (NSMutableDictionary*)info; -- (BOOL) scanPastSpace: (NSScanner*)aScanner; -- (NSString*) scanSpecial: (NSScanner*)aScanner; -- (NSString*) scanToken: (NSScanner*)aScanner; +- (BOOL) scanPastSpace: (NSScanner*)scanner; +- (NSString*) scanSpecial: (NSScanner*)scanner; +- (NSString*) scanToken: (NSScanner*)scanner; @end diff --git a/Headers/gnustep/base/GSXML.h b/Headers/gnustep/base/GSXML.h index 9059b89ca..71075d3cf 100644 --- a/Headers/gnustep/base/GSXML.h +++ b/Headers/gnustep/base/GSXML.h @@ -80,12 +80,12 @@ BOOL native; } -+ (NSString*) descriptionFromType: (int)t; ++ (NSString*) descriptionFromType: (int)type; + (GSXMLNamespace*) namespaceWithNode: (GSXMLNode*)node href: (NSString*)href prefix: (NSString*)prefix; + (GSXMLNamespace*) namespaceFrom: (void*)data; -+ (int) typeFromDescription: (NSString*)d; ++ (int) typeFromDescription: (NSString*)desc; - (id) initWithNode: (GSXMLNode*)node href: (NSString*)href @@ -109,10 +109,10 @@ BOOL native; } -+ (NSString*) descriptionFromType: (int)t; ++ (NSString*) descriptionFromType: (int)type; + (GSXMLNode*) nodeWithNamespace: (GSXMLNamespace*)ns name: (NSString*)name; + (GSXMLNode*) nodeFrom: (void*) data; -+ (int) typeFromDescription: (NSString*)d; ++ (int) typeFromDescription: (NSString*)desc; - (id) initWithNamespace: (GSXMLNamespace*)ns name: (NSString*)name; - (id) initFrom: (void*) data; @@ -151,12 +151,12 @@ { } -+ (NSString*) descriptionFromType: (int)t; ++ (NSString*) descriptionFromType: (int)type; + (GSXMLAttribute*) attributeWithNode: (GSXMLNode*)node name: (NSString*)name value: (NSString*)value; + (GSXMLAttribute*) attributeFrom: (void*)data; -+ (int) typeFromDescription: (NSString*)d; ++ (int) typeFromDescription: (NSString*)desc; - (id) initWithNode: (GSXMLNode*)node name: (NSString*)name @@ -180,8 +180,7 @@ void *lib; /* parser context */ GSSAXHandler *saxHandler; } -+ (NSString*) loadEntity: (NSString*)publicId - at: (NSString*)locationURL; ++ (NSString*) loadEntity: (NSString*)publicId at: (NSString*)location; + (GSXMLParser*) parser; + (GSXMLParser*) parserWithContentsOfFile: (NSString*)path; + (GSXMLParser*) parserWithContentsOfURL: (NSURL*)url; diff --git a/Headers/gnustep/base/NSArray.h b/Headers/gnustep/base/NSArray.h index ee8be7a4e..0b78c1dd6 100644 --- a/Headers/gnustep/base/NSArray.h +++ b/Headers/gnustep/base/NSArray.h @@ -36,22 +36,22 @@ + (id) arrayWithArray: (NSArray*)array; + (id) arrayWithContentsOfFile: (NSString*)file; + (id) arrayWithObject: (id)anObject; -+ (id) arrayWithObjects: (id)firstObj, ...; ++ (id) arrayWithObjects: (id)firstObject, ...; + (id) arrayWithObjects: (id*)objects count: (unsigned)count; - (NSArray*) arrayByAddingObject: (id)anObject; - (NSArray*) arrayByAddingObjectsFromArray: (NSArray*)anotherArray; - (BOOL) containsObject: anObject; - (unsigned) count; // Primitive -- (void) getObjects: (id*)objs; -- (void) getObjects: (id*)objs range: (NSRange)aRange; +- (void) getObjects: (id*)aBuffer; +- (void) getObjects: (id*)aBuffer range: (NSRange)aRange; - (unsigned) indexOfObject: (id)anObject; - (unsigned) indexOfObject: (id)anObject inRange: (NSRange)aRange; - (unsigned) indexOfObjectIdenticalTo: (id)anObject; - (unsigned) indexOfObjectIdenticalTo: (id)anObject inRange: (NSRange)aRange; - (id) initWithArray: (NSArray*)array; - (id) initWithContentsOfFile: (NSString*)file; -- (id) initWithObjects: firstObj, ...; +- (id) initWithObjects: firstObject, ...; - (id) initWithObjects: (id*)objects count: (unsigned)count; // Primitive - (id) lastObject; @@ -66,7 +66,7 @@ #endif #ifndef STRICT_OPENSTEP - (void) makeObjectsPerformSelector: (SEL)aSelector; -- (void) makeObjectsPerformSelector: (SEL)aSelector withObject: (id)argument; +- (void) makeObjectsPerformSelector: (SEL)aSelector withObject: (id)arg; #endif - (NSData*) sortedArrayHint; @@ -76,7 +76,7 @@ context: (void*)context hint: (NSData*)hint; - (NSArray*) sortedArrayUsingSelector: (SEL)comparator; -- (NSArray*) subarrayWithRange: (NSRange)range; +- (NSArray*) subarrayWithRange: (NSRange)aRange; - (NSString*) componentsJoinedByString: (NSString*)separator; - (NSArray*) pathsMatchingExtensions: (NSArray*)extensions; @@ -127,7 +127,7 @@ - (void) sortUsingFunction: (int(*)(id,id,void*))compare context: (void*)context; -- (void) sortUsingSelector: (SEL) aSelector; +- (void) sortUsingSelector: (SEL)comparator; @end diff --git a/Headers/gnustep/base/NSAttributedString.h b/Headers/gnustep/base/NSAttributedString.h index fdf541909..38eff2c1c 100644 --- a/Headers/gnustep/base/NSAttributedString.h +++ b/Headers/gnustep/base/NSAttributedString.h @@ -63,19 +63,19 @@ - (id) initWithString: (NSString*)aString attributes: (NSDictionary*)attributes; //Retrieving character information -- (unsigned) length; +- (unsigned int) length; - (NSString*) string; //Primitive method! //Retrieving attribute information -- (NSDictionary*) attributesAtIndex: (unsigned)index +- (NSDictionary*) attributesAtIndex: (unsigned int)index effectiveRange: (NSRange*)aRange; //Primitive method! -- (NSDictionary*) attributesAtIndex: (unsigned)index +- (NSDictionary*) attributesAtIndex: (unsigned int)index longestEffectiveRange: (NSRange*)aRange inRange: (NSRange)rangeLimit; - (id) attribute: (NSString*)attributeName - atIndex: (unsigned)index + atIndex: (unsigned int)index effectiveRange: (NSRange*)aRange; -- (id) attribute: (NSString*)attributeName atIndex: (unsigned)index +- (id) attribute: (NSString*)attributeName atIndex: (unsigned int)index longestEffectiveRange: (NSRange*)aRange inRange: (NSRange)rangeLimit; //Comparing attributed strings @@ -114,7 +114,7 @@ //Changing characters and attributes - (void) appendAttributedString: (NSAttributedString*)attributedString; - (void) insertAttributedString: (NSAttributedString*)attributedString - atIndex: (unsigned)index; + atIndex: (unsigned int)index; - (void) replaceCharactersInRange: (NSRange)aRange withAttributedString: (NSAttributedString*)attributedString; - (void) replaceCharactersInRange: (NSRange)aRange diff --git a/Headers/gnustep/base/NSAutoreleasePool.h b/Headers/gnustep/base/NSAutoreleasePool.h index f7af7998c..9ac5dfa57 100644 --- a/Headers/gnustep/base/NSAutoreleasePool.h +++ b/Headers/gnustep/base/NSAutoreleasePool.h @@ -85,8 +85,8 @@ struct autorelease_array_list void (*_addImp)(id, SEL, id); } -+ (void) addObject: (id)anObject; -- (void) addObject: (id)anObject; ++ (void) addObject: (id)anObj; +- (void) addObject: (id)anObj; #ifndef NO_GNUSTEP + (void) enableRelease: (BOOL)enable; diff --git a/Headers/gnustep/base/NSCalendarDate.h b/Headers/gnustep/base/NSCalendarDate.h index dd8cc4038..ba6bc7d03 100644 --- a/Headers/gnustep/base/NSCalendarDate.h +++ b/Headers/gnustep/base/NSCalendarDate.h @@ -53,8 +53,8 @@ - (id) initWithString: (NSString*)description calendarFormat: (NSString*)format; - (id) initWithString: (NSString*)description - calendarFormat: (NSString*)format - locale: (NSDictionary*)dictionary; + calendarFormat: (NSString*)fmt + locale: (NSDictionary*)locale; - (id) initWithYear: (int)year month: (unsigned int)month day: (unsigned int)day diff --git a/Headers/gnustep/base/NSCharacterSet.h b/Headers/gnustep/base/NSCharacterSet.h index 89349e0d4..7deb6e684 100644 --- a/Headers/gnustep/base/NSCharacterSet.h +++ b/Headers/gnustep/base/NSCharacterSet.h @@ -55,7 +55,7 @@ - (NSCharacterSet*) invertedSet; #ifndef STRICT_MACOS_X -+ (NSCharacterSet*) characterSetWithContentsOfFile: (NSString*)file; ++ (NSCharacterSet*) characterSetWithContentsOfFile: (NSString*)aFile; #endif @end diff --git a/Headers/gnustep/base/NSCoder.h b/Headers/gnustep/base/NSCoder.h index 96b2ce134..2d9cd806a 100644 --- a/Headers/gnustep/base/NSCoder.h +++ b/Headers/gnustep/base/NSCoder.h @@ -38,7 +38,7 @@ at: (const void*)array; - (void) encodeBycopyObject: (id)anObject; - (void) encodeByrefObject: (id)anObject; -- (void) encodeBytes: (void*)addr length: (unsigned)l; +- (void) encodeBytes: (void*)d length: (unsigned)l; - (void) encodeConditionalObject: (id)anObject; - (void) encodeDataObject: (NSData*)data; - (void) encodeObject: (id)anObject; diff --git a/Headers/gnustep/base/NSConnection.h b/Headers/gnustep/base/NSConnection.h index 1112fa141..3ed0d3bc8 100644 --- a/Headers/gnustep/base/NSConnection.h +++ b/Headers/gnustep/base/NSConnection.h @@ -106,14 +106,14 @@ GS_EXPORT NSString *NSConnectionProxyCount; /* Objects received */ usingNameServer: (NSPortNameServer*)s; + (id) currentConversation; + (NSConnection*) defaultConnection; -+ (NSDistantObject*) rootProxyForConnectionWithRegisteredName: (NSString*)name - host: (NSString*)host; -+ (NSDistantObject*) rootProxyForConnectionWithRegisteredName: (NSString*)name - host: (NSString*)host usingNameServer: (NSPortNameServer*)s; ++ (NSDistantObject*) rootProxyForConnectionWithRegisteredName: (NSString*)n + host: (NSString*)h; ++ (NSDistantObject*) rootProxyForConnectionWithRegisteredName: (NSString*)n + host: (NSString*)h usingNameServer: (NSPortNameServer*)s; - (void) addRequestMode: (NSString*)mode; -- (void) addRunLoop: (NSRunLoop*)runloop; +- (void) addRunLoop: (NSRunLoop*)loop; - (id) delegate; - (void) enableMultipleThreads; - (BOOL) independentConversationQueueing; @@ -128,7 +128,7 @@ GS_EXPORT NSString *NSConnectionProxyCount; /* Objects received */ - (BOOL) registerName: (NSString*)name withNameServer: (NSPortNameServer*)svr; - (NSArray*) remoteObjects; - (void) removeRequestMode: (NSString*)mode; -- (void) removeRunLoop: (NSRunLoop *)runloop; +- (void) removeRunLoop: (NSRunLoop *)loop; - (NSTimeInterval) replyTimeout; - (NSArray*) requestModes; - (NSTimeInterval) requestTimeout; @@ -138,9 +138,9 @@ GS_EXPORT NSString *NSConnectionProxyCount; /* Objects received */ - (NSPort*) sendPort; - (void) setDelegate: anObj; - (void) setIndependentConversationQueueing: (BOOL)flag; -- (void) setReplyTimeout: (NSTimeInterval)seconds; +- (void) setReplyTimeout: (NSTimeInterval)to; - (void) setRequestMode: (NSString*)mode; -- (void) setRequestTimeout: (NSTimeInterval)seconds; +- (void) setRequestTimeout: (NSTimeInterval)to; - (void) setRootObject: anObj; - (NSDictionary*) statistics; @end @@ -152,14 +152,14 @@ GS_EXPORT NSString *NSConnectionProxyCount; /* Objects received */ */ @interface NSConnection (GNUstepExtensions) -+ (NSConnection*) newRegisteringAtName: (NSString*)n ++ (NSConnection*) newRegisteringAtName: (NSString*)name withRootObject: (id)anObject; - (void) gcFinalize; - (retval_t) forwardForProxy: (NSDistantObject*)object selector: (SEL)sel - argFrame: (arglist_t)frame; + argFrame: (arglist_t)argframe; - (void) forwardInvocation: (NSInvocation *)inv forProxy: (NSDistantObject*)object; - (const char *) typeForSelector: (SEL)sel remoteTarget: (unsigned)target; diff --git a/Headers/gnustep/base/NSData.h b/Headers/gnustep/base/NSData.h index a12091f4c..fae036689 100644 --- a/Headers/gnustep/base/NSData.h +++ b/Headers/gnustep/base/NSData.h @@ -47,10 +47,10 @@ + (id) dataWithContentsOfURL: (NSURL*)url; #endif + (id) dataWithData: (NSData*)data; -- (id) initWithBytes: (const void*)bytes - length: (unsigned int)length; -- (id) initWithBytesNoCopy: (void*)bytes - length: (unsigned int)length; +- (id) initWithBytes: (const void*)aBuffer + length: (unsigned int)bufferSize; +- (id) initWithBytesNoCopy: (void*)aBuffer + length: (unsigned int)bufferSize; - (id) initWithContentsOfFile: (NSString*)path; - (id) initWithContentsOfMappedFile: (NSString*)path; #ifndef STRICT_OPENSTEP @@ -90,7 +90,7 @@ atCursor: (unsigned int*)cursor context: (id )callback; - (int) deserializeIntAtCursor: (unsigned int*)cursor; -- (int) deserializeIntAtIndex: (unsigned int)location; +- (int) deserializeIntAtIndex: (unsigned int)index; - (void) deserializeInts: (int*)intBuffer count: (unsigned int)numInts atCursor: (unsigned int*)cursor; @@ -173,9 +173,9 @@ #define _GSC_CID 0x17 /* Class encoded as id */ @interface NSData (GNUstepExtensions) -+ (id) dataWithShmID: (int)anID length: (unsigned) length; -+ (id) dataWithSharedBytes: (const void*)bytes length: (unsigned) length; -+ (id) dataWithStaticBytes: (const void*)bytes length: (unsigned) length; ++ (id) dataWithShmID: (int)anID length: (unsigned int) length; ++ (id) dataWithSharedBytes: (const void*)bytes length: (unsigned int) length; ++ (id) dataWithStaticBytes: (const void*)bytes length: (unsigned int) length; /* * -deserializeTypeTag:andCrossRef:atCursor: @@ -183,8 +183,8 @@ * NSUnarchiver maximum possible performance. */ - (void) deserializeTypeTag: (unsigned char*)tag - andCrossRef: (unsigned int*)xref - atCursor: (unsigned*)cursor; + andCrossRef: (unsigned int*)ref + atCursor: (unsigned int*)cursor; @end #endif @@ -198,13 +198,13 @@ // Adjusting Capacity - (void) increaseLengthBy: (unsigned int)extraLength; -- (void) setLength: (unsigned int)length; +- (void) setLength: (unsigned int)size; - (void*) mutableBytes; // Appending Data -- (void) appendBytes: (const void*)bytes - length: (unsigned int)length; +- (void) appendBytes: (const void*)aBuffer + length: (unsigned int)bufferSize; - (void) appendData: (NSData*)other; // Modifying Data @@ -222,12 +222,12 @@ context: (id )callback; - (void) serializeInt: (int)value; - (void) serializeInt: (int)value - atIndex: (unsigned int)location; + atIndex: (unsigned int)index; - (void) serializeInts: (int*)intBuffer count: (unsigned int)numInts; - (void) serializeInts: (int*)intBuffer count: (unsigned int)numInts - atIndex: (unsigned int)location; + atIndex: (unsigned int)index; @end @@ -250,7 +250,7 @@ */ - (void) serializeTypeTag: (unsigned char)tag; - (void) serializeTypeTag: (unsigned char)tag - andCrossRef: (unsigned)xref; + andCrossRef: (unsigned int)xref; @end #endif diff --git a/Headers/gnustep/base/NSDate.h b/Headers/gnustep/base/NSDate.h index aac87a314..aa415c424 100644 --- a/Headers/gnustep/base/NSDate.h +++ b/Headers/gnustep/base/NSDate.h @@ -68,7 +68,7 @@ typedef double NSTimeInterval; - (NSString*) description; - (NSString*) descriptionWithCalendarFormat: (NSString*)format timeZone: (NSTimeZone*)aTimeZone - locale: (NSDictionary*)localeDictionary; + locale: (NSDictionary*)l; - (NSString*) descriptionWithLocale: (NSDictionary*)locale; // Adding and getting intervals @@ -84,13 +84,13 @@ typedef double NSTimeInterval; - (NSComparisonResult) compare: (NSDate*)otherDate; - (NSDate*) earlierDate: (NSDate*)otherDate; -- (BOOL) isEqualToDate: (NSDate*)otherDate; +- (BOOL) isEqualToDate: (NSDate*)other; - (NSDate*) laterDate: (NSDate*)otherDate; #ifndef STRICT_OPENSTEP + (id) dateWithNaturalLanguageString: (NSString*)string; + (id) dateWithNaturalLanguageString: (NSString*)string - locale: (NSDictionary*)localeDictionary; + locale: (NSDictionary*)locale; - (id) initWithTimeIntervalSince1970: (NSTimeInterval)seconds; #endif diff --git a/Headers/gnustep/base/NSDistantObject.h b/Headers/gnustep/base/NSDistantObject.h index 58124a7c9..6f8f786b9 100644 --- a/Headers/gnustep/base/NSDistantObject.h +++ b/Headers/gnustep/base/NSDistantObject.h @@ -51,7 +51,7 @@ - (NSConnection*) connectionForProxy; - (id) initWithLocal: (id)anObject connection: (NSConnection*)aConnection; -- (id) initWithTarget: (unsigned)anObject +- (id) initWithTarget: (unsigned)target connection: (NSConnection*)aConnection; - (void) setProtocolForProxy: (Protocol*)aProtocol; diff --git a/Headers/gnustep/base/NSDistributedNotificationCenter.h b/Headers/gnustep/base/NSDistributedNotificationCenter.h index f6441c861..8b45700fb 100644 --- a/Headers/gnustep/base/NSDistributedNotificationCenter.h +++ b/Headers/gnustep/base/NSDistributedNotificationCenter.h @@ -71,7 +71,7 @@ GS_EXPORT NSString *NSLocalNotificationCenterType; - (void) removeObserver: (id)anObserver name: (NSString*)notificationName object: (NSString*)anObject; -- (void) setSuspended: (BOOL)suspended; +- (void) setSuspended: (BOOL)flag; - (BOOL) suspended; @end diff --git a/Headers/gnustep/base/NSInvocation.h b/Headers/gnustep/base/NSInvocation.h index 1047a9183..c5c393c99 100644 --- a/Headers/gnustep/base/NSInvocation.h +++ b/Headers/gnustep/base/NSInvocation.h @@ -45,7 +45,7 @@ /* * Creating instances. */ -+ (NSInvocation*) invocationWithMethodSignature: (NSMethodSignature*)signature; ++ (NSInvocation*) invocationWithMethodSignature: (NSMethodSignature*)_signature; /* * Accessing message elements. @@ -57,8 +57,8 @@ - (void) setArgument: (void*)buffer atIndex: (int)index; - (void) setReturnValue: (void*)buffer; -- (void) setSelector: (SEL)selector; -- (void) setTarget: (id)target; +- (void) setSelector: (SEL)aSelector; +- (void) setTarget: (id)anObject; - (id) target; /* @@ -71,7 +71,7 @@ * Dispatching an Invocation. */ - (void) invoke; -- (void) invokeWithTarget: (id)target; +- (void) invokeWithTarget: (id)anObject; /* * Getting the method signature. @@ -85,7 +85,7 @@ - (id) initWithArgframe: (arglist_t)frame selector: (SEL)aSelector; - (id) initWithMethodSignature: (NSMethodSignature*)aSignature; - (id) initWithSelector: (SEL)aSelector; -- (id) initWithTarget: target selector: (SEL)aSelector, ...; +- (id) initWithTarget: (id)anObject selector: (SEL)aSelector, ...; - (void*) returnFrame: (arglist_t)argFrame; - (BOOL) sendsToSuper; - (void) setSendsToSuper: (BOOL)flag; diff --git a/Headers/gnustep/base/NSLock.h b/Headers/gnustep/base/NSLock.h index 60bd9393f..5d30dd874 100644 --- a/Headers/gnustep/base/NSLock.h +++ b/Headers/gnustep/base/NSLock.h @@ -98,8 +98,8 @@ * Acquiring the lock with a date condition */ - (BOOL) lockBeforeDate: (NSDate*)limit; -- (BOOL) lockWhenCondition: (int)condition - beforeDate: (NSDate*)limit; +- (BOOL) lockWhenCondition: (int)condition_to_meet + beforeDate: (NSDate*)limitDate; - (void) lock; - (void) unlock; diff --git a/Headers/gnustep/base/NSMethodSignature.h b/Headers/gnustep/base/NSMethodSignature.h index 569cb3baa..23b4e815c 100644 --- a/Headers/gnustep/base/NSMethodSignature.h +++ b/Headers/gnustep/base/NSMethodSignature.h @@ -60,7 +60,7 @@ typedef struct { #endif } -+ (NSMethodSignature*) signatureWithObjCTypes: (const char*)types; ++ (NSMethodSignature*) signatureWithObjCTypes: (const char*)t; #ifndef STRICT_MACOS_X - (NSArgumentInfo) argumentInfoAtIndex: (unsigned)index; diff --git a/Headers/gnustep/base/NSNotification.h b/Headers/gnustep/base/NSNotification.h index 324c9494e..f9ea60ae3 100644 --- a/Headers/gnustep/base/NSNotification.h +++ b/Headers/gnustep/base/NSNotification.h @@ -44,7 +44,7 @@ + (NSNotification*) notificationWithName: (NSString*)name object: (id)object - userInfo: (NSDictionary*)user_info; + userInfo: (NSDictionary*)info; /* Querying a Notification Object */ diff --git a/Headers/gnustep/base/NSObject.h b/Headers/gnustep/base/NSObject.h index d02fa3fdd..390eeb928 100644 --- a/Headers/gnustep/base/NSObject.h +++ b/Headers/gnustep/base/NSObject.h @@ -120,7 +120,7 @@ - (NSString*) description; + (NSString*) description; -+ (void) poseAsClass: (Class)aClass; ++ (void) poseAsClass: (Class)aClassObject; - (void) doesNotRecognizeSelector: (SEL)aSelector; @@ -130,9 +130,9 @@ - (Class) classForArchiver; - (Class) classForCoder; - (Class) classForPortCoder; -- (id) replacementObjectForArchiver: (NSArchiver*)anEncoder; +- (id) replacementObjectForArchiver: (NSArchiver*)anArchiver; - (id) replacementObjectForCoder: (NSCoder*)anEncoder; -- (id) replacementObjectForPortCoder: (NSPortCoder*)anEncoder; +- (id) replacementObjectForPortCoder: (NSPortCoder*)aCoder; + (id) setVersion: (int)aVersion; diff --git a/Headers/gnustep/base/NSProxy.h b/Headers/gnustep/base/NSProxy.h index df9088542..e8f6a9014 100644 --- a/Headers/gnustep/base/NSProxy.h +++ b/Headers/gnustep/base/NSProxy.h @@ -35,7 +35,7 @@ } + (id) alloc; -+ (id) allocWithZone: (NSZone*)zone; ++ (id) allocWithZone: (NSZone*)z; + (Class) class; + (void) load; + (BOOL) respondsToSelector: (SEL)aSelector; diff --git a/Headers/gnustep/base/NSRunLoop.h b/Headers/gnustep/base/NSRunLoop.h index c453ae9c2..42e8297a5 100644 --- a/Headers/gnustep/base/NSRunLoop.h +++ b/Headers/gnustep/base/NSRunLoop.h @@ -48,7 +48,7 @@ GS_EXPORT NSString* const NSDefaultRunLoopMode; + (NSRunLoop*) currentRunLoop; - (void) acceptInputForMode: (NSString*)mode - beforeDate: (NSDate*)date; + beforeDate: (NSDate*)limit_date; - (void) addTimer: (NSTimer*)timer forMode: (NSString*)mode; @@ -62,7 +62,7 @@ GS_EXPORT NSString* const NSDefaultRunLoopMode; - (BOOL) runMode: (NSString*)mode beforeDate: (NSDate*)date; -- (void) runUntilDate: (NSDate*)limit_date; +- (void) runUntilDate: (NSDate*)date; @end @@ -133,16 +133,16 @@ typedef enum { + currentInstance; + (NSString*) currentMode; + (void) run; -+ (BOOL) runOnceBeforeDate: date; -+ (BOOL) runOnceBeforeDate: date ++ (BOOL) runOnceBeforeDate: (NSDate*)date; ++ (BOOL) runOnceBeforeDate: (NSDate*)date forMode: (NSString*)mode; -+ (void) runUntilDate: date; -+ (void) runUntilDate: date ++ (void) runUntilDate: (NSDate*)date; ++ (void) runUntilDate: (NSDate*)date forMode: (NSString*)mode; - (BOOL) runOnceBeforeDate: (NSDate*)date; - (BOOL) runOnceBeforeDate: (NSDate*)date forMode: (NSString*)mode; -- (void) runUntilDate: (NSDate*)limit_date +- (void) runUntilDate: (NSDate*)date forMode: (NSString*)mode; #endif /* diff --git a/Headers/gnustep/base/NSSet.h b/Headers/gnustep/base/NSSet.h index 3f80ae41e..5e57bbae2 100644 --- a/Headers/gnustep/base/NSSet.h +++ b/Headers/gnustep/base/NSSet.h @@ -31,29 +31,29 @@ @interface NSSet : NSObject + (id) set; -+ (id) setWithArray: (NSArray*)array; ++ (id) setWithArray: (NSArray*)objects; + (id) setWithObject: (id)anObject; -+ (id) setWithObjects: (id)anObject, ...; ++ (id) setWithObjects: (id)firstObject, ...; + (id) setWithSet: (NSSet*)aSet; - (NSArray*) allObjects; - (id) anyObject; - (BOOL) containsObject: (id)anObject; - (unsigned) count; -- (NSString*) descriptionWithLocale: (NSDictionary*)ld; +- (NSString*) descriptionWithLocale: (NSDictionary*)locale; -- (id) initWithArray: (NSArray*)array; -- (id) initWithObjects: (id)objects, ...; +- (id) initWithArray: (NSArray*)other; +- (id) initWithObjects: (id)firstObject, ...; - (id) initWithObjects: (id*)objects count: (unsigned)count; - (id) initWithObjects: firstObject rest: (va_list)ap; -- (id) initWithSet: (NSSet*)otherSet; -- (id) initWithSet: (NSSet*)otherSet copyItems: (BOOL)flags; +- (id) initWithSet: (NSSet*)other; +- (id) initWithSet: (NSSet*)other copyItems: (BOOL)flag; -- (BOOL) intersectsSet: (NSSet*)other; +- (BOOL) intersectsSet: (NSSet*)otherSet; - (BOOL) isEqualToSet: (NSSet*)other; -- (BOOL) isSubsetOfSet: (NSSet*)other; +- (BOOL) isSubsetOfSet: (NSSet*)otherSet; - (void) makeObjectsPerform: (SEL)aSelector; - (void) makeObjectsPerform: (SEL)aSelector withObject: (id)argument; diff --git a/Headers/gnustep/base/NSTimeZone.h b/Headers/gnustep/base/NSTimeZone.h index e4942fe6b..c0085c5e0 100644 --- a/Headers/gnustep/base/NSTimeZone.h +++ b/Headers/gnustep/base/NSTimeZone.h @@ -56,7 +56,7 @@ + (NSTimeZone*) systemTimeZone; + (NSTimeZone*) timeZoneWithName: (NSString*)name data: (NSData*)data; - (NSString*) abbreviation; -- (NSString*) abbreviationForDate: (NSDate*)aDate; +- (NSString*) abbreviationForDate: (NSDate*)when; - (id) initWithName: (NSString*)name; - (id) initWithName: (NSString*)name data: (NSData*)data; - (BOOL) isDaylightSavingTime; @@ -64,7 +64,7 @@ - (BOOL) isEqualToTimeZone: (NSTimeZone*)aTimeZone; - (NSString*) name; - (int) secondsFromGMT; -- (int) secondsFromGMTForDate: (NSDate*)aDate; +- (int) secondsFromGMTForDate: (NSDate*)when; #endif #ifndef STRICT_MACOS_X diff --git a/Headers/gnustep/base/NSTimer.h b/Headers/gnustep/base/NSTimer.h index 2d3bd86fd..534017e04 100644 --- a/Headers/gnustep/base/NSTimer.h +++ b/Headers/gnustep/base/NSTimer.h @@ -48,7 +48,7 @@ /* Creating timer objects. */ + (NSTimer*) scheduledTimerWithTimeInterval: (NSTimeInterval)ti - invocation: invocation + invocation: (NSInvocation*)invocation repeats: (BOOL)f; + (NSTimer*) scheduledTimerWithTimeInterval: (NSTimeInterval)ti target: object @@ -57,7 +57,7 @@ repeats: (BOOL)f; + (NSTimer*) timerWithTimeInterval: (NSTimeInterval)ti - invocation: invocation + invocation: (NSInvocation*)invocation repeats: (BOOL)f; + (NSTimer*) timerWithTimeInterval: (NSTimeInterval)ti target: object diff --git a/Headers/gnustep/base/NSURL.h b/Headers/gnustep/base/NSURL.h index ac46a3d0a..1bb6fdb78 100644 --- a/Headers/gnustep/base/NSURL.h +++ b/Headers/gnustep/base/NSURL.h @@ -37,31 +37,31 @@ GS_EXPORT NSString* NSURLFileScheme; //file NSURL *_baseURL; } -+ (id) fileURLWithPath: (NSString*)path; -+ (id) URLWithString: (NSString*)URLString; -+ (id) URLWithString: (NSString*)URLString - relativeToURL: (NSURL*)baseURL; ++ (id) fileURLWithPath: (NSString*)aPath; ++ (id) URLWithString: (NSString*)aUrlString; ++ (id) URLWithString: (NSString*)aUrlString + relativeToURL: (NSURL*)aBaseUrl; -- (id) initWithScheme: (NSString*)scheme - host: (NSString*)host - path: (NSString*)path; +- (id) initWithScheme: (NSString*)aScheme + host: (NSString*)aHost + path: (NSString*)aPath; //Non Standard Function -- (id) initWithScheme: (NSString*)scheme - host: (NSString*)host - port: (NSNumber*)port - path: (NSString*)path; +- (id) initWithScheme: (NSString*)aScheme + host: (NSString*)aHost + port: (NSNumber*)aPort + path: (NSString*)aPath; //Do a initWithScheme: NSFileScheme host: nil path: path -- (id) initFileURLWithPath: (NSString*)path; +- (id) initFileURLWithPath: (NSString*)aPath; // urlString is escaped -- (id) initWithString: (NSString*)URLString; +- (id) initWithString: (NSString*)aUrlString; //URLString!=nil ! // urlString is escaped -- (id) initWithString: (NSString*)URLString - relativeToURL: (NSURL*)baseURL; +- (id) initWithString: (NSString*)aUrlString + relativeToURL: (NSURL*)aBaseUrl; - (NSString*) description; - (NSString*) absoluteString; diff --git a/Headers/gnustep/base/NSUndoManager.h b/Headers/gnustep/base/NSUndoManager.h index ad0eddfee..49c655700 100644 --- a/Headers/gnustep/base/NSUndoManager.h +++ b/Headers/gnustep/base/NSUndoManager.h @@ -73,17 +73,17 @@ GS_EXPORT NSString *NSUndoManagerWillUndoChangeNotification; - (void) redo; - (NSString*) redoActionName; - (NSString*) redoMenuItemTitle; -- (NSString*) redoMenuTitleForUndoActionName: (NSString*)actionName; +- (NSString*) redoMenuTitleForUndoActionName: (NSString*)name; - (void) registerUndoWithTarget: (id)target selector: (SEL)aSelector object: (id)anObject; - (void) removeAllActions; - (void) removeAllActionsWithTarget: (id)target; - (NSArray*) runLoopModes; -- (void) setActionName: (NSString*)actionName; +- (void) setActionName: (NSString*)name; - (void) setGroupsByEvent: (BOOL)flag; - (void) setLevelsOfUndo: (unsigned)num; -- (void) setRunLoopModes: (NSArray*)modes; +- (void) setRunLoopModes: (NSArray*)newModes; - (void) undo; - (NSString*) undoActionName; - (NSString*) undoMenuItemTitle; diff --git a/Headers/gnustep/base/NSUserDefaults.h b/Headers/gnustep/base/NSUserDefaults.h index a95b0354a..fafbee0ab 100644 --- a/Headers/gnustep/base/NSUserDefaults.h +++ b/Headers/gnustep/base/NSUserDefaults.h @@ -184,7 +184,7 @@ GS_EXPORT NSString* const NSLocale; /* Making Advanced Use of Defaults */ - (NSDictionary*) dictionaryRepresentation; -- (void) registerDefaults: (NSDictionary*)dictionary; +- (void) registerDefaults: (NSDictionary*)newVals; @end #endif /* __NSUserDefaults_h_OBJECTS_INCLUDE */ diff --git a/Headers/gnustep/base/NSValue.h b/Headers/gnustep/base/NSValue.h index 7c3f37331..3e7b51867 100644 --- a/Headers/gnustep/base/NSValue.h +++ b/Headers/gnustep/base/NSValue.h @@ -45,7 +45,7 @@ + (NSValue*) valueWithBytes: (const void*)value objCType: (const char*)type; + (NSValue*) valueFromString: (NSString*)string; /* Designated initializer for all concrete subclasses */ -- (id) initWithBytes: (const void*)value objCType: (const char*)type; +- (id) initWithBytes: (const void*)data objCType: (const char*)type; - (BOOL) isEqualToValue: (NSValue*)other; #endif diff --git a/Source/GSArray.m b/Source/GSArray.m index 8b5874bf2..3aadea706 100644 --- a/Source/GSArray.m +++ b/Source/GSArray.m @@ -1,4 +1,4 @@ -/* Concrete implementation of NSArray +/** Concrete implementation of NSArray Copyright (C) 1995, 1996, 1998, 1999 Free Software Foundation, Inc. Written by: Andrew Kachites McCallum diff --git a/Source/GSAttributedString.m b/Source/GSAttributedString.m index 721e2c85b..57e55a9e4 100644 --- a/Source/GSAttributedString.m +++ b/Source/GSAttributedString.m @@ -1,4 +1,4 @@ -/* +/** GSAttributedString.m Implementation of concrete subclass of a string class with attributes diff --git a/Source/GSCompatibility.m b/Source/GSCompatibility.m index 88e80c4e7..9af7a2cbd 100644 --- a/Source/GSCompatibility.m +++ b/Source/GSCompatibility.m @@ -1,4 +1,4 @@ -/* Runtime MacOSX compatibility functionality +/** Runtime MacOSX compatibility functionality Copyright (C) 2000 Free Software Foundation, Inc. Written by: Richard frith-Macdonald diff --git a/Source/GSCountedSet.m b/Source/GSCountedSet.m index 0ec47c5e7..b9aed723a 100644 --- a/Source/GSCountedSet.m +++ b/Source/GSCountedSet.m @@ -1,4 +1,4 @@ -/* Concrete implementation of NSCountedSet based on GNU Set class +/** Concrete implementation of NSCountedSet based on GNU Set class Copyright (C) 1998,2000 Free Software Foundation, Inc. Written by: Richard frith-Macdonald diff --git a/Source/GSDictionary.m b/Source/GSDictionary.m index c1c577190..79f81bc07 100644 --- a/Source/GSDictionary.m +++ b/Source/GSDictionary.m @@ -1,4 +1,4 @@ -/* Interface to concrete implementation of NSDictionary +/** Interface to concrete implementation of NSDictionary Copyright (C) 1998 Free Software Foundation, Inc. Written by: Richard Frith-Macdonald diff --git a/Source/GSFFCallInvocation.m b/Source/GSFFCallInvocation.m index 58e30614f..233d95863 100644 --- a/Source/GSFFCallInvocation.m +++ b/Source/GSFFCallInvocation.m @@ -1,4 +1,4 @@ -/* Implementation of GSFFCallInvocation for GNUStep +/** Implementation of GSFFCallInvocation for GNUStep Copyright (C) 2000 Free Software Foundation, Inc. Written: Adam Fedor diff --git a/Source/GSFFIInvocation.m b/Source/GSFFIInvocation.m index 7e8d79037..9657f4ade 100644 --- a/Source/GSFFIInvocation.m +++ b/Source/GSFFIInvocation.m @@ -1,4 +1,4 @@ -/* Implementation of GSFFIInvocation for GNUStep +/** Implementation of GSFFIInvocation for GNUStep Copyright (C) 2000 Free Software Foundation, Inc. Written: Adam Fedor diff --git a/Source/GSFormat.m b/Source/GSFormat.m index cba7531dc..a1c30b793 100644 --- a/Source/GSFormat.m +++ b/Source/GSFormat.m @@ -1,4 +1,4 @@ -/* Implementation of GNUSTEP printf-style formatting +/** Implementation of GNUSTEP printf-style formatting Copyright (C) 1994-2000, 2001 Free Software Foundation, Inc. Hacked together by Kai Henningsen diff --git a/Source/GSHTTPURLHandle.m b/Source/GSHTTPURLHandle.m index ae454c571..14d03194d 100644 --- a/Source/GSHTTPURLHandle.m +++ b/Source/GSHTTPURLHandle.m @@ -1,4 +1,4 @@ -/* GSHTTPURLHandle.m - Class GSHTTPURLHandle +/** GSHTTPURLHandle.m - Class GSHTTPURLHandle Copyright (C) 2000 Free Software Foundation, Inc. Written by: Mark Allison diff --git a/Source/GSLocale.m b/Source/GSLocale.m index c0775f4b6..fd0708c37 100644 --- a/Source/GSLocale.m +++ b/Source/GSLocale.m @@ -1,4 +1,4 @@ -/* GSLocale - various functions for localization +/** GSLocale - various functions for localization Copyright (C) 2000 Free Software Foundation, Inc. diff --git a/Source/GSMime.m b/Source/GSMime.m index fecd13445..9109a9f04 100644 --- a/Source/GSMime.m +++ b/Source/GSMime.m @@ -1,5 +1,4 @@ - -/* Implementation for GSMIME +/** Implementation for GSMIME Copyright (C) 2000 Free Software Foundation, Inc. diff --git a/Source/GSSet.m b/Source/GSSet.m index 984c9da95..dbdfbd189 100644 --- a/Source/GSSet.m +++ b/Source/GSSet.m @@ -1,4 +1,4 @@ -/* Concrete implementation of NSSet based on GNU Set class +/** Concrete implementation of NSSet based on GNU Set class Copyright (C) 1995, 1996, 1998, 2000 Free Software Foundation, Inc. Written by: Andrew Kachites McCallum diff --git a/Source/GSString.m b/Source/GSString.m index 7ab4aa0de..e22de2d1e 100644 --- a/Source/GSString.m +++ b/Source/GSString.m @@ -1,4 +1,4 @@ -/* Implementation for GNUStep of NSString concrete subclasses +/** Implementation for GNUStep of NSString concrete subclasses Copyright (C) 1997,1998,2000 Free Software Foundation, Inc. Base on code written by Stevo Crvenkovski diff --git a/Source/GSTcpPort.m b/Source/GSTcpPort.m index 1e24886ee..e074a7ba3 100644 --- a/Source/GSTcpPort.m +++ b/Source/GSTcpPort.m @@ -1,4 +1,4 @@ -/* Implementation of network port object based on TCP sockets +/** Implementation of network port object based on TCP sockets Copyright (C) 2000 Free Software Foundation, Inc. Written by: Richard Frith-Macdonald diff --git a/Source/GSUnixSSLHandle.m b/Source/GSUnixSSLHandle.m index 8b5525748..86df3c061 100644 --- a/Source/GSUnixSSLHandle.m +++ b/Source/GSUnixSSLHandle.m @@ -1,4 +1,4 @@ -/* Implementation for GSUnixSSLHandle for GNUStep +/** Implementation for GSUnixSSLHandle for GNUStep Copyright (C) 1997-1999 Free Software Foundation, Inc. Written by: Richard Frith-Macdonald diff --git a/Source/GSValue.m b/Source/GSValue.m index 541bbd2a6..a1eccdb32 100644 --- a/Source/GSValue.m +++ b/Source/GSValue.m @@ -1,4 +1,4 @@ -/* GSValue - Object encapsulation for C types. +/** GSValue - Object encapsulation for C types. Copyright (C) 1993,1994,1995,1999 Free Software Foundation, Inc. Written by: Adam Fedor diff --git a/Source/GSXML.m b/Source/GSXML.m index bb4163b9e..6b2d06d11 100644 --- a/Source/GSXML.m +++ b/Source/GSXML.m @@ -1,4 +1,4 @@ -/* Implementation for GSXMLDocument for GNUstep xmlparser +/** Implementation for GSXMLDocument for GNUstep xmlparser Copyright (C) 2000 Free Software Foundation, Inc. @@ -180,7 +180,7 @@ loadEntityFunction(const char *url, const char *eid, xmlParserCtxtPtr *ctxt); - (id) initWithVersion: (NSString*)version { - void *data = xmlNewDoc([version cString]); + void *data = xmlNewDoc([version lossyCString]); if (data == 0) { @@ -240,15 +240,16 @@ loadEntityFunction(const char *url, const char *eid, xmlParserCtxtPtr *ctxt); - (GSXMLNode*) makeNodeWithNamespace: (GSXMLNamespace*)ns name: (NSString*)name - content: (NSString*)content; + content: (NSString*)content { return [GSXMLNode nodeFrom: - xmlNewDocNode(lib, [ns lib], [name cString], [content cString])]; + xmlNewDocNode(lib, [ns lib], [name lossyCString], + [content lossyCString])]; } - (void) save: (NSString*) filename { - xmlSaveFile([filename cString], lib); + xmlSaveFile([filename lossyCString], lib); } - (NSString*) stringValue @@ -334,7 +335,8 @@ static NSMapTable *nsNames = 0; if (node != nil) { - data = xmlNewNs((xmlNodePtr)[node lib], [href cString], [prefix cString]); + data = xmlNewNs((xmlNodePtr)[node lib], [href lossyCString], + [prefix lossyCString]); if (data == NULL) { NSLog(@"Can't create GSXMLNamespace object"); @@ -345,7 +347,7 @@ static NSMapTable *nsNames = 0; } else { - data = xmlNewNs(NULL, [href cString], [prefix cString]); + data = xmlNewNs(NULL, [href lossyCString], [prefix lossyCString]); if (data == NULL) { NSLog(@"Can't create GSXMLNamespace object"); @@ -563,11 +565,11 @@ static NSMapTable *nodeNames = 0; if (ns != nil) { [ns _native: NO]; - lib = xmlNewNode((xmlNsPtr)[ns lib], [name cString]); + lib = xmlNewNode((xmlNsPtr)[ns lib], [name lossyCString]); } else { - lib = xmlNewNode(NULL, [name cString]); + lib = xmlNewNode(NULL, [name lossyCString]); } if (lib == NULL) { @@ -792,28 +794,30 @@ static NSMapTable *nodeNames = 0; - (GSXMLNode*) makeChildWithNamespace: (GSXMLNamespace*)ns name: (NSString*)name - content: (NSString*)content; + content: (NSString*)content { return [GSXMLNode nodeFrom: - xmlNewChild(lib, [ns lib], [name cString], [content cString])]; + xmlNewChild(lib, [ns lib], [name lossyCString], [content lossyCString])]; } - (GSXMLAttribute*) setProp: (NSString*)name value: (NSString*)value { return [GSXMLAttribute attributeFrom: - xmlSetProp(lib, [name cString], [value cString])]; + xmlSetProp(lib, [name lossyCString], [value lossyCString])]; } - (GSXMLNode*) makeComment: (NSString*)content { - return [GSXMLNode nodeFrom: xmlAddChild((xmlNodePtr)lib, xmlNewComment([content cString]))]; + return [GSXMLNode nodeFrom: xmlAddChild((xmlNodePtr)lib, + xmlNewComment([content lossyCString]))]; } - (GSXMLNode*) makePI: (NSString*)name content: (NSString*)content { return [GSXMLNode nodeFrom: - xmlAddChild((xmlNodePtr)lib, xmlNewPI([name cString], [content cString]))]; + xmlAddChild((xmlNodePtr)lib, xmlNewPI([name lossyCString], + [content lossyCString]))]; } - (unsigned) hash @@ -935,17 +939,18 @@ static NSMapTable *attrNames = 0; + (GSXMLAttribute*) attributeWithNode: (GSXMLNode*)node name: (NSString*)name - value: (NSString*)value; + value: (NSString*)value { return AUTORELEASE([[self alloc] initWithNode: node name: name value: value]); } - (id) initWithNode: (GSXMLNode*)node name: (NSString*)name - value: (NSString*)value; + value: (NSString*)value { self = [super init]; - lib = xmlNewProp((xmlNodePtr)[node lib], [name cString], [value cString]); + lib = xmlNewProp((xmlNodePtr)[node lib], [name lossyCString], + [value lossyCString]); return self; } @@ -1916,7 +1921,7 @@ fatalErrorFunction(void *ctx, const char *msg, ...) } - (void) startElement: (NSString*)elementName - attributes: (NSMutableDictionary*)elementAttributes; + attributes: (NSMutableDictionary*)elementAttributes { } diff --git a/Source/NSArchiver.m b/Source/NSArchiver.m index c60a1a9a7..e1f0acd7b 100644 --- a/Source/NSArchiver.m +++ b/Source/NSArchiver.m @@ -1,4 +1,4 @@ -/* Implementation of NSArchiver for GNUstep +/** Implementation of NSArchiver for GNUstep Copyright (C) 1998,1999 Free Software Foundation, Inc. Written by: Richard Frith-Macdonald diff --git a/Source/NSArray.m b/Source/NSArray.m index c8eae2539..092e73ece 100644 --- a/Source/NSArray.m +++ b/Source/NSArray.m @@ -1,4 +1,4 @@ -/* NSArray - Array object to hold other objects. +/** NSArray - Array object to hold other objects. Copyright (C) 1995, 1996, 1998 Free Software Foundation, Inc. Written by: Andrew Kachites McCallum @@ -828,7 +828,7 @@ static NSString *indentStrings[] = { } } -- (BOOL) writeToFile: (NSString *)path atomically: (BOOL)useAuxiliaryFile +- (BOOL) writeToFile: (NSString *)path atomically: (BOOL)useAuxilliaryFile { extern BOOL GSMacOSXCompatiblePropertyLists(); NSDictionary *loc; @@ -854,10 +854,10 @@ static NSString *indentStrings[] = { desc = result; } - return [desc writeToFile: path atomically: useAuxiliaryFile]; + return [desc writeToFile: path atomically: useAuxilliaryFile]; } -- (BOOL) writeToURL: (NSURL *)url atomically: (BOOL)useAuxiliaryFile +- (BOOL) writeToURL: (NSURL *)url atomically: (BOOL)useAuxilliaryFile { extern BOOL GSMacOSXCompatiblePropertyLists(); NSDictionary *loc; @@ -883,7 +883,7 @@ static NSString *indentStrings[] = { desc = result; } - return [desc writeToURL: url atomically: useAuxiliaryFile]; + return [desc writeToURL: url atomically: useAuxilliaryFile]; } @end diff --git a/Source/NSAssertionHandler.m b/Source/NSAssertionHandler.m index 6ebbee9b5..9d5237e18 100644 --- a/Source/NSAssertionHandler.m +++ b/Source/NSAssertionHandler.m @@ -1,4 +1,4 @@ -/* NSAssertionHandler - Object encapsulation of assertions +/** NSAssertionHandler - Object encapsulation of assertions Copyright (C) 1995, 1997 Free Software Foundation, Inc. Written by: Adam Fedor diff --git a/Source/NSAttributedString.m b/Source/NSAttributedString.m index 4834c31f8..8cbf58d48 100644 --- a/Source/NSAttributedString.m +++ b/Source/NSAttributedString.m @@ -1,4 +1,4 @@ -/* +/** NSAttributedString.m Implementation of string class with attributes @@ -278,14 +278,14 @@ static Class GSMutableAttributedStringClass; } //Retrieving attribute information -- (NSDictionary*) attributesAtIndex: (unsigned)index +- (NSDictionary*) attributesAtIndex: (unsigned int)index effectiveRange: (NSRange*)aRange { [self subclassResponsibility: _cmd];/* Primitive method! */ return nil; } -- (NSDictionary*) attributesAtIndex: (unsigned)index +- (NSDictionary*) attributesAtIndex: (unsigned int)index longestEffectiveRange: (NSRange*)aRange inRange: (NSRange)rangeLimit { @@ -335,7 +335,7 @@ static Class GSMutableAttributedStringClass; } - (id) attribute: (NSString*)attributeName - atIndex: (unsigned)index + atIndex: (unsigned int)index effectiveRange: (NSRange*)aRange { NSDictionary *tmpDictionary; diff --git a/Source/NSAutoreleasePool.m b/Source/NSAutoreleasePool.m index 8e198cfa2..7b1c306e3 100644 --- a/Source/NSAutoreleasePool.m +++ b/Source/NSAutoreleasePool.m @@ -1,4 +1,4 @@ -/* Implementation of auto release pool for delayed disposal +/** Implementation of auto release pool for delayed disposal Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. Written by: Andrew Kachites McCallum diff --git a/Source/NSBitmapCharSet.m b/Source/NSBitmapCharSet.m index 9fe49bd2b..bcc61f461 100644 --- a/Source/NSBitmapCharSet.m +++ b/Source/NSBitmapCharSet.m @@ -1,4 +1,4 @@ -/* NSBitmapCharSet - Concrete character set holder +/** NSBitmapCharSet - Concrete character set holder Copyright (C) 1993,1994 Free Software Foundation, Inc. Written by: Adam Fedor diff --git a/Source/NSBundle.m b/Source/NSBundle.m index e9d24a548..077493ded 100644 --- a/Source/NSBundle.m +++ b/Source/NSBundle.m @@ -1,4 +1,4 @@ -/* Implementation of NSBundle class +/** Implementation of NSBundle class Copyright (C) 1993,1994,1995, 1996, 1997 Free Software Foundation, Inc. Written by: Adam Fedor @@ -727,12 +727,12 @@ _bundle_load_callback(Class theClass, struct objc_category *theCategory) return bundle; } -+ (NSBundle *)bundleWithPath:(NSString *)path ++ (NSBundle*) bundleWithPath: (NSString*)path { return AUTORELEASE([[NSBundle alloc] initWithPath: path]); } -- (id) initWithPath:(NSString *)path; +- (id) initWithPath: (NSString*)path { [super init]; @@ -1112,7 +1112,7 @@ _bundle_load_callback(Class theClass, struct objc_category *theCategory) } - (NSString *) pathForResource: (NSString *)name - ofType: (NSString *)ext; + ofType: (NSString *)ext { return [self pathForResource: name ofType: ext @@ -1121,7 +1121,7 @@ _bundle_load_callback(Class theClass, struct objc_category *theCategory) - (NSString *) pathForResource: (NSString *)name ofType: (NSString *)ext - inDirectory: (NSString *)bundlePath; + inDirectory: (NSString *)bundlePath { NSString *rootPath; @@ -1385,7 +1385,7 @@ _bundle_load_callback(Class theClass, struct objc_category *theCategory) + (NSString *) pathForGNUstepResource: (NSString *)name ofType: (NSString *)ext - inDirectory: (NSString *)bundlePath; + inDirectory: (NSString *)bundlePath { NSString *path = nil; NSString *bundle_path = nil; diff --git a/Source/NSCalendarDate.m b/Source/NSCalendarDate.m index e477a8a68..1190439c6 100644 --- a/Source/NSCalendarDate.m +++ b/Source/NSCalendarDate.m @@ -1,4 +1,4 @@ -/* Implementation for NSCalendarDate for GNUstep +/** Implementation for NSCalendarDate for GNUstep Copyright (C) 1996, 1998 Free Software Foundation, Inc. Author: Scott Christley diff --git a/Source/NSCallBacks.m b/Source/NSCallBacks.m index 8e08d03e2..6a1c97ab2 100644 --- a/Source/NSCallBacks.m +++ b/Source/NSCallBacks.m @@ -1,4 +1,4 @@ -/* GNUStep callback functions. Implicitly required by the standard. +/** GNUStep callback functions. Implicitly required by the standard. * Copyright(C) 1996 Free Software Foundation, Inc. * * Author: Albin L. Jones diff --git a/Source/NSCharacterSet.m b/Source/NSCharacterSet.m index 7f2cee6cd..bb600c8d9 100644 --- a/Source/NSCharacterSet.m +++ b/Source/NSCharacterSet.m @@ -1,4 +1,4 @@ -/* NSCharacterSet - Character set holder +/** NSCharacterSet - Character set holder Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. Written by: Adam Fedor @@ -171,12 +171,12 @@ static NSLock* cache_lock = nil; return [self _bitmapForSet: @"nonBaseCharSet" number: 7]; } -+ (NSCharacterSet*) punctuationCharacterSet; ++ (NSCharacterSet*) punctuationCharacterSet { return [self _bitmapForSet: @"punctuationCharSet" number: 8]; } -+ (NSCharacterSet*) symbolAndOperatorCharacterSet; ++ (NSCharacterSet*) symbolAndOperatorCharacterSet { return [self _bitmapForSet: @"symbolAndOperatorCharSet" number: 9]; } diff --git a/Source/NSClassDescription.m b/Source/NSClassDescription.m index 2fb64982b..d61666de1 100644 --- a/Source/NSClassDescription.m +++ b/Source/NSClassDescription.m @@ -1,5 +1,4 @@ - -/* NSClassDescription +/** NSClassDescription Copyright (C) 2000 Free Software Foundation, Inc. Written by: Richard Frith-Macdonald diff --git a/Source/NSCoder.m b/Source/NSCoder.m index a4bf10705..5239d0fa5 100644 --- a/Source/NSCoder.m +++ b/Source/NSCoder.m @@ -1,4 +1,4 @@ -/* NSCoder - coder object for serialization and persistance. +/** NSCoder - coder object for serialization and persistance. Copyright (C) 1995, 1996 Free Software Foundation, Inc. Written by: Andrew Kachites McCallum diff --git a/Source/NSConnection.m b/Source/NSConnection.m index 343650ce9..d58788f0d 100644 --- a/Source/NSConnection.m +++ b/Source/NSConnection.m @@ -1,4 +1,4 @@ -/* Implementation of connection object for remote object messaging +/** Implementation of connection object for remote object messaging Copyright (C) 1994, 1995, 1996, 1997, 2000 Free Software Foundation, Inc. Created by: Andrew Kachites McCallum diff --git a/Source/NSCopyObject.m b/Source/NSCopyObject.m index f8416b4da..20c0c4b2d 100644 --- a/Source/NSCopyObject.m +++ b/Source/NSCopyObject.m @@ -1,4 +1,4 @@ -/* Implementation of NSCopyObject() for GNUStep +/** Implementation of NSCopyObject() for GNUStep Copyright (C) 1994, 1995 Free Software Foundation, Inc. Written by: Andrew Kachites McCallum diff --git a/Source/NSCountedSet.m b/Source/NSCountedSet.m index b71dfe8fd..091b8ff33 100644 --- a/Source/NSCountedSet.m +++ b/Source/NSCountedSet.m @@ -1,4 +1,4 @@ -/* NSCountedSet - CountedSet object +/** NSCountedSet - CountedSet object Copyright (C) 1995, 1996 Free Software Foundation, Inc. Written by: Andrew Kachites McCallum diff --git a/Source/NSData.m b/Source/NSData.m index 4ae569bd5..ce6ff46a1 100644 --- a/Source/NSData.m +++ b/Source/NSData.m @@ -1,4 +1,4 @@ -/* Stream of bytes class for serialization and persistance in GNUStep +/** Stream of bytes class for serialization and persistance in GNUStep Copyright (C) 1995, 1996, 1997, 2000 Free Software Foundation, Inc. Written by: Andrew Kachites McCallum @@ -120,7 +120,7 @@ static SEL appendSel; static IMP appendImp; static BOOL -readContentsOfFile(NSString* path, void** buf, unsigned* len, NSZone* zone) +readContentsOfFile(NSString* path, void** buf, unsigned int* len, NSZone* zone) { char thePath[BUFSIZ*2]; FILE *theFile = 0; @@ -343,7 +343,7 @@ failure: unsigned growth; } /* Increase capacity to at least the specified minimum value. */ -- (void) _grow: (unsigned)minimum; +- (void) _grow: (unsigned int)minimum; @end #if HAVE_MMAP @@ -356,14 +356,14 @@ failure: { int shmid; } -- (id) initWithShmID: (int)anId length: (unsigned)bufferSize; +- (id) initWithShmID: (int)anId length: (unsigned int)bufferSize; @end @interface NSMutableDataShared : NSMutableDataMalloc { int shmid; } -- (id) initWithShmID: (int)anId length: (unsigned)bufferSize; +- (id) initWithShmID: (int)anId length: (unsigned int)bufferSize; @end #endif @@ -406,7 +406,7 @@ failure: } + (id) dataWithBytes: (const void*)bytes - length: (unsigned)length + length: (unsigned int)length { NSData *d; @@ -416,7 +416,7 @@ failure: } + (id) dataWithBytesNoCopy: (void*)bytes - length: (unsigned)length + length: (unsigned int)length { NSData *d; @@ -480,7 +480,7 @@ failure: } - (id) initWithBytes: (const void*)aBuffer - length: (unsigned)bufferSize + length: (unsigned int)bufferSize { void *ptr = 0; @@ -493,7 +493,7 @@ failure: } - (id) initWithBytesNoCopy: (void*)aBuffer - length: (unsigned)bufferSize + length: (unsigned int)bufferSize { [self subclassResponsibility: _cmd]; return nil; @@ -522,7 +522,7 @@ failure: return self; } -- (id) initWithContentsOfMappedFile: (NSString *)path; +- (id) initWithContentsOfMappedFile: (NSString *)path { #if HAVE_MMAP RELEASE(self); @@ -615,7 +615,7 @@ failure: [self getBytes: buffer range: NSMakeRange(0, [self length])]; } -- (void) getBytes: (void*)buffer length: (unsigned)length +- (void) getBytes: (void*)buffer length: (unsigned int)length { [self getBytes: buffer range: NSMakeRange(0, length)]; } @@ -653,7 +653,7 @@ failure: return [NSData dataWithBytesNoCopy: buffer length: aRange.length]; } -- (unsigned) hash +- (unsigned int) hash { unsigned char buf[64]; unsigned l = [self length]; @@ -691,7 +691,7 @@ failure: } // Querying a Data Object -- (BOOL) isEqualToData: (NSData*)other; +- (BOOL) isEqualToData: (NSData*)other { int len; if ((len = [self length]) != [other length]) @@ -699,7 +699,7 @@ failure: return (memcmp([self bytes], [other bytes], len) ? NO : YES); } -- (unsigned) length; +- (unsigned int) length { /* This is left to concrete subclasses to implement. */ [self subclassResponsibility: _cmd]; @@ -907,14 +907,14 @@ failure: // Deserializing Data -- (unsigned) deserializeAlignedBytesLengthAtCursor: (unsigned int*)cursor +- (unsigned int) deserializeAlignedBytesLengthAtCursor: (unsigned int*)cursor { return (unsigned)[self deserializeIntAtCursor: cursor]; } - (void) deserializeBytes: (void*)buffer - length: (unsigned)bytes - atCursor: (unsigned*)cursor + length: (unsigned int)bytes + atCursor: (unsigned int*)cursor { NSRange range = { *cursor, bytes }; @@ -924,7 +924,7 @@ failure: - (void) deserializeDataAt: (void*)data ofObjCType: (const char*)type - atCursor: (unsigned*)cursor + atCursor: (unsigned int*)cursor context: (id )callback { if (!type || !data) @@ -1205,7 +1205,7 @@ failure: } } -- (int) deserializeIntAtCursor: (unsigned*)cursor +- (int) deserializeIntAtCursor: (unsigned int*)cursor { unsigned ni, result; @@ -1214,7 +1214,7 @@ failure: return result; } -- (int) deserializeIntAtIndex: (unsigned)index +- (int) deserializeIntAtIndex: (unsigned int)index { unsigned ni, result; @@ -1224,8 +1224,8 @@ failure: } - (void) deserializeInts: (int*)intBuffer - count: (unsigned)numInts - atCursor: (unsigned*)cursor + count: (unsigned int)numInts + atCursor: (unsigned int*)cursor { unsigned i; @@ -1237,8 +1237,8 @@ failure: } - (void) deserializeInts: (int*)intBuffer - count: (unsigned)numInts - atIndex: (unsigned)index + count: (unsigned int)numInts + atIndex: (unsigned int)index { unsigned i; @@ -1286,7 +1286,7 @@ failure: @end @implementation NSData (GNUstepExtensions) -+ (id) dataWithShmID: (int)anID length: (unsigned)length ++ (id) dataWithShmID: (int)anID length: (unsigned int)length { #if HAVE_SHMCTL NSDataShared *d; @@ -1300,7 +1300,7 @@ failure: #endif } -+ (id) dataWithSharedBytes: (const void*)bytes length: (unsigned)length ++ (id) dataWithSharedBytes: (const void*)bytes length: (unsigned int)length { NSData *d; @@ -1314,7 +1314,7 @@ failure: return AUTORELEASE(d); } -+ (id) dataWithStaticBytes: (const void*)bytes length: (unsigned)length ++ (id) dataWithStaticBytes: (const void*)bytes length: (unsigned int)length { NSDataStatic *d; @@ -1325,7 +1325,7 @@ failure: - (void) deserializeTypeTag: (unsigned char*)tag andCrossRef: (unsigned int*)ref - atCursor: (unsigned*)cursor + atCursor: (unsigned int*)cursor { [self deserializeDataAt: (void*)tag ofObjCType: @encode(gsu8) @@ -1402,7 +1402,7 @@ failure: } + (id) dataWithBytes: (const void*)bytes - length: (unsigned)length + length: (unsigned int)length { NSData *d; @@ -1412,7 +1412,7 @@ failure: } + (id) dataWithBytesNoCopy: (void*)bytes - length: (unsigned)length + length: (unsigned int)length { NSData *d; @@ -1421,7 +1421,7 @@ failure: return AUTORELEASE(d); } -+ (id) dataWithCapacity: (unsigned)numBytes ++ (id) dataWithCapacity: (unsigned int)numBytes { NSMutableData *d; @@ -1468,7 +1468,7 @@ failure: return AUTORELEASE(d); } -+ (id) dataWithLength: (unsigned)length ++ (id) dataWithLength: (unsigned int)length { NSMutableData *d; @@ -1506,7 +1506,7 @@ failure: } } -- (id) initWithCapacity: (unsigned)capacity +- (id) initWithCapacity: (unsigned int)capacity { [self subclassResponsibility: _cmd]; return nil; @@ -1544,7 +1544,7 @@ failure: return self; } -- (id) initWithLength: (unsigned)length +- (id) initWithLength: (unsigned int)length { [self subclassResponsibility: _cmd]; return nil; @@ -1552,12 +1552,12 @@ failure: // Adjusting Capacity -- (void) increaseLengthBy: (unsigned)extraLength +- (void) increaseLengthBy: (unsigned int)extraLength { [self setLength: [self length]+extraLength]; } -- (void) setLength: (unsigned)size +- (void) setLength: (unsigned int)size { [self subclassResponsibility: _cmd]; } @@ -1571,7 +1571,7 @@ failure: // Appending Data - (void) appendBytes: (const void*)aBuffer - length: (unsigned)bufferSize + length: (unsigned int)bufferSize { unsigned oldLength = [self length]; void* buffer; @@ -1628,7 +1628,7 @@ failure: // Serializing Data -- (void) serializeAlignedBytesLength: (unsigned)length +- (void) serializeAlignedBytesLength: (unsigned int)length { [self serializeInt: length]; } @@ -1812,7 +1812,7 @@ failure: [self appendBytes: &ni length: sizeof(unsigned)]; } -- (void) serializeInt: (int)value atIndex: (unsigned)index +- (void) serializeInt: (int)value atIndex: (unsigned int)index { unsigned ni = NSSwapHostIntToBig(value); NSRange range = { index, sizeof(int) }; @@ -1821,7 +1821,7 @@ failure: } - (void) serializeInts: (int*)intBuffer - count: (unsigned)numInts + count: (unsigned int)numInts { unsigned i; SEL sel = @selector(serializeInt:); @@ -1834,8 +1834,8 @@ failure: } - (void) serializeInts: (int*)intBuffer - count: (unsigned)numInts - atIndex: (unsigned)index + count: (unsigned int)numInts + atIndex: (unsigned int)index { unsigned i; SEL sel = @selector(serializeInt:atIndex:); @@ -1850,7 +1850,7 @@ failure: @end @implementation NSMutableData (GNUstepExtensions) -+ (id) dataWithShmID: (int)anID length: (unsigned)length ++ (id) dataWithShmID: (int)anID length: (unsigned int)length { #if HAVE_SHMCTL NSDataShared *d; @@ -1864,7 +1864,7 @@ failure: #endif } -+ (id) dataWithSharedBytes: (const void*)bytes length: (unsigned)length ++ (id) dataWithSharedBytes: (const void*)bytes length: (unsigned int)length { NSData *d; @@ -1878,13 +1878,13 @@ failure: return AUTORELEASE(d); } -- (unsigned) capacity +- (unsigned int) capacity { [self subclassResponsibility: _cmd]; return 0; } -- (id) setCapacity: (unsigned)newCapacity +- (id) setCapacity: (unsigned int)newCapacity { [self subclassResponsibility: _cmd]; return nil; @@ -1903,7 +1903,7 @@ failure: } - (void) serializeTypeTag: (unsigned char)tag - andCrossRef: (unsigned)xref + andCrossRef: (unsigned int)xref { if (xref <= 0xff) { @@ -1988,7 +1988,7 @@ failure: } - (id) initWithBytesNoCopy: (void*)aBuffer - length: (unsigned)bufferSize + length: (unsigned int)bufferSize { bytes = aBuffer; length = bufferSize; @@ -2014,7 +2014,7 @@ failure: memcpy(buffer, bytes + aRange.location, aRange.length); } -- (unsigned) length +- (unsigned int) length { return length; } @@ -2034,7 +2034,7 @@ getBytes(void* dst, void* src, unsigned len, unsigned limit, unsigned *pos) - (void) deserializeDataAt: (void*)data ofObjCType: (const char*)type - atCursor: (unsigned*)cursor + atCursor: (unsigned int*)cursor context: (id )callback { if (data == 0 || type == 0) @@ -2296,7 +2296,7 @@ getBytes(void* dst, void* src, unsigned len, unsigned limit, unsigned *pos) - (void) deserializeTypeTag: (unsigned char*)tag andCrossRef: (unsigned int*)ref - atCursor: (unsigned*)cursor + atCursor: (unsigned int*)cursor { if (*cursor >= length) { @@ -2401,7 +2401,7 @@ getBytes(void* dst, void* src, unsigned len, unsigned limit, unsigned *pos) } - (id) initWithBytesNoCopy: (void*)aBuffer - length: (unsigned)bufferSize + length: (unsigned int)bufferSize { bytes = aBuffer; length = bufferSize; @@ -2508,7 +2508,7 @@ getBytes(void* dst, void* src, unsigned len, unsigned limit, unsigned *pos) [super dealloc]; } -- (id) initWithBytes: (const void*)aBuffer length: (unsigned)bufferSize +- (id) initWithBytes: (const void*)aBuffer length: (unsigned int)bufferSize { shmid = -1; if (aBuffer && bufferSize) @@ -2538,7 +2538,7 @@ getBytes(void* dst, void* src, unsigned len, unsigned limit, unsigned *pos) return self; } -- (id) initWithShmID: (int)anId length: (unsigned)bufferSize +- (id) initWithShmID: (int)anId length: (unsigned int)bufferSize { struct shmid_ds buf; @@ -2618,7 +2618,7 @@ getBytes(void* dst, void* src, unsigned len, unsigned limit, unsigned *pos) [super dealloc]; } -- (id) initWithBytes: (const void*)aBuffer length: (unsigned)bufferSize +- (id) initWithBytes: (const void*)aBuffer length: (unsigned int)bufferSize { self = [self initWithCapacity: bufferSize]; if (self) @@ -2633,7 +2633,7 @@ getBytes(void* dst, void* src, unsigned len, unsigned limit, unsigned *pos) } - (id) initWithBytesNoCopy: (void*)aBuffer - length: (unsigned)bufferSize + length: (unsigned int)bufferSize { if (aBuffer == 0) { @@ -2667,7 +2667,7 @@ getBytes(void* dst, void* src, unsigned len, unsigned limit, unsigned *pos) /* * THIS IS THE DESIGNATED INITIALISER */ -- (id) initWithCapacity: (unsigned)size +- (id) initWithCapacity: (unsigned int)size { #if GS_WITH_GC zone = GSAtomicMallocZone(); @@ -2695,7 +2695,7 @@ getBytes(void* dst, void* src, unsigned len, unsigned limit, unsigned *pos) return self; } -- (id) initWithLength: (unsigned)size +- (id) initWithLength: (unsigned int)size { self = [self initWithCapacity: size]; if (self) @@ -2727,7 +2727,7 @@ getBytes(void* dst, void* src, unsigned len, unsigned limit, unsigned *pos) } - (void) appendBytes: (const void*)aBuffer - length: (unsigned)bufferSize + length: (unsigned int)bufferSize { unsigned oldLength = length; unsigned minimum = length + bufferSize; @@ -2740,12 +2740,12 @@ getBytes(void* dst, void* src, unsigned len, unsigned limit, unsigned *pos) length = minimum; } -- (unsigned) capacity +- (unsigned int) capacity { return capacity; } -- (void) _grow: (unsigned)minimum +- (void) _grow: (unsigned int)minimum { if (minimum > capacity) { @@ -3022,7 +3022,7 @@ getBytes(void* dst, void* src, unsigned len, unsigned limit, unsigned *pos) } - (void) serializeTypeTag: (unsigned char)tag - andCrossRef: (unsigned)xref + andCrossRef: (unsigned int)xref { if (xref <= 0xff) { @@ -3078,7 +3078,7 @@ getBytes(void* dst, void* src, unsigned len, unsigned limit, unsigned *pos) } } -- (id) setCapacity: (unsigned)size +- (id) setCapacity: (unsigned int)size { if (size != capacity) { @@ -3121,7 +3121,7 @@ getBytes(void* dst, void* src, unsigned len, unsigned limit, unsigned *pos) memcpy(bytes, [data bytes], length); } -- (void) setLength: (unsigned)size +- (void) setLength: (unsigned int)size { if (size > capacity) { @@ -3165,7 +3165,7 @@ getBytes(void* dst, void* src, unsigned len, unsigned limit, unsigned *pos) [super dealloc]; } -- (id) initWithBytes: (const void*)aBuffer length: (unsigned)bufferSize +- (id) initWithBytes: (const void*)aBuffer length: (unsigned int)bufferSize { self = [self initWithCapacity: bufferSize]; if (self) @@ -3177,7 +3177,7 @@ getBytes(void* dst, void* src, unsigned len, unsigned limit, unsigned *pos) return self; } -- (id) initWithCapacity: (unsigned)bufferSize +- (id) initWithCapacity: (unsigned int)bufferSize { int e; @@ -3206,7 +3206,7 @@ getBytes(void* dst, void* src, unsigned len, unsigned limit, unsigned *pos) return self; } -- (id) initWithShmID: (int)anId length: (unsigned)bufferSize +- (id) initWithShmID: (int)anId length: (unsigned int)bufferSize { struct shmid_ds buf; @@ -3237,7 +3237,7 @@ getBytes(void* dst, void* src, unsigned len, unsigned limit, unsigned *pos) return self; } -- (id) setCapacity: (unsigned)size +- (id) setCapacity: (unsigned int)size { if (size != capacity) { diff --git a/Source/NSDate.m b/Source/NSDate.m index 6beb71cce..74b4213d8 100644 --- a/Source/NSDate.m +++ b/Source/NSDate.m @@ -1,4 +1,4 @@ -/* Implementation for NSDate for GNUStep +/** Implementation for NSDate for GNUStep Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. Written by: Jeremy Bettis @@ -950,7 +950,7 @@ GSTimeNow() } - (id) initWithTimeInterval: (NSTimeInterval)secsToBeAdded - sinceDate: (NSDate*)anotherDate; + sinceDate: (NSDate*)anotherDate { if (anotherDate == nil) { @@ -963,7 +963,7 @@ GSTimeNow() otherTime(anotherDate) + secsToBeAdded]; } -- (id) initWithTimeIntervalSinceNow: (NSTimeInterval)secsToBeAdded; +- (id) initWithTimeIntervalSinceNow: (NSTimeInterval)secsToBeAdded { // Get the current time, add the secs and init thyself return [self initWithTimeIntervalSinceReferenceDate: diff --git a/Source/NSDateFormatter.m b/Source/NSDateFormatter.m index e273c6cad..591bbf554 100644 --- a/Source/NSDateFormatter.m +++ b/Source/NSDateFormatter.m @@ -1,4 +1,4 @@ -/* Implementation of NSDateFormatter class +/** Implementation of NSDateFormatter class Copyright (C) 1998 Free Software Foundation, Inc. Written by: Richard Frith-Macdonald diff --git a/Source/NSDebug.m b/Source/NSDebug.m index dc7611b7d..ce1476984 100644 --- a/Source/NSDebug.m +++ b/Source/NSDebug.m @@ -1,4 +1,4 @@ -/* Debugging utilities for GNUStep and OpenStep +/** Debugging utilities for GNUStep and OpenStep Copyright (C) 1997,1999,2000,2001 Free Software Foundation, Inc. Written by: Richard Frith-Macdonald diff --git a/Source/NSDecimal.m b/Source/NSDecimal.m index 45bc106e2..f7a9051f1 100644 --- a/Source/NSDecimal.m +++ b/Source/NSDecimal.m @@ -1,4 +1,4 @@ -/* +/** NSDecimal functions Copyright (C) 2000 Free Software Foundation, Inc. diff --git a/Source/NSDecimalNumber.m b/Source/NSDecimalNumber.m index fc4a74521..85862f447 100644 --- a/Source/NSDecimalNumber.m +++ b/Source/NSDecimalNumber.m @@ -1,4 +1,4 @@ -/* +/** NSDecimalNumber class Copyright (C) 2000 Free Software Foundation, Inc. @@ -31,7 +31,7 @@ static NSDecimalNumberHandler *handler; @implementation NSDecimalNumberHandler -+ (id)defaultDecimalNumberHandler ++ (id) defaultDecimalNumberHandler { if (handler == nil) handler = [[self alloc] initWithRoundingMode: NSRoundPlain @@ -44,12 +44,12 @@ static NSDecimalNumberHandler *handler; return handler; } -+ (id)decimalNumberHandlerWithRoundingMode:(NSRoundingMode)roundingMode - scale:(short)scale - raiseOnExactness:(BOOL)raiseOnExactness - raiseOnOverflow:(BOOL)raiseOnOverflow - raiseOnUnderflow:(BOOL)raiseOnUnderflow - raiseOnDivideByZero:(BOOL)raiseOnDivideByZero ++ (id) decimalNumberHandlerWithRoundingMode: (NSRoundingMode)roundingMode + scale: (short)scale + raiseOnExactness: (BOOL)raiseOnExactness + raiseOnOverflow: (BOOL)raiseOnOverflow + raiseOnUnderflow: (BOOL)raiseOnUnderflow + raiseOnDivideByZero: (BOOL)raiseOnDivideByZero { return AUTORELEASE([[self alloc] initWithRoundingMode: roundingMode scale: scale @@ -59,12 +59,12 @@ static NSDecimalNumberHandler *handler; raiseOnDivideByZero: raiseOnDivideByZero]); } -- (id)initWithRoundingMode:(NSRoundingMode)roundingMode - scale:(short)scale - raiseOnExactness:(BOOL)raiseOnExactness - raiseOnOverflow:(BOOL)raiseOnOverflow - raiseOnUnderflow:(BOOL)raiseOnUnderflow - raiseOnDivideByZero:(BOOL)raiseOnDivideByZero +- (id) initWithRoundingMode: (NSRoundingMode)roundingMode + scale: (short)scale + raiseOnExactness: (BOOL)raiseOnExactness + raiseOnOverflow: (BOOL)raiseOnOverflow + raiseOnUnderflow: (BOOL)raiseOnUnderflow + raiseOnDivideByZero: (BOOL)raiseOnDivideByZero { _roundingMode = roundingMode; _scale = scale; @@ -87,25 +87,29 @@ static NSDecimalNumberHandler *handler; case NSCalculationUnderflow: if (_raiseOnUnderflow) // FIXME: What exception to raise? - [NSException raise: @"NSDecimalNumberException" format: @"Underflow"]; + [NSException raise: @"NSDecimalNumberException" + format: @"Underflow"]; else return [NSDecimalNumber minimumDecimalNumber]; break; - case NSCalculationOverflow: + case NSCalculationOverflow: if (_raiseOnOverflow) - [NSException raise: @"NSDecimalNumberException" format: @"Overflow"]; + [NSException raise: @"NSDecimalNumberException" + format: @"Overflow"]; else return [NSDecimalNumber maximumDecimalNumber]; break; - case NSCalculationLossOfPrecision: + case NSCalculationLossOfPrecision: if (_raiseOnExactness) - [NSException raise: @"NSDecimalNumberException" format: @"Loss of precision"]; + [NSException raise: @"NSDecimalNumberException" + format: @"Loss of precision"]; else return nil; break; - case NSCalculationDivideByZero: + case NSCalculationDivideByZero: if (_raiseOnDivideByZero) - [NSException raise: @"NSDecimalNumberException" format: @"Divide by zero"]; + [NSException raise: @"NSDecimalNumberException" + format: @"Divide by zero"]; else return [NSDecimalNumber notANumber]; break; @@ -146,20 +150,20 @@ static NSDecimalNumber *one; NSDecimalMin(&d); minNumber = [[self alloc] initWithDecimal: d]; zero = [[self alloc] initWithMantissa: 0 - exponent: 0 - isNegative: NO]; + exponent: 0 + isNegative: NO]; one = [[self alloc] initWithMantissa: 1 - exponent: 0 - isNegative: NO]; + exponent: 0 + isNegative: NO]; } -+ (id )defaultBehavior ++ (id ) defaultBehavior { // Reuse the handler from the class NSDecimalNumberHandler return [NSDecimalNumberHandler defaultDecimalNumberHandler]; } -+ (void)setDefaultBehavior:(id )behavior ++ (void) setDefaultBehavior: (id )behavior { // Reuse the handler from the class NSDecimalNumberHandler // Might give interessting result on this class as behavior may came @@ -167,58 +171,58 @@ static NSDecimalNumber *one; ASSIGN(handler, behavior); } -+ (NSDecimalNumber *)maximumDecimalNumber ++ (NSDecimalNumber*) maximumDecimalNumber { return maxNumber; } -+ (NSDecimalNumber *)minimumDecimalNumber ++ (NSDecimalNumber*) minimumDecimalNumber { return minNumber; } -+ (NSDecimalNumber *)notANumber ++ (NSDecimalNumber*) notANumber { return notANumber; } -+ (NSDecimalNumber *)zero ++ (NSDecimalNumber*) zero { return zero; } -+ (NSDecimalNumber *)one ++ (NSDecimalNumber*) one { return one; } -+ (NSDecimalNumber *)decimalNumberWithDecimal:(NSDecimal)decimal ++ (NSDecimalNumber*) decimalNumberWithDecimal: (NSDecimal)decimal { return AUTORELEASE([[self alloc] initWithDecimal: decimal]); } -+ (NSDecimalNumber *)decimalNumberWithMantissa:(unsigned long long)mantissa - exponent:(short)exponent - isNegative:(BOOL)isNegative ++ (NSDecimalNumber*) decimalNumberWithMantissa: (unsigned long long)mantissa + exponent: (short)exponent + isNegative: (BOOL)isNegative { return AUTORELEASE([[self alloc] initWithMantissa: mantissa - exponent: exponent - isNegative: isNegative]); + exponent: exponent + isNegative: isNegative]); } -+ (NSDecimalNumber *)decimalNumberWithString:(NSString *)numericString ++ (NSDecimalNumber*) decimalNumberWithString: (NSString*)numericString { return AUTORELEASE([[self alloc] initWithString: numericString]); } -+ (NSDecimalNumber *)decimalNumberWithString:(NSString *)numericString - locale:(NSDictionary *)locale ++ (NSDecimalNumber*) decimalNumberWithString: (NSString*)numericString + locale: (NSDictionary*)locale { return AUTORELEASE([[self alloc] initWithString: numericString - locale: locale]); + locale: locale]); } -- (id)initWithDecimal:(NSDecimal)decimal +- (id) initWithDecimal: (NSDecimal)decimal { NSDecimalCopy(&data, &decimal); return self; @@ -241,7 +245,7 @@ static NSDecimalNumber *one; } - (id) initWithString: (NSString*)numberValue - locale: (NSDictionary*)locale; + locale: (NSDictionary*)locale { NSDecimal decimal; @@ -254,12 +258,12 @@ static NSDecimalNumber *one; return NSDecimalString(&data, locale); } -- (const char *)objCType +- (const char*) objCType { return "d"; } -- (NSDecimal)decimalValue +- (NSDecimal) decimalValue { NSDecimal decimal; @@ -267,12 +271,12 @@ static NSDecimalNumber *one; return decimal; } -- (double)doubleValue +- (double) doubleValue { return NSDecimalDouble(&data); } -- (NSComparisonResult)compare:(NSNumber *)decimalNumber +- (NSComparisonResult) compare: (NSNumber*)decimalNumber { if ([decimalNumber isMemberOfClass: [self class]]) { @@ -285,14 +289,14 @@ static NSDecimalNumber *one; return [super compare: decimalNumber]; } -- (NSDecimalNumber *)decimalNumberByAdding:(NSDecimalNumber *)decimalNumber +- (NSDecimalNumber*) decimalNumberByAdding: (NSDecimalNumber*)decimalNumber { return [self decimalNumberByAdding: decimalNumber - withBehavior: [isa defaultBehavior]]; + withBehavior: [isa defaultBehavior]]; } -- (NSDecimalNumber *)decimalNumberByAdding:(NSDecimalNumber *)decimalNumber - withBehavior:(id)behavior +- (NSDecimalNumber*) decimalNumberByAdding: (NSDecimalNumber*)decimalNumber + withBehavior: (id)behavior { NSDecimal result; NSDecimal d1 = [self decimalValue]; @@ -304,9 +308,9 @@ static NSDecimalNumber *one; if (error) { res = [behavior exceptionDuringOperation: _cmd - error: error - leftOperand: self - rightOperand: decimalNumber]; + error: error + leftOperand: self + rightOperand: decimalNumber]; if (res != nil) return res; } @@ -314,14 +318,14 @@ static NSDecimalNumber *one; return [NSDecimalNumber decimalNumberWithDecimal: result]; } -- (NSDecimalNumber *)decimalNumberBySubtracting:(NSDecimalNumber *)decimalNumber +- (NSDecimalNumber*) decimalNumberBySubtracting: (NSDecimalNumber*)decimalNumber { return [self decimalNumberBySubtracting: decimalNumber - withBehavior: [isa defaultBehavior]]; + withBehavior: [isa defaultBehavior]]; } -- (NSDecimalNumber *)decimalNumberBySubtracting:(NSDecimalNumber *)decimalNumber - withBehavior:(id )behavior +- (NSDecimalNumber*) decimalNumberBySubtracting: (NSDecimalNumber*)decimalNumber + withBehavior: (id )behavior { NSDecimal result; NSDecimal d1 = [self decimalValue]; @@ -333,9 +337,9 @@ static NSDecimalNumber *one; if (error) { res = [behavior exceptionDuringOperation: _cmd - error: error - leftOperand: self - rightOperand: decimalNumber]; + error: error + leftOperand: self + rightOperand: decimalNumber]; if (res != nil) return res; } @@ -343,14 +347,16 @@ static NSDecimalNumber *one; return [NSDecimalNumber decimalNumberWithDecimal: result]; } -- (NSDecimalNumber *)decimalNumberByMultiplyingBy:(NSDecimalNumber *)decimalNumber +- (NSDecimalNumber*) decimalNumberByMultiplyingBy: + (NSDecimalNumber*)decimalNumber { return [self decimalNumberByMultiplyingBy: decimalNumber - withBehavior: [isa defaultBehavior]]; + withBehavior: [isa defaultBehavior]]; } -- (NSDecimalNumber *)decimalNumberByMultiplyingBy:(NSDecimalNumber *)decimalNumber - withBehavior:(id )behavior +- (NSDecimalNumber*) decimalNumberByMultiplyingBy: + (NSDecimalNumber*)decimalNumber + withBehavior: (id )behavior { NSDecimal result; NSDecimal d1 = [self decimalValue]; @@ -362,9 +368,9 @@ static NSDecimalNumber *one; if (error) { res = [behavior exceptionDuringOperation: _cmd - error: error - leftOperand: self - rightOperand: decimalNumber]; + error: error + leftOperand: self + rightOperand: decimalNumber]; if (res != nil) return res; } @@ -372,14 +378,14 @@ static NSDecimalNumber *one; return [NSDecimalNumber decimalNumberWithDecimal: result]; } -- (NSDecimalNumber *)decimalNumberByDividingBy:(NSDecimalNumber *)decimalNumber +- (NSDecimalNumber*) decimalNumberByDividingBy: (NSDecimalNumber*)decimalNumber { return [self decimalNumberByDividingBy: decimalNumber - withBehavior: [isa defaultBehavior]]; + withBehavior: [isa defaultBehavior]]; } -- (NSDecimalNumber *)decimalNumberByDividingBy:(NSDecimalNumber *)decimalNumber - withBehavior:(id )behavior +- (NSDecimalNumber*) decimalNumberByDividingBy: (NSDecimalNumber*)decimalNumber + withBehavior: (id )behavior { NSDecimal result; NSDecimal d1 = [self decimalValue]; @@ -391,9 +397,9 @@ static NSDecimalNumber *one; if (error) { res = [behavior exceptionDuringOperation: _cmd - error: error - leftOperand: self - rightOperand: decimalNumber]; + error: error + leftOperand: self + rightOperand: decimalNumber]; if (res != nil) return res; } @@ -401,14 +407,14 @@ static NSDecimalNumber *one; return [NSDecimalNumber decimalNumberWithDecimal: result]; } -- (NSDecimalNumber *)decimalNumberByMultiplyingByPowerOf10:(short)power +- (NSDecimalNumber*) decimalNumberByMultiplyingByPowerOf10: (short)power { return [self decimalNumberByMultiplyingByPowerOf10: power - withBehavior: [isa defaultBehavior]]; + withBehavior: [isa defaultBehavior]]; } -- (NSDecimalNumber *)decimalNumberByMultiplyingByPowerOf10:(short)power - withBehavior:(id )behavior +- (NSDecimalNumber*) decimalNumberByMultiplyingByPowerOf10: (short)power + withBehavior: (id )behavior { NSDecimal result; NSDecimal d1 = [self decimalValue]; @@ -416,13 +422,13 @@ static NSDecimalNumber *one; NSDecimalNumber *res; error = NSDecimalMultiplyByPowerOf10(&result, &d1, - power, [behavior roundingMode]); + power, [behavior roundingMode]); if (error) { res = [behavior exceptionDuringOperation: _cmd - error: error - leftOperand: self - rightOperand: nil]; + error: error + leftOperand: self + rightOperand: nil]; if (res != nil) return res; } @@ -430,14 +436,14 @@ static NSDecimalNumber *one; return [NSDecimalNumber decimalNumberWithDecimal: result]; } -- (NSDecimalNumber *)decimalNumberByRaisingToPower:(unsigned)power +- (NSDecimalNumber*) decimalNumberByRaisingToPower: (unsigned)power { return [self decimalNumberByRaisingToPower: power - withBehavior: [isa defaultBehavior]]; + withBehavior: [isa defaultBehavior]]; } -- (NSDecimalNumber *)decimalNumberByRaisingToPower:(unsigned)power - withBehavior:(id )behavior +- (NSDecimalNumber*) decimalNumberByRaisingToPower: (unsigned)power + withBehavior: (id )behavior { NSDecimal result; NSDecimal d1 = [self decimalValue]; @@ -445,13 +451,13 @@ static NSDecimalNumber *one; NSDecimalNumber *res; error = NSDecimalPower(&result, &d1, - power, [behavior roundingMode]); + power, [behavior roundingMode]); if (error) { res = [behavior exceptionDuringOperation: _cmd - error: error - leftOperand: self - rightOperand: nil]; + error: error + leftOperand: self + rightOperand: nil]; if (res != nil) return res; } @@ -459,7 +465,8 @@ static NSDecimalNumber *one; return [NSDecimalNumber decimalNumberWithDecimal: result]; } -- (NSDecimalNumber *)decimalNumberByRoundingAccordingToBehavior:(id )behavior +- (NSDecimalNumber*) decimalNumberByRoundingAccordingToBehavior: + (id )behavior { NSDecimal result; NSDecimal d1 = [self decimalValue]; @@ -476,9 +483,9 @@ static NSDecimalNumber *one; rightOperand: (NSDecimalNumber*)rightOperand { return [[isa defaultBehavior] exceptionDuringOperation: method - error: error - leftOperand: leftOperand - rightOperand: rightOperand]; + error: error + leftOperand: leftOperand + rightOperand: rightOperand]; } - (NSRoundingMode) roundingMode diff --git a/Source/NSDictionary.m b/Source/NSDictionary.m index 264af23b0..fcf404402 100644 --- a/Source/NSDictionary.m +++ b/Source/NSDictionary.m @@ -1,4 +1,4 @@ -/* NSDictionary - Dictionary object to store key/value pairs +/** NSDictionary - Dictionary object to store key/value pairs Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. Written by: Andrew Kachites McCallum diff --git a/Source/NSDistantObject.m b/Source/NSDistantObject.m index d9319dc91..806ffce53 100644 --- a/Source/NSDistantObject.m +++ b/Source/NSDistantObject.m @@ -1,4 +1,4 @@ -/* Implementation for GNU Objective-C version of NSDistantObject +/** Implementation for GNU Objective-C version of NSDistantObject Copyright (C) 1997 Free Software Foundation, Inc. Written by: Richard Frith-Macdonald diff --git a/Source/NSDistributedLock.m b/Source/NSDistributedLock.m index c8aa3d9c2..f6be4470a 100644 --- a/Source/NSDistributedLock.m +++ b/Source/NSDistributedLock.m @@ -1,4 +1,4 @@ -/* Implementation for GNU Objective-C version of NSDistributedLock +/** Implementation for GNU Objective-C version of NSDistributedLock Copyright (C) 1997 Free Software Foundation, Inc. Written by: Richard Frith-Macdonald diff --git a/Source/NSDistributedNotificationCenter.m b/Source/NSDistributedNotificationCenter.m index cd925699f..38cfc767c 100644 --- a/Source/NSDistributedNotificationCenter.m +++ b/Source/NSDistributedNotificationCenter.m @@ -1,4 +1,4 @@ -/* Implementation of NSDistributedNotificationCenter class +/** Implementation of NSDistributedNotificationCenter class Copyright (C) 1998 Free Software Foundation, Inc. Written by: Richard Frith-Macdonald diff --git a/Source/NSEnumerator.m b/Source/NSEnumerator.m index 87b2d140e..4be499d8c 100644 --- a/Source/NSEnumerator.m +++ b/Source/NSEnumerator.m @@ -1,4 +1,4 @@ -/* NSEnumerator abstrace class for GNUStep +/** NSEnumerator abstrace class for GNUStep Copyright (C) 1995, 1996 Free Software Foundation, Inc. Written by: Andrew Kachites McCallum diff --git a/Source/NSException.m b/Source/NSException.m index 3ea574fdb..4a63b7361 100644 --- a/Source/NSException.m +++ b/Source/NSException.m @@ -1,4 +1,4 @@ -/* NSException - Object encapsulation of a general exception handler +/** NSException - Object encapsulation of a general exception handler Copyright (C) 1993, 1994, 1996, 1997, 1999 Free Software Foundation, Inc. Written by: Adam Fedor diff --git a/Source/NSFileHandle.m b/Source/NSFileHandle.m index 2812dcd81..67b797f3c 100644 --- a/Source/NSFileHandle.m +++ b/Source/NSFileHandle.m @@ -1,4 +1,4 @@ -/* Implementation for NSFileHandle for GNUStep +/** Implementation for NSFileHandle for GNUStep Copyright (C) 1997 Free Software Foundation, Inc. Written by: Richard Frith-Macdonald @@ -389,7 +389,7 @@ NSString* NSFileHandleOperationException = [self subclassResponsibility: _cmd]; } -- (void) writeInBackgroundAndNotify: (NSData*)item; +- (void) writeInBackgroundAndNotify: (NSData*)item { [self subclassResponsibility: _cmd]; } diff --git a/Source/NSFileManager.m b/Source/NSFileManager.m index 4bcdc5a55..0d78dd4f2 100644 --- a/Source/NSFileManager.m +++ b/Source/NSFileManager.m @@ -1,4 +1,4 @@ -/* +/** NSFileManager.m Copyright (C) 1997-1999 Free Software Foundation, Inc. diff --git a/Source/NSFormatter.m b/Source/NSFormatter.m index 7cbea9372..a3b72123b 100644 --- a/Source/NSFormatter.m +++ b/Source/NSFormatter.m @@ -1,4 +1,4 @@ -/* Implementation of NSFormatter class +/** Implementation of NSFormatter class Copyright (C) 1998 Free Software Foundation, Inc. Written by: Richard Frith-Macdonald diff --git a/Source/NSGeometry.m b/Source/NSGeometry.m index 4565dceb4..8990238b6 100644 --- a/Source/NSGeometry.m +++ b/Source/NSGeometry.m @@ -1,4 +1,4 @@ -/* NSGeometry.m - geometry functions +/** NSGeometry.m - geometry functions * Copyright (C) 1993, 1994, 1995 Free Software Foundation, Inc. * * Written by: Adam Fedor diff --git a/Source/NSHashTable.m b/Source/NSHashTable.m index 94810756b..af16bc054 100644 --- a/Source/NSHashTable.m +++ b/Source/NSHashTable.m @@ -1,4 +1,4 @@ -/* NSHashTable implementation for GNUStep. +/** NSHashTable implementation for GNUStep. * Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. * * Author: Albin L. Jones diff --git a/Source/NSHost.m b/Source/NSHost.m index 85a717054..26691851f 100644 --- a/Source/NSHost.m +++ b/Source/NSHost.m @@ -1,4 +1,4 @@ -/* Implementation of host class +/** Implementation of host class Copyright (C) 1996, 1997,1999 Free Software Foundation, Inc. Written by: Luke Howard @@ -416,7 +416,7 @@ static NSString *myHostName = nil; [_hostCacheLock unlock]; } -+ (BOOL) isHostCacheEnabled; ++ (BOOL) isHostCacheEnabled { return _hostCacheEnabled; } diff --git a/Source/NSInvocation.m b/Source/NSInvocation.m index d66006db3..727959f96 100644 --- a/Source/NSInvocation.m +++ b/Source/NSInvocation.m @@ -1,4 +1,4 @@ -/* Implementation of NSInvocation for GNUStep +/** Implementation of NSInvocation for GNUStep Copyright (C) 1998 Free Software Foundation, Inc. Written: Richard Frith-Macdonald diff --git a/Source/NSLock.m b/Source/NSLock.m index eede50048..ea72f6e6c 100644 --- a/Source/NSLock.m +++ b/Source/NSLock.m @@ -1,4 +1,4 @@ -/* Mutual exclusion locking classes +/** Mutual exclusion locking classes Copyright (C) 1996 Free Software Foundation, Inc. Author: Scott Christley diff --git a/Source/NSLog.m b/Source/NSLog.m index e658ce977..462ffae7b 100644 --- a/Source/NSLog.m +++ b/Source/NSLog.m @@ -1,4 +1,4 @@ -/* Interface for NSLog for GNUStep +/** Interface for NSLog for GNUStep Copyright (C) 1996, 1997 Free Software Foundation, Inc. Written by: Adam Fedor diff --git a/Source/NSMapTable.m b/Source/NSMapTable.m index ec89edc41..0d70a02d2 100644 --- a/Source/NSMapTable.m +++ b/Source/NSMapTable.m @@ -1,4 +1,4 @@ -/* NSMapTable implementation for GNUStep. +/** NSMapTable implementation for GNUStep. * Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. * * Author: Albin L. Jones diff --git a/Source/NSMethodSignature.m b/Source/NSMethodSignature.m index 5f9f29b8b..784084365 100644 --- a/Source/NSMethodSignature.m +++ b/Source/NSMethodSignature.m @@ -1,4 +1,4 @@ -/* Implementation of NSMethodSignature for GNUStep +/** Implementation of NSMethodSignature for GNUStep Copyright (C) 1994, 1995, 1996, 1998 Free Software Foundation, Inc. Written by: Andrew Kachites McCallum diff --git a/Source/NSNotification.m b/Source/NSNotification.m index 861f35b7b..daa8afb04 100644 --- a/Source/NSNotification.m +++ b/Source/NSNotification.m @@ -1,4 +1,4 @@ -/* Implementation of NSNotification for GNUstep +/** Implementation of NSNotification for GNUstep Copyright (C) 1996 Free Software Foundation, Inc. Written by: Andrew Kachites McCallum @@ -31,7 +31,7 @@ /* This is the designated initializer. */ - (id) initWithName: (NSString*)name object: (id)object - userInfo: (id)info + userInfo: (NSDictionary*)info { [super init]; _name = [name copyWithZone: NSDefaultMallocZone()]; @@ -53,7 +53,7 @@ + (NSNotification*) notificationWithName: (NSString*)name object: (id)object - userInfo: (id)info + userInfo: (NSDictionary*)info { return AUTORELEASE([[self allocWithZone: NSDefaultMallocZone()] initWithName: name object: object userInfo: info]); diff --git a/Source/NSNotificationCenter.m b/Source/NSNotificationCenter.m index 3667901de..0c6a663e0 100644 --- a/Source/NSNotificationCenter.m +++ b/Source/NSNotificationCenter.m @@ -1,4 +1,4 @@ -/* Implementation of NSNotificationCenter for GNUstep +/** Implementation of NSNotificationCenter for GNUstep Copyright (C) 1999 Free Software Foundation, Inc. Written by: Richard Frith-Macdonald diff --git a/Source/NSNotificationQueue.m b/Source/NSNotificationQueue.m index 19463b230..a7038db7f 100644 --- a/Source/NSNotificationQueue.m +++ b/Source/NSNotificationQueue.m @@ -1,4 +1,4 @@ -/* +/** NSNotificationQueue.m Copyright (C) 1995, 1996 Ovidiu Predescu and Mircea Oancea. @@ -344,7 +344,7 @@ add_to_queue(NSNotificationQueueList *queue, NSNotification *notification, /* Inserting and Removing Notifications From a Queue */ - (void) dequeueNotificationsMatching: (NSNotification*)notification - coalesceMask: (NSNotificationCoalescing)coalesceMask + coalesceMask: (unsigned int)coalesceMask { NSNotificationQueueRegistration *item; NSNotificationQueueRegistration *next; @@ -446,21 +446,22 @@ add_to_queue(NSNotificationQueueList *queue, NSNotification *notification, postingStyle: (NSPostingStyle)postingStyle { [self enqueueNotification: notification - postingStyle: postingStyle - coalesceMask: NSNotificationCoalescingOnName - + NSNotificationCoalescingOnSender - forModes: nil]; + postingStyle: postingStyle + coalesceMask: NSNotificationCoalescingOnName + + NSNotificationCoalescingOnSender + forModes: nil]; } - (void) enqueueNotification: (NSNotification*)notification postingStyle: (NSPostingStyle)postingStyle - coalesceMask: (NSNotificationCoalescing)coalesceMask + coalesceMask: (unsigned int)coalesceMask forModes: (NSArray*)modes { if (coalesceMask != NSNotificationNoCoalescing) - [self dequeueNotificationsMatching: notification - coalesceMask: coalesceMask]; - + { + [self dequeueNotificationsMatching: notification + coalesceMask: coalesceMask]; + } switch (postingStyle) { case NSPostNow: diff --git a/Source/NSNull.m b/Source/NSNull.m index 58d93f29a..80d5125e2 100644 --- a/Source/NSNull.m +++ b/Source/NSNull.m @@ -1,4 +1,4 @@ -/* Implementation for NSNull for GNUStep +/** Implementation for NSNull for GNUStep Copyright (C) 2000 Free Software Foundation, Inc. Written by: Richard Frith-Macdonald diff --git a/Source/NSNumber.m b/Source/NSNumber.m index b4bf4dccc..9ff9dcbe5 100644 --- a/Source/NSNumber.m +++ b/Source/NSNumber.m @@ -1,4 +1,4 @@ -/* NSNumber - Object encapsulation of numbers +/** NSNumber - Object encapsulation of numbers Copyright (C) 1993, 1994, 1996, 2000 Free Software Foundation, Inc. diff --git a/Source/NSNumberFormatter.m b/Source/NSNumberFormatter.m index 77cdce399..d2026cbf1 100644 --- a/Source/NSNumberFormatter.m +++ b/Source/NSNumberFormatter.m @@ -1,4 +1,4 @@ -/* +/** NSNumberFormatter class Copyright (C) 2000 Free Software Foundation, Inc. diff --git a/Source/NSObjCRuntime.m b/Source/NSObjCRuntime.m index 213ed647e..4a7b53f15 100644 --- a/Source/NSObjCRuntime.m +++ b/Source/NSObjCRuntime.m @@ -1,4 +1,4 @@ -/* Implementation of ObjC runtime for GNUStep +/** Implementation of ObjC runtime for GNUStep Copyright (C) 1995 Free Software Foundation, Inc. Written by: Andrew Kachites McCallum diff --git a/Source/NSPage.m b/Source/NSPage.m index 8a74d329d..07c25c467 100644 --- a/Source/NSPage.m +++ b/Source/NSPage.m @@ -1,4 +1,4 @@ -/* Implementation of page-related functions for GNUstep +/** Implementation of page-related functions for GNUstep Copyright (C) 1996, 1997 Free Software Foundation, Inc. Written by: Andrew Kachites McCallum diff --git a/Source/NSPipe.m b/Source/NSPipe.m index d1c812020..4ac09bd36 100644 --- a/Source/NSPipe.m +++ b/Source/NSPipe.m @@ -1,4 +1,4 @@ -/* Implementation for NSPipe for GNUStep +/** Implementation for NSPipe for GNUStep Copyright (C) 1997 Free Software Foundation, Inc. Written by: Richard Frith-Macdonald diff --git a/Source/NSPort.m b/Source/NSPort.m index 25cef27a1..14f6ce007 100644 --- a/Source/NSPort.m +++ b/Source/NSPort.m @@ -1,4 +1,4 @@ -/* Implementation of abstract superclass port for use with NSConnection +/** Implementation of abstract superclass port for use with NSConnection Copyright (C) 1997, 1998 Free Software Foundation, Inc. Written by: Richard Frith-Macdonald diff --git a/Source/NSPortCoder.m b/Source/NSPortCoder.m index 812a0ac96..dbdb21e2c 100644 --- a/Source/NSPortCoder.m +++ b/Source/NSPortCoder.m @@ -1,4 +1,4 @@ -/* Implementation of NSPortCoder object for remote messaging +/** Implementation of NSPortCoder object for remote messaging Copyright (C) 1997,2000 Free Software Foundation, Inc. This implementation for OPENSTEP conformance written by diff --git a/Source/NSPortMessage.m b/Source/NSPortMessage.m index fcea13ebe..5287eef7a 100644 --- a/Source/NSPortMessage.m +++ b/Source/NSPortMessage.m @@ -1,4 +1,4 @@ -/* Implementation of NSPortMessage for GNUstep +/** Implementation of NSPortMessage for GNUstep Copyright (C) 1998,2000 Free Software Foundation, Inc. Written by: Richard frith-Macdonald diff --git a/Source/NSPortNameServer.m b/Source/NSPortNameServer.m index 857ac390b..fa230fb08 100644 --- a/Source/NSPortNameServer.m +++ b/Source/NSPortNameServer.m @@ -1,4 +1,4 @@ -/* Implementation of NSPortNameServer class for Distributed Objects +/** Implementation of NSPortNameServer class for Distributed Objects Copyright (C) 1998,1999,2000 Free Software Foundation, Inc. Written by: Richard Frith-Macdonald diff --git a/Source/NSProcessInfo.m b/Source/NSProcessInfo.m index 58644e736..1e42eb0d3 100644 --- a/Source/NSProcessInfo.m +++ b/Source/NSProcessInfo.m @@ -1,9 +1,10 @@ -/* Implementation for NSProcessInfo for GNUStep - Copyright (C) 1995-1999 Free Software Foundation, Inc. +/** Implementation for NSProcessInfo for GNUStep + Copyright (C) 1995-2001 Free Software Foundation, Inc. - Written by: Georg Tuparev, EMBL & Academia Naturalis, + Written by: Georg Tuparev Heidelberg, Germany Tuparev@EMBL-Heidelberg.de + Modified by: Richard Frith-Macdonald This file is part of the GNUstep Base Library. @@ -523,7 +524,7 @@ int main(int argc, char *argv[], char *env[]) */ + (void)initializeWithArguments:(char**)argv count:(int)argc - environment:(char**)env; + environment:(char**)env { if (!_gnu_processName && !_gnu_arguments && !_gnu_environment) { diff --git a/Source/NSProtocolChecker.m b/Source/NSProtocolChecker.m index ed686ea47..e41eaab78 100644 --- a/Source/NSProtocolChecker.m +++ b/Source/NSProtocolChecker.m @@ -1,4 +1,4 @@ -/* Implementation of NSProtocolChecker for GNUStep +/** Implementation of NSProtocolChecker for GNUStep Copyright (C) 1995 Free Software Foundation, Inc. Written by: Mike Kienenberger diff --git a/Source/NSProxy.m b/Source/NSProxy.m index 3035deeff..e27e564e7 100644 --- a/Source/NSProxy.m +++ b/Source/NSProxy.m @@ -1,4 +1,4 @@ -/* Implementation for GNU Objective-C version of NSProxy +/** Implementation for GNU Objective-C version of NSProxy Copyright (C) 1997 Free Software Foundation, Inc. Written by: Richard Frith-Macdonald diff --git a/Source/NSRange.m b/Source/NSRange.m index 49f141877..8948d431e 100644 --- a/Source/NSRange.m +++ b/Source/NSRange.m @@ -1,6 +1,24 @@ -/* NSRange - range functions - -*/ +/** NSRange - range functions + * Copyright (C) 1993, 1994, 1995 Free Software Foundation, Inc. + * + * Written by: Adam Fedor + * Date: Mar 1995 + * + * This file is part of the GNUstep Base Library. + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ #include diff --git a/Source/NSRunLoop.m b/Source/NSRunLoop.m index 401c56aeb..d0e299a13 100644 --- a/Source/NSRunLoop.m +++ b/Source/NSRunLoop.m @@ -1,4 +1,4 @@ -/* Implementation of object for waiting on several input seurces +/** Implementation of object for waiting on several input seurces Copyright (C) 1996-1999 Free Software Foundation, Inc. Original by: Andrew Kachites McCallum @@ -650,12 +650,12 @@ static NSComparisonResult aSort(GSIArrayItem i0, GSIArrayItem i1) /* Running the run loop once through for timers and input listening. */ -- (BOOL) runOnceBeforeDate: date forMode: (NSString*)mode +- (BOOL) runOnceBeforeDate: (NSDate*)date forMode: (NSString*)mode { return [self runMode: mode beforeDate: date]; } -- (BOOL) runOnceBeforeDate: date +- (BOOL) runOnceBeforeDate: (NSDate*)date { return [self runOnceBeforeDate: date forMode: _current_mode]; } @@ -685,7 +685,7 @@ static NSComparisonResult aSort(GSIArrayItem i0, GSIArrayItem i1) [[self currentRunLoop] runUntilDate: date]; } -+ (BOOL) runOnceBeforeDate: date forMode: (NSString*)mode ++ (BOOL) runOnceBeforeDate: (NSDate*)date forMode: (NSString*)mode { return [[self currentRunLoop] runOnceBeforeDate: date forMode: mode]; } @@ -832,7 +832,7 @@ const NSMapTableValueCallBacks ArrayMapValueCallBacks = /* Adding timers. They are removed when they are invalid. */ -- (void) addTimer: timer +- (void) addTimer: (NSTimer*)timer forMode: (NSString*)mode { GSIArray timers; @@ -1015,7 +1015,7 @@ const NSMapTableValueCallBacks ArrayMapValueCallBacks = If LIMIT_DATE is nil, then don't wait; i.e. call select() with 0 timeout */ - (void) acceptInputForMode: (NSString*)mode - beforeDate: limit_date + beforeDate: (NSDate*)limit_date { NSTimeInterval ti; struct timeval timeout; @@ -1404,7 +1404,17 @@ const NSMapTableValueCallBacks ArrayMapValueCallBacks = - (void) runUntilDate: (NSDate*)date { - [self runUntilDate: date forMode: _current_mode]; + double ti = [date timeIntervalSinceNow]; + BOOL mayDoMore = YES; + + /* Positive values are in the future. */ + while (ti > 0 && mayDoMore == YES) + { + if (debug_run_loop) + printf ("\tNSRunLoop run until date %f seconds from now\n", ti); + mayDoMore = [self runMode: NSDefaultRunLoopMode beforeDate: date]; + ti = [date timeIntervalSinceNow]; + } } @end diff --git a/Source/NSScanner.m b/Source/NSScanner.m index 303da6bf3..3208b41cc 100644 --- a/Source/NSScanner.m +++ b/Source/NSScanner.m @@ -1,8 +1,10 @@ -/* Implemenation of NSScanner class +/** Implemenation of NSScanner class Copyright (C) 1996,1999 Free Software Foundation, Inc. Author: Eric Norum Date: 1996 + Rewrite/optimisation by: Richard Frith-Macdonald + Date: 1998 This file is part of the GNUstep Objective-C Library. diff --git a/Source/NSSerializer.m b/Source/NSSerializer.m index 87137cd7d..4a620ee0d 100644 --- a/Source/NSSerializer.m +++ b/Source/NSSerializer.m @@ -1,4 +1,4 @@ -/* Class for serialization in GNUStep +/** Class for serialization in GNUStep Copyright (C) 1997 Free Software Foundation, Inc. Written by: Richard Frith-Macdoanld diff --git a/Source/NSSet.m b/Source/NSSet.m index 1a913cfe7..498c214e5 100644 --- a/Source/NSSet.m +++ b/Source/NSSet.m @@ -1,4 +1,4 @@ -/* NSSet - Set object to store key/value pairs +/** NSSet - Set object to store key/value pairs Copyright (C) 1995, 1996, 1998 Free Software Foundation, Inc. Written by: Andrew Kachites McCallum diff --git a/Source/NSString.m b/Source/NSString.m index 35636570b..5ca187b4b 100644 --- a/Source/NSString.m +++ b/Source/NSString.m @@ -1,4 +1,4 @@ -/* Implementation of GNUSTEP string class +/** Implementation of GNUSTEP string class Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. Written by: Andrew Kachites McCallum @@ -1950,7 +1950,7 @@ handle_printf_atsign (FILE *stream, initWithCharactersNoCopy: s length: len freeWhenDone: YES]); } -- (NSString*) uppercaseString; +- (NSString*) uppercaseString { unichar *s; unsigned count; diff --git a/Source/NSTask.m b/Source/NSTask.m index 87928e229..eef7a269b 100644 --- a/Source/NSTask.m +++ b/Source/NSTask.m @@ -1,4 +1,4 @@ -/* Implementation for NSTask for GNUStep +/** Implementation for NSTask for GNUStep Copyright (C) 1998,1999 Free Software Foundation, Inc. Written by: Richard Frith-Macdonald @@ -394,7 +394,7 @@ pty_slave(const char* name) ASSIGN(_standardError, hdl); } -- (void) setStandardInput: (NSFileHandle*)hdl +- (void) setStandardInput: (id)hdl { NSAssert([hdl isKindOfClass: [NSFileHandle class]] || [hdl isKindOfClass: [NSPipe class]], NSInvalidArgumentException); @@ -406,7 +406,7 @@ pty_slave(const char* name) ASSIGN(_standardInput, hdl); } -- (void) setStandardOutput: (NSFileHandle*)hdl +- (void) setStandardOutput: (id)hdl { NSAssert([hdl isKindOfClass: [NSFileHandle class]] || [hdl isKindOfClass: [NSPipe class]], NSInvalidArgumentException); diff --git a/Source/NSThread.m b/Source/NSThread.m index 616bd246f..0162159a8 100644 --- a/Source/NSThread.m +++ b/Source/NSThread.m @@ -1,4 +1,4 @@ -/* Control of executable units within a shared virtual memory space +/** Control of executable units within a shared virtual memory space Copyright (C) 1996-2000 Free Software Foundation, Inc. Original Author: Scott Christley diff --git a/Source/NSTimeZone.m b/Source/NSTimeZone.m index 9e2ad4d93..e1f9d220d 100644 --- a/Source/NSTimeZone.m +++ b/Source/NSTimeZone.m @@ -1,4 +1,4 @@ -/* Time zone management. -*- Mode: ObjC -*- +/** Time zone management. -*- Mode: ObjC -*- Copyright (C) 1997 Free Software Foundation, Inc. Written by: Yoo C. Chung diff --git a/Source/NSTimer.m b/Source/NSTimer.m index 54147e75f..e75414156 100644 --- a/Source/NSTimer.m +++ b/Source/NSTimer.m @@ -1,9 +1,11 @@ -/* Implementation of NSTimer for GNUstep +/** Implementation of NSTimer for GNUstep Copyright (C) 1995, 1996, 1999 Free Software Foundation, Inc. Written by: Andrew Kachites McCallum Created: March 1996 + Rewrite by: Richard Frith-Macdonald + This file is part of the GNUstep Base Library. This library is free software; you can redistribute it and/or diff --git a/Source/NSURL.m b/Source/NSURL.m index b01a0df1e..4e3f99043 100644 --- a/Source/NSURL.m +++ b/Source/NSURL.m @@ -1,8 +1,8 @@ -/* NSUrl.m - Class NSURL +/** NSUrl.m - Class NSURL Copyright (C) 1999 Free Software Foundation, Inc. Written by: Manuel Guesdon - Date: Jan 1999 + Date: Jan 1999 This file is part of the GNUstep Library. diff --git a/Source/NSURLHandle.m b/Source/NSURLHandle.m index 74c629fcb..ecae68451 100644 --- a/Source/NSURLHandle.m +++ b/Source/NSURLHandle.m @@ -1,4 +1,4 @@ -/* NSURLHandle.m - Class NSURLHandle +/** NSURLHandle.m - Class NSURLHandle Copyright (C) 1999 Free Software Foundation, Inc. Written by: Manuel Guesdon diff --git a/Source/NSUnarchiver.m b/Source/NSUnarchiver.m index 031fc386b..62f6ef1ed 100644 --- a/Source/NSUnarchiver.m +++ b/Source/NSUnarchiver.m @@ -1,4 +1,4 @@ -/* Implementation of NSUnarchiver for GNUstep +/** Implementation of NSUnarchiver for GNUstep Copyright (C) 1998 Free Software Foundation, Inc. Written by: Richard frith-Macdonald diff --git a/Source/NSUndoManager.m b/Source/NSUndoManager.m index 7971930be..12e7313b2 100644 --- a/Source/NSUndoManager.m +++ b/Source/NSUndoManager.m @@ -1,4 +1,4 @@ -/* Implementatikon for for GNUStep +/** Implementatikon for for GNUStep Copyright (C) 1998 Free Software Foundation, Inc. Written by: Richard Frith-Macdonald diff --git a/Source/NSUser.m b/Source/NSUser.m index 77674c073..d08353ea2 100644 --- a/Source/NSUser.m +++ b/Source/NSUser.m @@ -1,4 +1,4 @@ -/* Implementation of login-related functions for GNUstep +/** Implementation of login-related functions for GNUstep Copyright (C) 1996 Free Software Foundation, Inc. Written by: Andrew Kachites McCallum diff --git a/Source/NSUserDefaults.m b/Source/NSUserDefaults.m index 94cdec8d4..e833d34c4 100644 --- a/Source/NSUserDefaults.m +++ b/Source/NSUserDefaults.m @@ -1,9 +1,10 @@ -/* Implementation for NSUserDefaults for GNUstep - Copyright (C) 1995, 1996 Free Software Foundation, Inc. +/** Implementation for NSUserDefaults for GNUstep + Copyright (C) 1995-2001 Free Software Foundation, Inc. - Written by: Georg Tuparev, EMBL & Academia Naturalis, + Written by: Georg Tuparev + EMBL & Academia Naturalis, Heidelberg, Germany - Tuparev@EMBL-Heidelberg.de + Modified by: Richard Frith-Macdonald This file is part of the GNUstep Base Library. diff --git a/Source/NSValue.m b/Source/NSValue.m index 5f4fec396..52ccce21b 100644 --- a/Source/NSValue.m +++ b/Source/NSValue.m @@ -1,4 +1,4 @@ -/* NSValue.m - Object encapsulation for C types. +/** NSValue.m - Object encapsulation for C types. Copyright (C) 1993, 1994, 1996, 1999 Free Software Foundation, Inc. Written by: Adam Fedor diff --git a/Source/NSZone.m b/Source/NSZone.m index 015037b55..fe31d8390 100644 --- a/Source/NSZone.m +++ b/Source/NSZone.m @@ -1,4 +1,4 @@ -/* Zone memory management. -*- Mode: ObjC -*- +/** Zone memory management. -*- Mode: ObjC -*- Copyright (C) 1997,1998 Free Software Foundation, Inc. Written by: Yoo C. Chung diff --git a/Source/Unicode.m b/Source/Unicode.m index d0aa5e914..0499e1c37 100644 --- a/Source/Unicode.m +++ b/Source/Unicode.m @@ -1,4 +1,4 @@ -/* Support functions for Unicode implementation +/** Support functions for Unicode implementation Function to determine default c string encoding for GNUstep based on GNUSTEP_STRING_ENCODING environment variable. diff --git a/Source/UnixFileHandle.m b/Source/UnixFileHandle.m index 3060fcd4c..4e04ea47d 100644 --- a/Source/UnixFileHandle.m +++ b/Source/UnixFileHandle.m @@ -1,4 +1,4 @@ -/* Implementation for UnixFileHandle for GNUStep +/** Implementation for UnixFileHandle for GNUStep Copyright (C) 1997-1999 Free Software Foundation, Inc. Written by: Richard Frith-Macdonald diff --git a/Source/WindowsFileHandle.m b/Source/WindowsFileHandle.m index 0bb5723e5..f81826a31 100644 --- a/Source/WindowsFileHandle.m +++ b/Source/WindowsFileHandle.m @@ -1,4 +1,4 @@ -/* Implementation for WindowsFileHandle for GNUStep +/** Implementation for WindowsFileHandle for GNUStep Copyright (C) 1997-1999 Free Software Foundation, Inc. Rewritten: Adam Fedor diff --git a/Source/behavior.m b/Source/behavior.m index f6ec77586..5cffd7351 100644 --- a/Source/behavior.m +++ b/Source/behavior.m @@ -1,4 +1,4 @@ -/* Behaviors for Objective-C, "for Protocols with implementations". +/** Behaviors for Objective-C, "for Protocols with implementations". Copyright (C) 1995, 1996 Free Software Foundation, Inc. Written by: Andrew Kachites McCallum diff --git a/Source/callframe.m b/Source/callframe.m index 68aa3fbfc..c72656b09 100644 --- a/Source/callframe.m +++ b/Source/callframe.m @@ -1,4 +1,4 @@ -/* callframe.m - Wrapper/Objective-C interface for ffcall function interface +/** callframe.m - Wrapper/Objective-C interface for ffcall function interface Copyright (C) 2000, Free Software Foundation, Inc. diff --git a/Source/cifframe.m b/Source/cifframe.m index e96f6bd99..446330b6f 100644 --- a/Source/cifframe.m +++ b/Source/cifframe.m @@ -1,4 +1,4 @@ -/* cifframe.m - Wrapper/Objective-C interface for ffi function interface +/** cifframe.m - Wrapper/Objective-C interface for ffi function interface Copyright (C) 1999, Free Software Foundation, Inc. diff --git a/Source/externs.m b/Source/externs.m index bda2c2779..920e3dc7a 100644 --- a/Source/externs.m +++ b/Source/externs.m @@ -1,4 +1,4 @@ -/* All of the external data +/** All of the external data Copyright (C) 1997 Free Software Foundation, Inc. Written by: Scott Christley diff --git a/Source/libgnustep-base-entry.m b/Source/libgnustep-base-entry.m index 97fcb2f48..931d5c71b 100644 --- a/Source/libgnustep-base-entry.m +++ b/Source/libgnustep-base-entry.m @@ -1,4 +1,4 @@ -/* DLL entry routine +/** DLL entry routine Copyright (C) 1996, 1997 Free Software Foundation, Inc. Original Author: Scott Christley diff --git a/Source/mframe.m b/Source/mframe.m index eed587e46..a6ea94f40 100644 --- a/Source/mframe.m +++ b/Source/mframe.m @@ -1,4 +1,4 @@ -/* Implementation of functions for dissecting/making method calls +/** Implementation of functions for dissecting/making method calls Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. Written by: Andrew Kachites McCallum diff --git a/Source/o_array.m b/Source/o_array.m index 4933dacb2..52e973091 100644 --- a/Source/o_array.m +++ b/Source/o_array.m @@ -1,4 +1,4 @@ -/* A (pretty good) implementation of a sparse array. +/** A (pretty good) implementation of a sparse array. * Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. * * Author: Albin L. Jones diff --git a/Tools/AGSParser.m b/Tools/AGSParser.m index 728a4729f..951003b72 100644 --- a/Tools/AGSParser.m +++ b/Tools/AGSParser.m @@ -684,14 +684,60 @@ fail: [mname appendString: token]; if (buffer[pos] != term) { - [self log: @"error parsing method name"]; - goto fail; + unsigned saved = pos; + + /* + * As a special case, try to cope with a method name separated + * from its body by a semicolon ... a common bug since the + * compiler doesn't pick it up! + */ + if (term == '{' && buffer[pos] == ';') + { + pos++; + if ([self skipWhiteSpace] >= length || buffer[pos] != term) + { + pos = saved; + } + } + if (buffer[pos] == term) + { + [self log: @"error in method definition ... " + @"semicolon after name"]; + } + else + { + [self log: @"error parsing method name"]; + goto fail; + } } } else { - [self log: @"error parsing method name"]; - goto fail; + unsigned saved = pos; + + /* + * As a special case, try to cope with a method name separated + * from its body by a semicolon ... a common bug since the + * compiler doesn't pick it up! + */ + if (term == '{' && buffer[pos] == ';') + { + pos++; + if ([self skipWhiteSpace] >= length || buffer[pos] != term) + { + pos = saved; + } + } + if (buffer[pos] == term) + { + [self log: @"error in method definition ... " + @"semicolon after name"]; + } + else + { + [self log: @"error parsing method name"]; + goto fail; + } } } @@ -934,11 +980,25 @@ fail: if (c == '(') { + /* + * Remove any whitespace before an opening bracket. + */ + if (ptr > start && ptr[-1] == ' ') + { + ptr--; + } *ptr++ = '('; nest++; } else if (c == ')') { + /* + * Remove any whitespace before a closing bracket. + */ + if (ptr > start && ptr[-1] == ' ') + { + ptr--; + } if (nest > 0) { *ptr++ = ')';