From 96611a677fc0feeb374c191e248842167f39770d Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Thu, 10 Nov 2011 14:56:55 +0100 Subject: Fix parsing of #if defined expression MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We only need to match the closing parentheses if there was an opening one This has caused mis-parsing of tst_qbytearray.cpp Change-Id: I9d52916e3ed8549c5ddd968092451fef7389a952 Reviewed-by: João Abecasis --- src/tools/moc/preprocessor.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/tools/moc/preprocessor.cpp') diff --git a/src/tools/moc/preprocessor.cpp b/src/tools/moc/preprocessor.cpp index 2c7888b42d..ecf6d7d4de 100644 --- a/src/tools/moc/preprocessor.cpp +++ b/src/tools/moc/preprocessor.cpp @@ -538,12 +538,13 @@ void Preprocessor::substituteUntilNewline(Symbols &substituted, MacroSafeSet saf continue; } } else if (token == PP_DEFINED) { - test(PP_LPAREN); + bool braces = test(PP_LPAREN); next(PP_IDENTIFIER); Symbol definedOrNotDefined = symbol(); definedOrNotDefined.token = macros.contains(definedOrNotDefined)? PP_MOC_TRUE : PP_MOC_FALSE; substituted += definedOrNotDefined; - test(PP_RPAREN); + if (braces) + test(PP_RPAREN); continue; } else if (token == PP_NEWLINE) { substituted += symbol(); -- cgit v1.2.3