AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

moc: Don't error out when defining a keyword

Browse Source 
Normaly, in C++ It's not valid to define a keyword, but it turns out that some
system header do, so we just silently accept it.

[ChangeLog][moc] moc no longer errors out if a C++ keyword is #define'ed

Task-number: QTBUG-61204
Change-Id: Ia4d3ff9c77b6ff261b6140c220cfb81bd13f1d6d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Olivier Goffart 2017-06-03 14:07:52 +02:00 committed by Thiago Macieira
parent 74111ce590
commit 94a2aec05b
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/tools/moc/preprocessor.cpp
View File

@ -1109,19 +1109,18 @@ void Preprocessor::preprocess(const QByteArray &filename, Symbols &preprocessed)
}
case PP_DEFINE:
{
next(IDENTIFIER);
next();
QByteArray name = lexem();
if (name.isEmpty() || !is_ident_start(name[0]))
error();
Macro macro;
macro.isVariadic = false;
Token t = next();
if (t == LPAREN) {
if (test(LPAREN)) {
// we have a function macro
macro.isFunction = true;
parseDefineArguments(&macro);
} else if (t == PP_WHITESPACE){
macro.isFunction = false;
} else {
error("Moc: internal error");
macro.isFunction = false;
}
int start = index;
until(PP_NEWLINE);
@ -1160,7 +1159,7 @@ void Preprocessor::preprocess(const QByteArray &filename, Symbols &preprocessed)
continue;
}
case PP_UNDEF: {
next(IDENTIFIER);
next();
QByteArray name = lexem();
until(PP_NEWLINE);
macros.remove(name);

9
tests/auto/tools/moc/parse-defines.h
View File

@ -146,6 +146,15 @@ signals:
#undef QString
#ifdef Q_MOC_RUN
// Normaly, redefining keywords is forbidden, but we should not abort parsing
#define and &&
#define and_eq &=
#define bitand &
#define true 1
#undef true
#endif
PD_END_NAMESPACE
#endif