diff options
| author | Edward Welbourne <edward.welbourne@theqtcompany.com> | 2015-10-12 10:41:21 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@theqtcompany.com> | 2015-10-16 13:59:59 +0000 |
| commit | 1901adbab796e27e7ed862e850a2171ffc4dde90 (patch) | |
| tree | 65d3be617df8157936a8e553716c86bd63b45f01 /src | |
| parent | dde8d5e3a006c87b7a3f18733ba255d6354fcd37 (diff) | |
Split two error cases so they get reported distinctly.
If a macro is used with too few parameters, complaining about its
definition using '#' followed by something other than a macro
parameter name is apt to be confusing - reading the definition will
reveal that the name in fact is a macro parameter after all. The
reader needs attention directed to the invocation, not the definition.
Split the test in two: one to test the prior error message does in
fact get produced for an invalid macro definition, the other to test
the invalid invocation case.
Task-number: QTBUG-46210
Change-Id: Ie177a56d346e553bf9d67e2008a4352633afa1ae
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/moc/preprocessor.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/tools/moc/preprocessor.cpp b/src/tools/moc/preprocessor.cpp index d036c40f35..a2a1a958cf 100644 --- a/src/tools/moc/preprocessor.cpp +++ b/src/tools/moc/preprocessor.cpp @@ -658,9 +658,12 @@ Symbols Preprocessor::macroExpandIdentifier(Preprocessor *that, SymbolStack &sym expansion += s; } } else if (mode == Hash) { - if (index < 0 || index >= arguments.size()) { + if (index < 0) { that->error("'#' is not followed by a macro parameter"); continue; + } else if (index >= arguments.size()) { + that->error("Macro invoked with too few parameters for a use of '#'"); + continue; } const Symbols &arg = arguments.at(index); |