From b59b727035c4c1a4d235432cc67e5d89d3a24cd3 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Sat, 10 Feb 2018 17:04:32 +0100 Subject: 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 --- src/qml/parser/qqmljslexer.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'src/qml/parser/qqmljslexer.cpp') 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 '-': -- cgit v1.2.3