From fcc832f13d7bb3634d7928b3737d7a07261da031 Mon Sep 17 00:00:00 2001 From: CaS Date: Sun, 6 Jul 2003 06:34:34 +0000 Subject: [PATCH] minor fixes git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@17160 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 5 +++ Source/NSConnection.m | 78 +++++++++++++++++++++---------------------- Tools/AGSHtml.m | 31 +++++++++++++++-- Tools/AGSParser.m | 7 +++- 4 files changed, 78 insertions(+), 43 deletions(-) diff --git a/ChangeLog b/ChangeLog index 61add7d2b..ab46c90cd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-07-06 Richard Frith-Macdonald + + * Tools/AGSHtml.m: Fix bug in linking to category methods from index. + * Tools/AGSParser.m: Improve parsing of clock comments. + 2003-07-05 Adam Fedor * configure.ac: Add flags for openbsd like freebsd. diff --git a/Source/NSConnection.m b/Source/NSConnection.m index e83369e18..40c2f81f9 100644 --- a/Source/NSConnection.m +++ b/Source/NSConnection.m @@ -783,45 +783,45 @@ static BOOL multi_threaded = NO; /** * Initialises an NSConnection with the receive port r and the * send port s.
- * Behavior varies with the port values as follows - - * - * r is nil - * - * The NSConnection is released and the method returns - * nil. - * - * s is nil - * - * The NSConnection uses r as the send port as - * well as the receive port. - * - * s is the same as r - * - * The NSConnection is usable only for vending objects. - * - * A connection with the same ports exists - * - * The new connection is released and the old connection - * is retained and returned. - * - * A connection with the same ports (swapped) exists - * - * The new connection is initialised as normal, and will - * communicate with the old connection. - * - * - *

- * If a connection exists whose send and receive ports are - * both the same as the new connections receive port, that - * existing connection is deemed to be the parent of the - * new connection. The new connection inherits configuration - * information from the parent, and the delegate of the - * parent has a chance to adjust ythe configuration of the - * new connection or veto its creation. - *
- * NSConnectionDidInitializeNotification is posted once a new - * connection is initialised. - *

+ * Behavior varies with the port values as follows - + * + * r is nil + * + * The NSConnection is released and the method returns + * nil. + * + * s is nil + * + * The NSConnection uses r as the send port as + * well as the receive port. + * + * s is the same as r + * + * The NSConnection is usable only for vending objects. + * + * A connection with the same ports exists + * + * The new connection is released and the old connection + * is retained and returned. + * + * A connection with the same ports (swapped) exists + * + * The new connection is initialised as normal, and will + * communicate with the old connection. + * + * + *

+ * If a connection exists whose send and receive ports are + * both the same as the new connections receive port, that + * existing connection is deemed to be the parent of the + * new connection. The new connection inherits configuration + * information from the parent, and the delegate of the + * parent has a chance to adjust ythe configuration of the + * new connection or veto its creation. + *
+ * NSConnectionDidInitializeNotification is posted once a new + * connection is initialised. + *

*/ - (id) initWithReceivePort: (NSPort*)r sendPort: (NSPort*)s diff --git a/Tools/AGSHtml.m b/Tools/AGSHtml.m index 61c255a25..c72db560a 100644 --- a/Tools/AGSHtml.m +++ b/Tools/AGSHtml.m @@ -393,11 +393,26 @@ static NSMutableSet *textNodes = nil; { NSString *catName = [catNames objectAtIndex: i]; NSDictionary *catDict; + NSString *cName; + NSEnumerator *enumerator; + NSString *mname; - catName = [classname stringByAppendingFormat: @"(%@)", + cName = [classname stringByAppendingFormat: @"(%@)", catName]; - catDict = [unitDict objectForKey: catName]; - [m addEntriesFromDictionary: catDict]; + catDict = [unitDict objectForKey: cName]; + enumerator = [catDict keyEnumerator]; + /* + * Add category references to the dictionary, + * prefixing them with the category they belong to. + */ + while ((mname = [enumerator nextObject]) != nil) + { + NSString *file = [catDict objectForKey: mname]; + NSString *ref = [NSString stringWithFormat: + @"(%@)%@", catName, mname]; + + [m setObject: file forKey: ref]; + } } dict = AUTORELEASE(m); } @@ -421,6 +436,16 @@ static NSMutableSet *textNodes = nil; NSString *file = [dict objectForKey: ref]; NSString *text = ref; + /* + * If a reference to a method contains a leading catergory name, + * we don't want it in the visiable method name. + */ + if ([text hasPrefix: @"("] == YES) + { + NSRange r = [text rangeOfString: @")"]; + text = [text substringFromIndex: NSMaxRange(r)]; + } + [buf appendString: indent]; [buf appendString: @"