mirror of
https://github.com/gnustep/libs-base.git
synced 2025-04-22 16:33:29 +00:00
More documentation tweaks
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@22114 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
39e544280e
commit
57e466d642
3 changed files with 43 additions and 29 deletions
|
@ -530,8 +530,8 @@ typedef enum {
|
|||
/**
|
||||
* This is the nameserver handling ports used for distributed objects
|
||||
* communications (see [NSConnection]) between hosts.<br />
|
||||
* Use the +sharedInstance method to get a nameserver, rather than
|
||||
* allocating and initialising one.
|
||||
* Use the [NSSocketPortNameServer+sharedInstance] method to get a
|
||||
* nameserver, rather than allocating and initialising one.
|
||||
*/
|
||||
@implementation NSSocketPortNameServer
|
||||
|
||||
|
|
|
@ -217,11 +217,25 @@ static NSString *mainFont = nil;
|
|||
}
|
||||
else if (u == nil)
|
||||
{
|
||||
s = [localRefs unitRef: r type: t unit: &u];
|
||||
NSString *tmp = unit;
|
||||
|
||||
s = [localRefs unitRef: r type: t unit: &tmp];
|
||||
if (s == nil)
|
||||
{
|
||||
s = [globalRefs unitRef: r type: t unit: &u];
|
||||
tmp = u;
|
||||
s = [localRefs unitRef: r type: t unit: &tmp];
|
||||
if (s == nil)
|
||||
{
|
||||
tmp = unit;
|
||||
s = [globalRefs unitRef: r type: t unit: &tmp];
|
||||
if (s == nil)
|
||||
{
|
||||
tmp = nil;
|
||||
s = [globalRefs unitRef: r type: t unit: &tmp];
|
||||
}
|
||||
}
|
||||
}
|
||||
u = tmp;
|
||||
}
|
||||
if (s == nil)
|
||||
{
|
||||
|
@ -1581,7 +1595,10 @@ static NSString *mainFont = nil;
|
|||
[linkRef setString:sel];
|
||||
[linkRef replaceString: @" " withString: @""];
|
||||
|
||||
s = [self makeLink: linkRef ofType: @"method" inUnit: nil isRef: NO];
|
||||
s = [self makeLink: linkRef
|
||||
ofType: @"method"
|
||||
inUnit: nil
|
||||
isRef: NO];
|
||||
if (s != nil)
|
||||
{
|
||||
[buf appendString: s];
|
||||
|
@ -1658,8 +1675,9 @@ static NSString *mainFont = nil;
|
|||
|
||||
// fill in default value
|
||||
if ((type == nil) || [type isEqual: @""])
|
||||
{
|
||||
type = @"label";
|
||||
|
||||
}
|
||||
if ([type isEqual: @"method"] || [type isEqual: @"ivariable"])
|
||||
{
|
||||
s = [self makeLink: r ofType: type inUnit: c isRef: YES];
|
||||
|
|
|
@ -710,7 +710,7 @@ setDirectory(NSMutableDictionary *dict, NSString *path)
|
|||
if (*u == nil)
|
||||
{
|
||||
NSEnumerator *e;
|
||||
NSString *unit;
|
||||
NSString *n;
|
||||
unsigned count = 0;
|
||||
|
||||
/**
|
||||
|
@ -721,10 +721,10 @@ setDirectory(NSMutableDictionary *dict, NSString *path)
|
|||
* the class is taken in preference to the protocol.
|
||||
*/
|
||||
e = [t keyEnumerator];
|
||||
while ((unit = [e nextObject]) != nil)
|
||||
while ((n = [e nextObject]) != nil)
|
||||
{
|
||||
*u = unit;
|
||||
if ([unit hasPrefix: @"("] == NO)
|
||||
*u = n;
|
||||
if ([n hasPrefix: @"("] == NO)
|
||||
{
|
||||
if (count++ > 0)
|
||||
{
|
||||
|
@ -750,15 +750,24 @@ setDirectory(NSMutableDictionary *dict, NSString *path)
|
|||
return s;
|
||||
}
|
||||
|
||||
/**
|
||||
* If the unit that the method has been asked to look in is a
|
||||
* protocol which is not found, the lookup must fail.
|
||||
*/
|
||||
if ([*u hasPrefix: @"("] == YES)
|
||||
{
|
||||
*u = nil;
|
||||
return nil;
|
||||
}
|
||||
|
||||
/*
|
||||
* (If unit is a category, method was probably indexed under the class,
|
||||
* so check it.)
|
||||
* If unit is a category, method was probably indexed under the class,
|
||||
* so wirk with the class instead of the category.
|
||||
*/
|
||||
if ([*u length] > 0 && [*u characterAtIndex: [*u length] - 1] == ')')
|
||||
{
|
||||
NSString *className =
|
||||
[*u substringToIndex: [*u rangeOfString: @"("].location];
|
||||
s = [t objectForKey: className];
|
||||
*u = [*u substringToIndex: [*u rangeOfString: @"("].location];
|
||||
s = [t objectForKey: *u];
|
||||
if (s != nil)
|
||||
{
|
||||
return s;
|
||||
|
@ -766,26 +775,13 @@ setDirectory(NSMutableDictionary *dict, NSString *path)
|
|||
}
|
||||
|
||||
/**
|
||||
* If the unit that the method has been asked to look in is a
|
||||
* category or protocol which is not found, the lookup must fail.
|
||||
*/
|
||||
if ([t objectForKey: *u] == nil
|
||||
&& ([*u length] == 0 || [*u characterAtIndex: [*u length] - 1] == ')'))
|
||||
{
|
||||
*u = nil;
|
||||
return nil;
|
||||
}
|
||||
|
||||
/**
|
||||
* If the unit is a class, and ref was not found in it, then this
|
||||
* method will succeed if ref can be found in any superclass of the class.
|
||||
* Try all superclasses in turn.
|
||||
*/
|
||||
while (*u != nil)
|
||||
{
|
||||
*u = [self globalRef: *u type: @"super"];
|
||||
if (*u != nil)
|
||||
{
|
||||
*u = [*u lastPathComponent];
|
||||
s = [t objectForKey: *u];
|
||||
if (s != nil)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue