Add code to ignore NS_FORMAT_ARGUMENT and NS_FORMAT_FUNCTION in declarations.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@37298 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2013-10-28 07:02:08 +00:00
parent ea1c58655b
commit 0d9b6d1284
2 changed files with 23 additions and 3 deletions

View file

@ -1,3 +1,8 @@
2013-10-28 Richard Frith-Macdonald <rfm@gnu.org>
* Tools/AGSParser.m: Add code to ignore NS_FORMAT_ARGUMENT and
NS_FORMAT_FUNCTION macros inside variable declarations.
2013-10-27 Richard Frith-Macdonald <rfm@gnu.org>
* Source/GSFileHandle.m: Fix retention of singletons and add exception

View file

@ -448,9 +448,11 @@ patata
paragraphs until we reach </example> */
if ([tag isEqualToString: @"example"])
{
[scanner setCharactersToBeSkipped: [NSCharacterSet whitespaceAndNewlineCharacterSet]];
[scanner setCharactersToBeSkipped:
[NSCharacterSet whitespaceAndNewlineCharacterSet]];
[scanner scanUpToString: @"</example>" intoString: NULL];
inUnclosedExample = ([scanner scanString: @"</example>" intoString: NULL] == NO);
inUnclosedExample
= ([scanner scanString: @"</example>" intoString: NULL] == NO);
}
return NO;
@ -3755,7 +3757,20 @@ fail:
tmp = [[NSString alloc] initWithCharacters: &buffer[start]
length: pos - start];
val = [wordMap objectForKey: tmp];
if ([tmp isEqualToString: @"NS_FORMAT_ARGUMENT"]
|| [tmp isEqualToString: @"NS_FORMAT_FUNCTION"])
{
/* These macros need to be skipped as they appear inside
* method declarations.
*/
val = @"";
[self skipSpaces];
[self skipBlock];
}
else
{
val = [wordMap objectForKey: tmp];
}
RELEASE(tmp);
if (val == nil)
{