gnustep/apps-gorm
0
0
Fork 0
mirror of https://github.com/gnustep/apps-gorm.git synced 2025-02-24 20:11:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

A further correction of the header issue.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@17216 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Gregory John Casamento 2003-07-15 04:57:37 +00:00
parent bb1ae37e31
commit 0c5b33bc1c
1 changed files with 29 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
GormDocument.m
View file

@ -774,7 +774,8 @@ static NSImage *classesImage = nil;
GormClassManager *cm = [self classManager]; GormClassManager *cm = [self classManager];
NSCharacterSet *superClassStopSet = [NSCharacterSet characterSetWithCharactersInString: @" \n"]; NSCharacterSet *superClassStopSet = [NSCharacterSet characterSetWithCharactersInString: @" \n"];
NSCharacterSet *commentStopSet = [NSCharacterSet characterSetWithCharactersInString: @"\n"]; NSCharacterSet *commentStopSet = [NSCharacterSet characterSetWithCharactersInString: @"\n"];
NSCharacterSet *classStopSet = [NSCharacterSet characterSetWithCharactersInString: @" :("]; NSCharacterSet *classStopSet = [NSCharacterSet characterSetWithCharactersInString: @" :"];
NSCharacterSet *categoryStopSet = [NSCharacterSet characterSetWithCharactersInString: @" ("];
NSCharacterSet *typeStopSet = [NSCharacterSet characterSetWithCharactersInString: @" "]; NSCharacterSet *typeStopSet = [NSCharacterSet characterSetWithCharactersInString: @" "];
NSCharacterSet *actionStopSet = [NSCharacterSet characterSetWithCharactersInString: @";:"]; NSCharacterSet *actionStopSet = [NSCharacterSet characterSetWithCharactersInString: @";:"];
NSCharacterSet *outletStopSet = [NSCharacterSet characterSetWithCharactersInString: @";,"]; NSCharacterSet *outletStopSet = [NSCharacterSet characterSetWithCharactersInString: @";,"];
@ -827,12 +828,34 @@ static NSImage *classesImage = nil;
intoString: NULL]; intoString: NULL];
[classScanner scanUpToString: @"}" [classScanner scanUpToString: @"}"
intoString: &ivarString]; intoString: &ivarString];
category = (ivarString == nil);
if(!category)
{
[classScanner scanUpToString: @"@end" [classScanner scanUpToString: @"@end"
intoString: &methodString]; intoString: &methodString];
NSDebugLog(@"Found a class \"%@\" with super class \"%@\"", className, NSDebugLog(@"Found a class \"%@\" with super class \"%@\"", className,
superClassName); superClassName);
}
else
{
NSDebugLog(@"A CATEGORY");
classScanner = [NSScanner scannerWithString: classString];
[classScanner scanString: @"@interface"
intoString: NULL];
[classScanner scanUpToCharactersFromSet: categoryStopSet
intoString: &className];
[classScanner scanString: @"("
intoString: NULL];
[classScanner scanUpToCharactersFromSet: superClassStopSet
intoString: &superClassName];
[classScanner scanString: @")"
intoString: NULL];
[classScanner scanUpToString: @"@end"
intoString: &methodString];
NSDebugLog(@"method String %@",methodString);
}
category = (ivarString == nil);
// if its' not a category and it's known, ask before proceeding... // if its' not a category and it's known, ask before proceeding...
if([cm isKnownClass: className] && !category) if([cm isKnownClass: className] && !category)
@ -960,7 +983,7 @@ static NSImage *classesImage = nil;
[cm isCustomClass: className] && category) [cm isCustomClass: className] && category)
{ {
[cm addActions: actions forClassNamed: className]; [cm addActions: actions forClassNamed: className];
[cm addOutlets: actions forClassNamed: className]; [cm addOutlets: outlets forClassNamed: className];
result = YES; result = YES;
} }
else else