diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-09-11 18:43:29 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-13 03:42:42 +0200 |
| commit | ae3f95a951334dee001e37c305e4d7bf91c0d1b3 (patch) | |
| tree | 2c891598d1b0940071da56ae02ddace3796a3a56 /qmake | |
| parent | 0d6f1ef58837fc34216634210d1f831180a7b134 (diff) | |
improve parse error recovery paths
to reduce collateral damage from parse errors.
(cherry picked from qtcreator/00c0d0d5e42d28e03c2846c17d3acbcd8420859d)
Change-Id: Ic59700d657069d3b15372509b4bff966057d27a9
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/library/qmakeparser.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/qmake/library/qmakeparser.cpp b/qmake/library/qmakeparser.cpp index bf77f77c0f..660f93517d 100644 --- a/qmake/library/qmakeparser.cpp +++ b/qmake/library/qmakeparser.cpp @@ -1027,13 +1027,14 @@ void QMakeParser::finalizeCall(ushort *&tokPtr, ushort *uc, ushort *ptr, int arg const QString *defName; ushort defType; if (m_tmp == statics.strfor) { - flushCond(tokPtr); - putLineMarker(tokPtr); if (m_invert || m_operator == OrOperator) { // '|' could actually work reasonably, but qmake does nonsense here. parseError(fL1S("Unexpected operator in front of for().")); + bogusTest(tokPtr); return; } + flushCond(tokPtr); + putLineMarker(tokPtr); if (*uce == (TokLiteral|TokNewStr)) { nlen = uce[1]; uc = uce + 2 + nlen; @@ -1076,12 +1077,13 @@ void QMakeParser::finalizeCall(ushort *&tokPtr, ushort *uc, ushort *ptr, int arg defName = &statics.strdefineTest; defType = TokTestDef; deffunc: - flushScopes(tokPtr); - putLineMarker(tokPtr); if (m_invert) { parseError(fL1S("Unexpected operator in front of function definition.")); + bogusTest(tokPtr); return; } + flushScopes(tokPtr); + putLineMarker(tokPtr); if (*uce == (TokLiteral|TokNewStr)) { uint nlen = uce[1]; if (uce[nlen + 2] == TokFuncTerminator) { @@ -1101,6 +1103,7 @@ void QMakeParser::finalizeCall(ushort *&tokPtr, ushort *uc, ushort *ptr, int arg if (m_state != StNew || m_blockstack.top().braceLevel || m_blockstack.size() > 1 || m_invert || m_operator != NoOperator) { parseError(fL1S("option() must appear outside any control structures.")); + bogusTest(tokPtr); return; } if (*uce == (TokLiteral|TokNewStr)) { |