diff options
author | Roberto Raggi <roberto.raggi@nokia.com> | 2011-09-15 16:56:49 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-19 12:07:46 +0200 |
commit | 749f0f8284901f20e48b9651dd283884defde5d5 (patch) | |
tree | aeece4ba577fc1598f33350236b26dce5b4d42dc /src | |
parent | 599c7e43b0a10c90c040ce499ed75995f8993135 (diff) |
Add the method tokenKind() to the QML/JS lexer.
The method returns the last token recognized by the lexer.
Change-Id: I9464e96c1276852737ddc8330d08d57326b48888
Reviewed-on: http://codereview.qt-project.org/5015
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/declarative/qml/parser/qdeclarativejslexer.cpp | 5 | ||||
-rw-r--r-- | src/declarative/qml/parser/qdeclarativejslexer_p.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/declarative/qml/parser/qdeclarativejslexer.cpp b/src/declarative/qml/parser/qdeclarativejslexer.cpp index 238ea8f47d..aee444ed6b 100644 --- a/src/declarative/qml/parser/qdeclarativejslexer.cpp +++ b/src/declarative/qml/parser/qdeclarativejslexer.cpp @@ -970,6 +970,11 @@ bool Lexer::isOctalDigit(ushort c) return (c >= '0' && c <= '7'); } +int Lexer::tokenKind() const +{ + return _tokenKind; +} + int Lexer::tokenOffset() const { return _tokenStartPtr - _code.unicode(); diff --git a/src/declarative/qml/parser/qdeclarativejslexer_p.h b/src/declarative/qml/parser/qdeclarativejslexer_p.h index e20490c09b..dd9f0de274 100644 --- a/src/declarative/qml/parser/qdeclarativejslexer_p.h +++ b/src/declarative/qml/parser/qdeclarativejslexer_p.h @@ -150,6 +150,7 @@ public: int regExpFlags() const { return _patternFlags; } QString regExpPattern() const { return _tokenText; } + int tokenKind() const; int tokenOffset() const; int tokenLength() const; |