From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Thu, 15 Sep 2011 14:56:49 +0000 (+0200)
Subject: Add the method tokenKind() to the QML/JS lexer.
X-Git-Tag: qt-v5.0.0-alpha1~1628
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=749f0f8284901f20e48b9651dd283884defde5d5;p=profile%2Fivi%2Fqtdeclarative.git

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>
---

diff --git a/src/declarative/qml/parser/qdeclarativejslexer.cpp b/src/declarative/qml/parser/qdeclarativejslexer.cpp
index 238ea8f..aee444e 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 e20490c..dd9f0de 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;