diff options
| author | Christian Kamm <christian.d.kamm@nokia.com> | 2011-05-20 14:48:05 +0200 |
|---|---|---|
| committer | Christian Kamm <christian.d.kamm@nokia.com> | 2011-05-23 08:30:26 +0200 |
| commit | f027b1da87afe3696ef4fc93bd36c08e1f72daa7 (patch) | |
| tree | 872bd06cea181fe7069a59c808552ba44d6516e8 /src/libs/qmljs/qmljsscanner.h | |
| parent | 0350314b2241f03270c67e743dac218da7874aa8 (diff) | |
| download | qt-creator-f027b1da87afe3696ef4fc93bd36c08e1f72daa7.tar.gz | |
QmlJS: Make the Scanner recognize regular expression literals.
Task-number: QTCREATORBUG-4566
Change-Id: I48b08f8eee79b25d0ebe186b996cdcb8f1979e3d
Reviewed-on: http://codereview.qt.nokia.com/38
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Diffstat (limited to 'src/libs/qmljs/qmljsscanner.h')
| -rw-r--r-- | src/libs/qmljs/qmljsscanner.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/libs/qmljs/qmljsscanner.h b/src/libs/qmljs/qmljsscanner.h index 9c9b43bd18..777fd1ba05 100644 --- a/src/libs/qmljs/qmljsscanner.h +++ b/src/libs/qmljs/qmljsscanner.h @@ -59,7 +59,8 @@ public: Colon, Comma, Dot, - Delimiter + Delimiter, + RegExp }; inline Token(): offset(0), length(0), kind(EndOfFile) {} @@ -82,7 +83,8 @@ public: Normal = 0, MultiLineComment = 1, MultiLineStringDQuote = 2, - MultiLineStringSQuote = 3 + MultiLineStringSQuote = 3, + RegexpMayFollow = 4 // flag that may be combined with the above }; Scanner(); |