diff options
author | Kent Hansen <kent.hansen@nokia.com> | 2011-09-13 13:07:38 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-19 12:07:46 +0200 |
commit | c970d47d4ec8bed85acc313e22ddb8bbba55618e (patch) | |
tree | e1085b6b5966b1a44b6ab782094d0c287f1891dc /src/declarative/qml/parser/qdeclarativejslexer.cpp | |
parent | 82b232dd5ceb327a6fadbe2ddb4c88c85e00098b (diff) |
Move JS RegExp flag definitions to header file
This way they can be used by tools that use the lexer
(e.g. qml minifier).
Change-Id: I226d1712089b01defd3b45ccb99db596955bff8b
Reviewed-on: http://codereview.qt-project.org/4762
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Diffstat (limited to 'src/declarative/qml/parser/qdeclarativejslexer.cpp')
-rw-r--r-- | src/declarative/qml/parser/qdeclarativejslexer.cpp | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/src/declarative/qml/parser/qdeclarativejslexer.cpp b/src/declarative/qml/parser/qdeclarativejslexer.cpp index 342b1a8052..412746866b 100644 --- a/src/declarative/qml/parser/qdeclarativejslexer.cpp +++ b/src/declarative/qml/parser/qdeclarativejslexer.cpp @@ -53,18 +53,12 @@ QT_END_NAMESPACE using namespace QDeclarativeJS; -enum RegExpFlag { - Global = 0x01, - IgnoreCase = 0x02, - Multiline = 0x04 -}; - -static int flagFromChar(const QChar &ch) +static int regExpFlagFromChar(const QChar &ch) { switch (ch.unicode()) { - case 'g': return Global; - case 'i': return IgnoreCase; - case 'm': return Multiline; + case 'g': return Lexer::RegExp_Global; + case 'i': return Lexer::RegExp_IgnoreCase; + case 'm': return Lexer::RegExp_Multiline; } return 0; } @@ -863,7 +857,7 @@ bool Lexer::scanRegExp(RegExpBodyPrefix prefix) // scan the flags _patternFlags = 0; while (isIdentLetter(_char)) { - int flag = flagFromChar(_char); + int flag = regExpFlagFromChar(_char); if (flag == 0) { _errorMessage = QCoreApplication::translate("QDeclarativeParser", "Invalid regular expression flag '%0'") .arg(QChar(_char)); |