Stuff for new release

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@39569 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2016-03-20 13:54:19 +00:00
parent 1ee226b495
commit 2162c52990
11 changed files with 343 additions and 461 deletions

View file

@ -2424,6 +2424,7 @@ fail:
* whitespace and try again.
* If we read end of data, or anything which is invalid inside an
* identifier, we return nil.
* If we read a GS_GENERIC... macro, we return its first argument.
*/
- (NSString*) parseIdentifier
{
@ -2445,6 +2446,28 @@ try:
tmp = [[NSString alloc] initWithCharacters: &buffer[start]
length: pos - start];
if ([tmp isEqual: @"GS_GENERIC_CLASS"]
|| [tmp isEqual: @"GS_GENERIC_TYPE"])
{
[self skipSpaces];
if (pos < length && buffer[pos] == '(')
{
pos++;
/* Found a GS_GENERIC_ macro ... the first
* identifier inside the macro arguments is the
* name we want to return.
*/
RELEASE(tmp);
tmp = RETAIN([self parseIdentifier]);
while (pos < length)
{
if (buffer[pos++] == ')')
{
break;
}
}
}
}
val = [wordMap objectForKey: tmp];
if (val == nil)
{