Author: rfm
Date: Mon Mar 20 15:40:41 2017
New Revision: 40404
URL: http://svn.gna.org/viewcvs/gnustep?rev=40404&view=rev
Log:
Handle NS_ENUM declarations
Modified:
libs/base/trunk/Tools/AGSParser.m
Modified: libs/base/trunk/Tools/AGSParser.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Tools/AGSParser.m?rev=40404&r1=40403&r2=40404&view=diff
==============================================================================
--- libs/base/trunk/Tools/AGSParser.m (original)
+++ libs/base/trunk/Tools/AGSParser.m Mon Mar 20 15:40:41 2017
@@ -1401,26 +1401,64 @@
*/
if ([s isEqualToString: @"struct"] == YES
|| [s isEqualToString: @"union"] == YES
- || [s isEqualToString: @"enum"] == YES)
- {
- BOOL isEnum = [s isEqualToString: @"enum"];
+ || [s isEqualToString: @"enum"] == YES
+ || [s isEqualToString: @"NS_ENUM"] == YES)
+ {
+ BOOL isEnum = NO;
NSString *tmp = s;
- s = [self parseIdentifier];
- if (s == nil)
- {
- s = [NSString stringWithFormat: @"%@ ...", tmp];
- }
+ if ([s isEqualToString: @"NS_ENUM"])
+ {
+ if ([self skipSpaces] < length && buffer[pos] == '(')
+ {
+ pos++;
+ [self skipSpaces];
+ s = [self parseIdentifier];
+ if (nil != s && [self skipSpaces] < length
+ && buffer[pos] == ',')
+ {
+ tmp = [@"NS_ENUM" stringByAppendingFormat: @"(%@)", s];
+ pos++;
+ [self skipSpaces];
+ s = [self parseIdentifier];
+ if (nil != s && [self skipSpaces] < length
+ && buffer[pos] == ')')
+ {
+ isEnum = YES;
+ pos++;
+ [d setObject: s forKey: @"Name"];
+ s = tmp;
+ }
+ }
+ }
+ if (NO == isEnum)
+ {
+ [self log: @"messed up NS_ENUM declaration"];
+ [arp drain];
+ return nil;
+ }
+ }
else
- {
- s = [NSString stringWithFormat: @"%@ %@", tmp, s];
- /*
- * It's possible to declare a struct, union, or enum without
- * giving it a name beyond after the declaration, in this case
- * we can use something like 'struct foo' as the name.
- */
- [d setObject: s forKey: @"Name"];
- }
+ {
+ isEnum = [s isEqualToString: @"enum"];
+
+ s = [self parseIdentifier];
+ if (s == nil)
+ {
+ s = [NSString stringWithFormat: @"%@ ...", tmp];
+ }
+ else
+ {
+ s = [NSString stringWithFormat: @"%@ %@", tmp, s];
+ /*
+ * It's possible to declare a struct, union, or enum without
+ * giving it a name beyond after the declaration, in this case
+ * we can use something like 'struct foo' as the name.
+ */
+ [d setObject: s forKey: @"Name"];
+ }
+ }
+
/* We parse enum comment of the form:
* <introComment> enum { <comment1> field1, <comment2> field2 } bla;
*/
@@ -1506,7 +1544,7 @@
ASSIGN(comment, enumComment);
}
- pos++; /* Skip '}' */
+ pos++; /* Skip closing curly brace */
}
[a addObject: s];
s = nil;
@@ -3301,7 +3339,7 @@
}
/*
- * Strip trailing sapce ... leading space we never copied in the
+ * Strip trailing space ... leading space we never copied in the
* first place.
*/
if (ptr > start && [spacenl characterIsMember: ptr[-1]] == YES)
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
