diff options
| author | Roberto Raggi <roberto.raggi@nokia.com> | 2011-09-14 14:50:24 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-19 12:07:46 +0200 |
| commit | e4b8bafa3be9d5c20b220349d2ffa39a3085b947 (patch) | |
| tree | 3015563364539b3c1b67814ed7b09bc71bdee400 /src/declarative/qml/parser/qdeclarativejslexer_p.h | |
| parent | 4a5ad697330df9efaef825b09a1957b0f040a33d (diff) | |
Fix automatic semicolon insertion.
The parser should insert a T_SEMICOLON token when it reaches an
error state and the lookahead token is following a closing brace.
Change-Id: Ib849e7fbfe50c2a3e679ae0794f5780cc0b94de5
Reviewed-on: http://codereview.qt-project.org/4896
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Diffstat (limited to 'src/declarative/qml/parser/qdeclarativejslexer_p.h')
| -rw-r--r-- | src/declarative/qml/parser/qdeclarativejslexer_p.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/declarative/qml/parser/qdeclarativejslexer_p.h b/src/declarative/qml/parser/qdeclarativejslexer_p.h index 34cd9873ae..6d327868ca 100644 --- a/src/declarative/qml/parser/qdeclarativejslexer_p.h +++ b/src/declarative/qml/parser/qdeclarativejslexer_p.h @@ -144,6 +144,8 @@ public: QString errorMessage() const; bool prevTerminator() const; + bool followsClosingBrace() const; + bool canInsertAutomaticSemicolon(int token) const; enum ParenthesesState { IgnoreParentheses, @@ -201,6 +203,7 @@ private: bool _prohibitAutomaticSemicolon; bool _restrictedKeyword; bool _terminator; + bool _followsClosingBrace; bool _delimited; bool _qmlMode; }; |