aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/parser/qqmljslexer.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2018-03-14 08:18:20 +0100
committerLars Knoll <lars.knoll@qt.io>2018-04-25 17:50:19 +0000
commit62143542d40096119c4a3425dd6fa50a4750423c (patch)
tree14fc65610b67b46db13fa4bf44896aea908914a7 /src/qml/parser/qqmljslexer.cpp
parent70251c5ee7e2c96dac19e49b6ce69a55d78994a4 (diff)
Fix tokenizer to generate arrow and exponentiation tokens
Change-Id: Ib228925db9285e61acebc79f881acfbc2de9ff16 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/parser/qqmljslexer.cpp')
-rw-r--r--src/qml/parser/qqmljslexer.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/qml/parser/qqmljslexer.cpp b/src/qml/parser/qqmljslexer.cpp
index 7fb32a4406..1165183483 100644
--- a/src/qml/parser/qqmljslexer.cpp
+++ b/src/qml/parser/qqmljslexer.cpp
@@ -547,6 +547,9 @@ again:
return T_EQ_EQ_EQ;
}
return T_EQ_EQ;
+ } else if (_char == QLatin1Char('>')) {
+ scanChar();
+ return T_ARROW;
}
return T_EQ;
@@ -656,6 +659,9 @@ again:
if (_char == QLatin1Char('=')) {
scanChar();
return T_STAR_EQ;
+ } else if (_char == QLatin1Char('*')) {
+ scanChar();
+ return T_STAR_STAR;
}
return T_STAR;