minor fixes

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@17160 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -1,3 +1,8 @@
+2003-07-06  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* 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  <fedor@gnu.org>
 
 	* configure.ac: Add flags for openbsd like freebsd.

Source/NSConnection.m

@@ -783,45 +783,45 @@ static BOOL	multi_threaded = NO;
 /** <init />
  * Initialises an NSConnection with the receive port r and the 
  * send port s.<br />
- *  Behavior varies with the port values as follows -
+ * Behavior varies with the port values as follows -
- *  <deflist>
+ * <deflist>
- *    <term>r is <code>nil</code></term>
+ *   <term>r is <code>nil</code></term>
- *    <desc>
+ *   <desc>
- *      The NSConnection is released and the method returns
+ *     The NSConnection is released and the method returns
- *      <code>nil</code>.
+ *     <code>nil</code>.
- *    </desc>
+ *   </desc>
- *    <term>s is <code>nil</code></term>
+ *   <term>s is <code>nil</code></term>
- *    <desc>
+ *   <desc>
- *      The NSConnection uses r as the send port as
+ *     The NSConnection uses r as the send port as
- *      well as the receive port.
+ *     well as the receive port.
- *    </desc>
+ *   </desc>
- *    <term>s is the same as r</term>
+ *   <term>s is the same as r</term>
- *    <desc>
+ *   <desc>
- *      The NSConnection is usable only for vending objects.
+ *     The NSConnection is usable only for vending objects.
- *    </desc>
+ *   </desc>
- *    <term>A connection with the same ports exists</term>
+ *   <term>A connection with the same ports exists</term>
- *    <desc>
+ *   <desc>
- *      The new connection is released and the old connection
+ *     The new connection is released and the old connection
- *      is retained and returned.
+ *     is retained and returned.
- *    </desc>
+ *   </desc>
- *    <term>A connection with the same ports (swapped) exists</term>
+ *   <term>A connection with the same ports (swapped) exists</term>
- *    <desc>
+ *   <desc>
- *      The new connection is initialised as normal, and will
+ *     The new connection is initialised as normal, and will
- *      communicate with the old connection.
+ *     communicate with the old connection.
- *    </desc>
+ *   </desc>
- *  </deflist>
+ * </deflist>
- *  <p>
+ * <p>
- *    If a connection exists whose send and receive ports are
+ *   If a connection exists whose send and receive ports are
- *    both the same as the new connections receive port, that
+ *   both the same as the new connections receive port, that
- *    existing connection is deemed to be the parent of the
+ *   existing connection is deemed to be the parent of the
- *    new connection.  The new connection inherits configuration
+ *   new connection.  The new connection inherits configuration
- *    information from the parent, and the delegate of the
+ *   information from the parent, and the delegate of the
- *    parent has a chance to adjust ythe configuration of the
+ *   parent has a chance to adjust ythe configuration of the
- *    new connection or veto its creation.
+ *   new connection or veto its creation.
- *    <br/>
+ *   <br/>
- *    NSConnectionDidInitializeNotification is posted once a new
+ *   NSConnectionDidInitializeNotification is posted once a new
- *    connection is initialised.
+ *   connection is initialised.
- *  </p>
+ * </p>
  */
 - (id) initWithReceivePort: (NSPort*)r
 		  sendPort: (NSPort*)s

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];
+			  catDict = [unitDict objectForKey: cName];
-			  [m addEntriesFromDictionary: catDict];
+			  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: @"<li><a rel=\"gsdoc\" href="];
 	  if (isInUnit == YES)

Tools/AGSParser.m

@@ -408,12 +408,17 @@
 	  *end++ = '\n';
 
 	  /*
-	   * If next line in the comment starts with whitespace followed
+	   * If second line in the comment starts with whitespace followed
 	   * by an asterisk, we assume all the lines in the comment start
 	   * in a similar way, and everything up to and including the
 	   * asterisk on each line should be stripped.
 	   * Otherwise we take the comment verbatim.
 	   */
+	  while (ptr < end && *ptr != '\n')
+	    {
+	      ptr++;
+	    }
+	  ptr++;	// Step past the end of the first line.
 	  while (ptr < end)
 	    {
 	      unichar	c = *ptr++;