diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-08-08 14:17:53 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-08 15:35:20 +0200 |
| commit | cdaa8282a7ebf780b1d02825062f19a80e827af5 (patch) | |
| tree | 070697e407666b52a9652142194b911d97e6f97a | |
| parent | 0c179baade8f4a57c0f9fe7b48367412e8a41f2a (diff) | |
Fix another bug with automatic semicolon insertion
Avoid empty statements after else.
Change-Id: Ia7782a3371bc79c7e93857aa252309d2824a5a9e
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| -rw-r--r-- | src/qml/parser/qqmljslexer.cpp | 3 | ||||
| -rw-r--r-- | tests/auto/qml/qjsengine/tst_qjsengine.cpp | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/qml/parser/qqmljslexer.cpp b/src/qml/parser/qqmljslexer.cpp index 5d9ca1036f..8e8ed954ad 100644 --- a/src/qml/parser/qqmljslexer.cpp +++ b/src/qml/parser/qqmljslexer.cpp @@ -259,6 +259,7 @@ int Lexer::lex() _parenthesesCount = 0; break; + case T_ELSE: case T_DO: _parenthesesState = BalancedParentheses; break; @@ -287,7 +288,7 @@ int Lexer::lex() break; case BalancedParentheses: - if (_tokenKind != T_DO) + if (_tokenKind != T_DO && _tokenKind != T_ELSE) _parenthesesState = IgnoreParentheses; break; } // switch diff --git a/tests/auto/qml/qjsengine/tst_qjsengine.cpp b/tests/auto/qml/qjsengine/tst_qjsengine.cpp index 1f43d21c51..b69f57b339 100644 --- a/tests/auto/qml/qjsengine/tst_qjsengine.cpp +++ b/tests/auto/qml/qjsengine/tst_qjsengine.cpp @@ -1578,6 +1578,11 @@ void tst_QJSEngine::automaticSemicolonInsertion() QVERIFY(ret.isError()); } { + QJSValue ret = eng.evaluate("n = 0; if (1) --n;else\n ++n;\n n"); + QVERIFY(ret.isNumber()); + QCOMPARE(ret.toInt(), -1); + } + { QJSValue ret = eng.evaluate("while (0)"); QVERIFY(ret.isError()); } |