diff options
author | Lars Knoll <lars.knoll@qt.io> | 2018-02-10 17:04:32 +0100 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2018-04-25 17:49:09 +0000 |
commit | b59b727035c4c1a4d235432cc67e5d89d3a24cd3 (patch) | |
tree | b452f39eab452a8a472dfc5c9b7e89ab4a354c1f /src/qml/parser/qqmljslexer.cpp | |
parent | 2683a22364f742e3809b6c48570b0b4aaf37b31f (diff) |
ES6: add support for default arguments for function parameters
The parser can also handle rest parameters correctly, this will
however require some additional work in the runtime to support
it correctly.
Change-Id: Ib6f4d27683774966b2d2aac075494d2f5066d2a2
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/parser/qqmljslexer.cpp')
-rw-r--r-- | src/qml/parser/qqmljslexer.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/qml/parser/qqmljslexer.cpp b/src/qml/parser/qqmljslexer.cpp index d48766e9a8..0b6033c1df 100644 --- a/src/qml/parser/qqmljslexer.cpp +++ b/src/qml/parser/qqmljslexer.cpp @@ -605,6 +605,17 @@ again: case '.': if (isDecimalDigit(_char.unicode())) return scanNumber(ch); + if (_char == QLatin1Char('.')) { + scanChar(); + if (_char == QLatin1Char('.')) { + scanChar(); + return T_ELLIPSIS; + } else { + _errorCode = IllegalCharacter; + _errorMessage = QCoreApplication::translate("QQmlParser", "Unexpected token '.'"); + return T_ERROR; + } + } return T_DOT; case '-': |