diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2018-04-14 11:36:37 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2018-05-02 14:19:27 +0000 |
| commit | 68a71b7136cfeb010eebea6c14b138aa2a9f3d6a (patch) | |
| tree | 61b2b401ad5f69e58010dd71ecbbf60e46033db0 /src/qml/parser | |
| parent | e84cfb04c4ab5e54cd6ad685a09e8ebab710109e (diff) | |
Correctly set source location when converting BindingPatterns
Change-Id: I89973ef22fc0eeb67dd3f8219e7b4d6fa02ddaf0
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/parser')
| -rw-r--r-- | src/qml/parser/qqmljs.g | 2 | ||||
| -rw-r--r-- | src/qml/parser/qqmljsast.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/qml/parser/qqmljs.g b/src/qml/parser/qqmljs.g index da8616362b..4acddc78b6 100644 --- a/src/qml/parser/qqmljs.g +++ b/src/qml/parser/qqmljs.g @@ -2491,7 +2491,7 @@ AssignmentExpression: LeftHandSideExpression T_EQ AssignmentExpression; AssignmentExpression_In: LeftHandSideExpression T_EQ AssignmentExpression_In; /. case $rule_number: { - // need to convert the LHS to an AssignmentPatthern if it was an Array/ObjectLiteral + // need to convert the LHS to an AssignmentPattern if it was an Array/ObjectLiteral if (AST::Pattern *p = sym(1).Expression->patternCast()) { AST::SourceLocation errorLoc; QString errorMsg; diff --git a/src/qml/parser/qqmljsast.cpp b/src/qml/parser/qqmljsast.cpp index 114aa4a830..6c0e394a34 100644 --- a/src/qml/parser/qqmljsast.cpp +++ b/src/qml/parser/qqmljsast.cpp @@ -431,6 +431,7 @@ bool PatternElement::convertLiteralToAssignmentPattern(MemoryPool *pool, SourceL } if (auto *i = cast<IdentifierExpression *>(lhs)) { bindingIdentifier = i->name.toString(); + identifierToken = i->identifierToken; return true; } *errorLocation = lastSourceLocation(); |