summaryrefslogtreecommitdiff
path: root/src/qml/compiler/qv4compilerscanfunctions.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2018-02-09 13:33:35 +0100
committerLars Knoll <lars.knoll@qt.io>2018-04-25 17:48:56 +0000
commitdad5d1cc82a57a4f657aa3f37ad2f55b69d5b015 (patch)
tree1110fbbc2b15734533476c42ffcea2596f5f14f1 /src/qml/compiler/qv4compilerscanfunctions.cpp
parent6d42c6fd3396ece5e74e602f7cdfc9c9299866bf (diff)
downloadqtdeclarative-dad5d1cc82a57a4f657aa3f37ad2f55b69d5b015.tar.gz
Add support for ES6 template strings
This requires a bit of bookeeping in the lexer, as we can have arbitrary expressions inside the ${...}. To make this work, keep a stack of template states, in which we count the unclosed braces to match up with the correct closing brace. Implements support for `...`. Expressions of the type Foo`...` and Foo()`...` will come in follow-up commits. Change-Id: Ia332796cfb77895583d0093732e6f56c8b0662c9 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/compiler/qv4compilerscanfunctions.cpp')
-rw-r--r--src/qml/compiler/qv4compilerscanfunctions.cpp11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/qml/compiler/qv4compilerscanfunctions.cpp b/src/qml/compiler/qv4compilerscanfunctions.cpp
index 84ee452332..f985c74f9d 100644
--- a/src/qml/compiler/qv4compilerscanfunctions.cpp
+++ b/src/qml/compiler/qv4compilerscanfunctions.cpp
@@ -257,6 +257,17 @@ bool ScanFunctions::visit(FunctionExpression *ast)
return true;
}
+bool ScanFunctions::visit(TemplateLiteral *ast)
+{
+ while (ast) {
+ if (ast->expression)
+ Node::accept(ast->expression, this);
+ ast = ast->next;
+ }
+ return true;
+
+}
+
void ScanFunctions::enterFunction(FunctionExpression *ast, bool enterName)
{
if (_context->isStrict && (ast->name == QLatin1String("eval") || ast->name == QLatin1String("arguments")))