Author: gcasa
Date: Tue May 27 01:26:23 2014
New Revision: 37910
URL: http://svn.gna.org/viewcvs/gnustep?rev=37910&view=rev
Log:
Fix for bug#30837
Modified:
apps/gorm/trunk/ChangeLog
apps/gorm/trunk/GormObjCHeaderParser/OCIVar.m
apps/gorm/trunk/GormObjCHeaderParser/OCIVarDecl.m
Modified: apps/gorm/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/apps/gorm/trunk/ChangeLog?rev=37910&r1=37909&r2=37910&view=diff
==============================================================================
--- apps/gorm/trunk/ChangeLog (original)
+++ apps/gorm/trunk/ChangeLog Tue May 27 01:26:23 2014
@@ -1,3 +1,8 @@
+2014-05-26 19:25-EDT Gregory John Casamento <[email protected]>
+
+ * GormObjCHeaderParser/OCIVarDecl.m
+ * GormObjCHeaderParser/OCIVar.m: Fix for bug#30837.
+
2014-05-26 18:32-EDT Gregory John Casamento <[email protected]>
* Palettes/2Controls/GormFormAttributesInspector.h
Modified: apps/gorm/trunk/GormObjCHeaderParser/OCIVar.m
URL:
http://svn.gna.org/viewcvs/gnustep/apps/gorm/trunk/GormObjCHeaderParser/OCIVar.m?rev=37910&r1=37909&r2=37910&view=diff
==============================================================================
--- apps/gorm/trunk/GormObjCHeaderParser/OCIVar.m (original)
+++ apps/gorm/trunk/GormObjCHeaderParser/OCIVar.m Tue May 27 01:26:23 2014
@@ -34,7 +34,7 @@
{
if((self = [super init]) != nil)
{
- ASSIGN(ivarString, string);
+ ASSIGN(ivarString, [string copy]);
}
return self;
}
@@ -68,9 +68,12 @@
- (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
Modified: apps/gorm/trunk/GormObjCHeaderParser/OCIVarDecl.m
URL:
http://svn.gna.org/viewcvs/gnustep/apps/gorm/trunk/GormObjCHeaderParser/OCIVarDecl.m?rev=37910&r1=37909&r2=37910&view=diff
==============================================================================
--- apps/gorm/trunk/GormObjCHeaderParser/OCIVarDecl.m (original)
+++ apps/gorm/trunk/GormObjCHeaderParser/OCIVarDecl.m Tue May 27 01:26:23 2014
@@ -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 = @"";
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
