Some bug fixes to header parsing and a documentation change.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@15579 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Gregory John Casamento 2003-01-12 06:29:19 +00:00
parent 82b8ee1eb4
commit a03ab599c2
3 changed files with 31 additions and 12 deletions

View file

@ -1,3 +1,12 @@
2003-01-12 Gregory John Casamento <greg_casamento@yahoo.com>
* GormDocument.m: -[GormDocument parseHeader:]: Fixed a
problem parsing headers with multiple variables in one
declarations (e.g. "id x,y,z"). Also added code
to recognize actions in the form of "(id) actionName: (id)x".
* Documentation/Gorm.texi: Modified docs to show current
status of Gorm.
2003-01-09 Gregory John Casamento <greg_casamento@yahoo.com>
* GormCustomView.m: Corrected problem with dummy implementation

View file

@ -117,7 +117,13 @@ See the file @samp{COPYING}.
@item
Richard Frith-Macdonald <richard@@brainstorm.co.uk> wrote
Gorm as part of the GNUstep project.
@item
Gregory John Casamento <greg_casamento@@yahoo.com> Is the
current maintaner of Gorm. Has implemented lots of new
features and rewritten large portions of the existing code.
@item
Pierre-Yves Rivaille <gnustep@@rivaille.net> Is also a
major contributor to the Gorm application.
@end itemize
@node Installation, News, Contributors, Top
@ -134,10 +140,7 @@ Gorm as part of the GNUstep project.
@itemize @bullet
@item Add more inspectors
@item Add more editors
@item Add support for matrix
@item Add support for grouping in box/scrollview
@item Debug and stabilize existing code.
@end itemize

View file

@ -749,8 +749,9 @@ static NSImage *classesImage = nil;
NSCharacterSet *superClassStopSet = [NSCharacterSet characterSetWithCharactersInString: @" \n"];
NSCharacterSet *classStopSet = [NSCharacterSet characterSetWithCharactersInString: @" :"];
NSCharacterSet *actionStopSet = [NSCharacterSet characterSetWithCharactersInString: @";:"];
NSCharacterSet *outletStopSet = [NSCharacterSet characterSetWithCharactersInString: @";,"];
NSArray *outletTokens = [NSArray arrayWithObjects: @"id", @"IBOutlet id", nil];
NSArray *actionTokens = [NSArray arrayWithObjects: @"(void)", @"(IBAction)", nil];
NSArray *actionTokens = [NSArray arrayWithObjects: @"(void)", @"(IBAction)", @"(id)",nil];
while(![headerScanner isAtEnd])
{
@ -803,19 +804,25 @@ static NSImage *classesImage = nil;
// ivar an outlet.
while((outletToken = [outletEnum nextObject]) != nil)
{
NSString *delimiter = nil;
NSDebugLog(@"outlet Token = %@",outletToken);
// Scan the variables of the class...
ivarScanner = [NSScanner scannerWithString: ivarString];
while(![ivarScanner isAtEnd])
{
NSString *outlet = nil;
[ivarScanner scanUpToString: outletToken
intoString: NULL];
[ivarScanner scanString: outletToken
intoString: NULL];
[ivarScanner scanUpToString: @";"
if(delimiter == nil || [delimiter isEqualToString: @";"])
{
[ivarScanner scanUpToString: outletToken
intoString: NULL];
[ivarScanner scanString: outletToken
intoString: NULL];
}
[ivarScanner scanUpToCharactersFromSet: outletStopSet
intoString: &outlet];
[ivarScanner scanCharactersFromSet: outletStopSet
intoString: &delimiter];
if([ivarScanner isAtEnd] == NO
&& [outlets indexOfObject: outlet] == NSNotFound)
{