diff options
author | Christian Kamm <christian.d.kamm@nokia.com> | 2010-08-10 12:05:19 +0200 |
---|---|---|
committer | Christian Kamm <christian.d.kamm@nokia.com> | 2010-08-10 14:14:17 +0200 |
commit | f6232260c2c5ba93e85d725e05c2d2c9b86e293c (patch) | |
tree | 96d8e9bbfa8313c60b8de8df2898af28c1dcb629 /src/libs/qmljs/qmljsscanner.cpp | |
parent | 2a4209db41afb42ce90bb085a15d81ed9c32e561 (diff) | |
download | qt-creator-f6232260c2c5ba93e85d725e05c2d2c9b86e293c.tar.gz |
QmlJS: Adjust scanner to treat ++ and -- as a single delimiter token.
Reviewed-by: Roberto Raggi
Diffstat (limited to 'src/libs/qmljs/qmljsscanner.cpp')
-rw-r--r-- | src/libs/qmljs/qmljsscanner.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/libs/qmljs/qmljsscanner.cpp b/src/libs/qmljs/qmljsscanner.cpp index 992084f113..1a853e5f44 100644 --- a/src/libs/qmljs/qmljsscanner.cpp +++ b/src/libs/qmljs/qmljsscanner.cpp @@ -266,6 +266,16 @@ QList<Token> Scanner::operator()(const QString &text, int startState) tokens.append(Token(index++, 1, Token::Comma)); break; + case '+': + case '-': + if (la == ch) { + tokens.append(Token(index, 2, Token::Delimiter)); + index += 2; + } else { + tokens.append(Token(index++, 1, Token::Delimiter)); + } + break; + default: if (ch.isSpace()) { do { |