diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2018-08-13 15:40:20 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2018-08-14 17:45:46 +0000 |
| commit | 859b78e063947309932c0d7c154736227ed903ae (patch) | |
| tree | dcb3471dd6ae5e53617b645e034b2bc084940773 | |
| parent | 8bebd12c1b0dc2565b80b1d0db2c39e451f5b751 (diff) | |
Fix multi variable module import lists
Select the correct head when finishing the linked list for ImportList
AST nodes.
Change-Id: I34ae2ccfd0e969dbd92ce2458de019bb02046aa5
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| -rw-r--r-- | src/qml/parser/qqmljsast_p.h | 2 | ||||
| -rw-r--r-- | tests/auto/qml/ecmascripttests/TestExpectations | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/qml/parser/qqmljsast_p.h b/src/qml/parser/qqmljsast_p.h index 9d82e9546b..e344dd4a28 100644 --- a/src/qml/parser/qqmljsast_p.h +++ b/src/qml/parser/qqmljsast_p.h @@ -2391,7 +2391,7 @@ public: ImportsList *finish() { - ImportsList *head = this; + ImportsList *head = next; next = nullptr; return head; } diff --git a/tests/auto/qml/ecmascripttests/TestExpectations b/tests/auto/qml/ecmascripttests/TestExpectations index cd528a2692..a6c9b33360 100644 --- a/tests/auto/qml/ecmascripttests/TestExpectations +++ b/tests/auto/qml/ecmascripttests/TestExpectations @@ -2158,13 +2158,11 @@ language/identifiers/other_id_start.js fails language/literals/regexp/u-case-mapping.js fails language/literals/regexp/y-assertion-start.js fails language/module-code/eval-export-dflt-cls-anon.js strictFails -language/module-code/eval-gtbndng-indirect-update-as.js strictFails language/module-code/eval-gtbndng-indirect-update-dflt.js strictFails language/module-code/eval-rqstd-order.js strictFails language/module-code/instn-iee-bndng-cls.js strictFails language/module-code/instn-iee-bndng-const.js strictFails language/module-code/instn-iee-bndng-let.js strictFails -language/module-code/instn-iee-trlng-comma.js strictFails language/module-code/instn-local-bndng-cls.js strictFails language/module-code/instn-local-bndng-const.js strictFails language/module-code/instn-local-bndng-export-cls.js strictFails @@ -2182,7 +2180,6 @@ language/module-code/instn-named-bndng-dflt-gen-named.js strictFails language/module-code/instn-named-bndng-dflt-named.js strictFails language/module-code/instn-named-bndng-dflt-star.js strictFails language/module-code/instn-named-bndng-let.js strictFails -language/module-code/instn-named-id-name.js strictFails language/module-code/instn-same-global.js strictFails language/module-code/instn-star-equality.js strictFails language/module-code/namespace/internals/define-own-property.js strictFails |