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

Fixes crash seen after last commit.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@38376 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Gregory John Casamento 2015-03-02 22:51:36 +00:00
parent 3dc14cfc65
commit c2e600fc22
3 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2015-03-02 00:04-EST Gregory John Casamento <greg.casamento@gmail.com>
* GormObjCHeaderParser/NSScanner+OCHeaderParser.m
* GormObjCHeaderParser/OCHeaderParser.m: Fix for crash seen after
last commit.
2015-03-02 00:04-EST Gregory John Casamento <greg.casamento@gmail.com> 2015-03-02 00:04-EST Gregory John Casamento <greg.casamento@gmail.com>
* GormObjCHeaderParser/OCHeaderParser.m: Add _stripRedundantStatements * GormObjCHeaderParser/OCHeaderParser.m: Add _stripRedundantStatements

16
GormObjCHeaderParser/NSScanner+OCHeaderParser.m
View file

@ -30,25 +30,31 @@
- (void) scanUpToAndIncludingString: (NSString *)string - (void) scanUpToAndIncludingString: (NSString *)string
intoString: (NSString **)buffer intoString: (NSString **)buffer
{ {
NSString *buffer2; NSString *buffer2 = nil;
[self scanUpToString: string intoString: buffer]; [self scanUpToString: string intoString: buffer];
[self scanString: string intoString: &buffer2]; [self scanString: string intoString: &buffer2];
if(buffer != NULL) if(buffer != NULL)
{ {
*buffer = [*buffer stringByAppendingString: buffer2]; if(*buffer != NULL)
{
*buffer = [*buffer stringByAppendingString: buffer2];
}
} }
} }
- (void) scanUpToAndIncludingCharactersFromSet: (NSCharacterSet *)set - (void) scanUpToAndIncludingCharactersFromSet: (NSCharacterSet *)set
intoString: (NSString **)buffer intoString: (NSString **)buffer
{ {
NSString *buffer2; NSString *buffer2 = nil;
[self scanUpToCharactersFromSet: set intoString: buffer]; [self scanUpToCharactersFromSet: set intoString: buffer];
[self scanCharactersFromSet: set intoString: &buffer2]; [self scanCharactersFromSet: set intoString: &buffer2];
if(buffer != NULL) if(buffer != NULL)
{ {
*buffer = [*buffer stringByAppendingString: buffer2]; if(*buffer != NULL)
{
*buffer = [*buffer stringByAppendingString: buffer2];
}
} }
} }
@end @end

4
GormObjCHeaderParser/OCHeaderParser.m
View file

@ -101,7 +101,7 @@
[scanner setCharactersToBeSkipped: nil]; [scanner setCharactersToBeSkipped: nil];
while(![scanner isAtEnd]) while(![scanner isAtEnd])
{ {
NSString *tempString = nil; NSString *tempString = @"";
[scanner scanUpToString: @"#" intoString: &tempString]; [scanner scanUpToString: @"#" intoString: &tempString];
[scanner scanUpToAndIncludingString: @"\n" intoString: NULL]; [scanner scanUpToAndIncludingString: @"\n" intoString: NULL];
resultString = [resultString stringByAppendingString: tempString]; resultString = [resultString stringByAppendingString: tempString];
@ -121,6 +121,8 @@
while(![scanner isAtEnd]) while(![scanner isAtEnd])
{ {
NSString *tempString = nil, *aString = nil; NSString *tempString = nil, *aString = nil;
// [scanner scanUpToString: @";" intoString: &tempString];
// [scanner scanString: @";" intoString: &tempString2];
[scanner scanUpToAndIncludingString: @";" intoString: &tempString]; [scanner scanUpToAndIncludingString: @";" intoString: &tempString];
// Scan any redundant ";" characters into aString... once it // Scan any redundant ";" characters into aString... once it