diff options
author | Erik Verbruggen <erik.verbruggen@nokia.com> | 2010-06-15 11:26:27 +0200 |
---|---|---|
committer | Erik Verbruggen <erik.verbruggen@nokia.com> | 2010-06-15 11:27:07 +0200 |
commit | e5b9c76f277fb256a044240854cde52ecff7cd33 (patch) | |
tree | 841bcd54a8460735a8036beeab86a423acc8e1cb /src/libs | |
parent | 512e75a56195adf65577a024e363b36761cfc897 (diff) | |
download | qt-creator-e5b9c76f277fb256a044240854cde52ecff7cd33.tar.gz |
Added C-style comment folding.
This is a "back-port" for 57f2b3e44da5ca818d575b2c5861f736aa3db0bc from master
into 2.0.
Done-with: ckamm
Diffstat (limited to 'src/libs')
-rw-r--r-- | src/libs/qmljs/qmljsscanner.cpp | 7 | ||||
-rw-r--r-- | src/libs/qmljs/qmljsscanner.h | 7 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/libs/qmljs/qmljsscanner.cpp b/src/libs/qmljs/qmljsscanner.cpp index 79f81509f2..9a629db9a9 100644 --- a/src/libs/qmljs/qmljsscanner.cpp +++ b/src/libs/qmljs/qmljsscanner.cpp @@ -77,7 +77,7 @@ const _Tp *end(const _Tp (&a)[N]) } Scanner::Scanner() - : _state(0), + : _state(Normal), _scanComments(true) { } @@ -122,11 +122,6 @@ static bool isNumberChar(QChar ch) QList<Token> Scanner::operator()(const QString &text, int startState) { - enum { - Normal = 0, - MultiLineComment = 1 - }; - _state = startState; QList<Token> tokens; diff --git a/src/libs/qmljs/qmljsscanner.h b/src/libs/qmljs/qmljsscanner.h index 9141842cd7..611024d426 100644 --- a/src/libs/qmljs/qmljsscanner.h +++ b/src/libs/qmljs/qmljsscanner.h @@ -77,13 +77,18 @@ public: class QMLJS_EXPORT Scanner { public: + enum { + Normal = 0, + MultiLineComment = 1 + }; + Scanner(); virtual ~Scanner(); bool scanComments() const; void setScanComments(bool scanComments); - QList<Token> operator()(const QString &text, int startState = 0); + QList<Token> operator()(const QString &text, int startState = Normal); int state() const; bool isKeyword(const QString &text) const; |