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

Fix for bug#30837

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@37910 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Gregory John Casamento 2014-05-26 23:26:23 +00:00
parent 4c6a4d7baf
commit 3323b82516
3 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2014-05-26 19:25-EDT Gregory John Casamento <greg.casamento@gmail.com>
* GormObjCHeaderParser/OCIVarDecl.m
* GormObjCHeaderParser/OCIVar.m: Fix for bug#30837.
2014-05-26 18:32-EDT Gregory John Casamento <greg.casamento@gmail.com>
* Palettes/2Controls/GormFormAttributesInspector.h

12
GormObjCHeaderParser/OCIVar.m
View file

@ -34,7 +34,7 @@
{
if((self = [super init]) != nil)
{
ASSIGN(ivarString, string);
ASSIGN(ivarString, [string copy]);
}
return self;
}
@ -68,10 +68,13 @@
- (void) _strip
{
NSScanner *stripScanner = [NSScanner scannerWithString: ivarString];
NSString *replacementString = [ivarString stringByReplacingOccurrencesOfString:@"*" withString:@" "];
NSScanner *stripScanner = [NSScanner scannerWithString: replacementString];
NSString *resultString = @"";
NSCharacterSet *wsnl = [NSCharacterSet whitespaceAndNewlineCharacterSet];
// [stripScanner setCharactersToBeSkipped: [NSCharacterSet characterSetWithCharactersInString: @"*"]];
// string whitespace
while(![stripScanner isAtEnd])
{
@ -95,6 +98,7 @@
[self _strip];
scanner = [NSScanner scannerWithString: ivarString];
[scanner setCharactersToBeSkipped: [NSCharacterSet characterSetWithCharactersInString: @"*"]];
if(lookAhead(ivarString,@"IBOutlet"))
{
[scanner scanUpToAndIncludingString: @"IBOutlet" intoString: NULL]; // return type
@ -121,8 +125,8 @@
// fix name...
scanner = [NSScanner scannerWithString: tempName];
[scanner setCharactersToBeSkipped: [NSCharacterSet characterSetWithCharactersInString: @"*"]];
[scanner scanUpToCharactersFromSet: wsnl intoString: &name];
name = [name stringByTrimmingCharactersInSet: wsnl];
// [scanner scanUpToCharactersFromSet: wsnl intoString: &name];
name = [tempName stringByTrimmingCharactersInSet: wsnl];
RETAIN(name);
}
@end

3
GormObjCHeaderParser/OCIVarDecl.m
View file

@ -60,7 +60,8 @@
- (void) _strip
{
NSScanner *stripScanner = [NSScanner scannerWithString: ivarString];
NSString *replacementString = [ivarString stringByReplacingOccurrencesOfString:@"*" withString:@" "];
NSScanner *stripScanner = [NSScanner scannerWithString: replacementString];
NSString *resultString = nil;
NSString *tempString = @"";
NSString *tempString2 = @"";