mirror of
https://github.com/gnustep/apps-gorm.git
synced 2025-02-24 12:01:16 +00:00
A further correction of the header issue.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@17216 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
bb1ae37e31
commit
0c5b33bc1c
1 changed files with 29 additions and 6 deletions
|
@ -774,7 +774,8 @@ static NSImage *classesImage = nil;
|
|||
GormClassManager *cm = [self classManager];
|
||||
NSCharacterSet *superClassStopSet = [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 *actionStopSet = [NSCharacterSet characterSetWithCharactersInString: @";:"];
|
||||
NSCharacterSet *outletStopSet = [NSCharacterSet characterSetWithCharactersInString: @";,"];
|
||||
|
@ -827,12 +828,34 @@ static NSImage *classesImage = nil;
|
|||
intoString: NULL];
|
||||
[classScanner scanUpToString: @"}"
|
||||
intoString: &ivarString];
|
||||
|
||||
category = (ivarString == nil);
|
||||
if(!category)
|
||||
{
|
||||
[classScanner scanUpToString: @"@end"
|
||||
intoString: &methodString];
|
||||
NSDebugLog(@"Found a class \"%@\" with super class \"%@\"", className,
|
||||
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([cm isKnownClass: className] && !category)
|
||||
|
@ -960,7 +983,7 @@ static NSImage *classesImage = nil;
|
|||
[cm isCustomClass: className] && category)
|
||||
{
|
||||
[cm addActions: actions forClassNamed: className];
|
||||
[cm addOutlets: actions forClassNamed: className];
|
||||
[cm addOutlets: outlets forClassNamed: className];
|
||||
result = YES;
|
||||
}
|
||||
else
|
||||
|
|
Loading…
Reference in a new issue