gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-30 00:11:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

More tidyups

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@12019 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
CaS 2002-01-07 11:24:52 +00:00
parent 1d5e765abd
commit 81589b35ad
5 changed files with 93 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

62
Tools/AGSHtml.m
View file

@ -279,14 +279,48 @@ static NSMutableSet *textNodes = nil;
if ([dict count] > 1
|| ([dict count] > 0 && [type isEqual: @"title"] == NO))
{
NSArray *a = [dict allKeys];
unsigned c = [a count];
unsigned i;
NSString *sep = @"";
NSArray *a = [dict allKeys];
unsigned c = [a count];
NSMutableSet *unitNames = nil;
unsigned i;
NSString *sep = @"";
BOOL isInUnit = NO;
if ([type isEqual: @"ivariable"])
if ([type isEqual: @"method"] || [type isEqual: @"ivariable"])
{
sep = @"*";
isInUnit = YES;
if ([type isEqual: @"ivariable"])
{
sep = @"*";
}
else if (unit != nil)
{
/*
* Create a mutable set containing the unit name.
*/
unitNames = [NSMutableSet setWithObject: unit];
/*
* if the unit is a class, add all its categories to the set.
*/
if ([unit hasSuffix: @")"] == NO)
{
NSArray *categoryNames;
unsigned l = [unit length];
categoryNames = [[dict objectForKey: @"category"] allKeys];
i = [categoryNames count];
while (i-- > 0)
{
NSString *n = [categoryNames objectAtIndex: i];
if ([n hasPrefix: unit] == YES && [n length] > l
&& [n characterAtIndex: i] == '(')
{
[unitNames addObject: n];
}
}
}
}
}
a = [a sortedArrayUsingSelector: @selector(compare:)];
@ -298,33 +332,25 @@ static NSMutableSet *textNodes = nil;
for (i = 0; i < c; i++)
{
if ([type isEqual: @"method"] || [type isEqual: @"ivariable"])
if (isInUnit == YES)
{
NSString *ref = [a objectAtIndex: i];
NSDictionary *units = [dict objectForKey: ref];
NSMutableArray *b = [[units allKeys] mutableCopy];
unsigned j;
if (unit != nil)
if (unitNames != nil)
{
/*
* Remove any listing for methods not in the
* current unit or in categories of the
* current class.
* current unit or in categories of the current class.
*/
for (j = 0; j < [b count]; j++)
{
NSString *u = [b objectAtIndex: j];
if ([unit isEqual: u] == NO)
if ([unitNames member: u] == NO)
{
if ([unit hasSuffix: @")"] == NO
&& [u hasPrefix: unit] == YES
&& [u characterAtIndex: [unit length]]
== '(')
{
continue;
}
[b removeObjectAtIndex: j--];
}
}