Implement support for destructuring of rest elements

"var [x, ...y] = array" now works as intended.

Change-Id: I45238f27f468d0b0e14dc0e931c55c4f40043690
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 15 insertions, 12 deletions

diff --git a/src/qml/compiler/qv4codegen.cpp b/src/qml/compiler/qv4codegen.cpp
index ffb318168c..f00a0fafdc 100644
--- a/src/qml/compiler/qv4codegen.cpp
+++ b/src/qml/compiler/qv4codegen.cpp
@@ -495,22 +495,25 @@ void Codegen::destructureElementList(const Codegen::Reference &array, PatternEle
         }
 
         RegisterScope scope(this);
-
         iterator.loadInAccumulator();
-        Instruction::IteratorNext next;
-        next.returnUndefinedWhenDone = true;
-        bytecodeGenerator->addInstruction(next);
+
         PatternElement *e = p->element;
-        if (!e)
-            continue;
-        if (e->type != PatternElement::RestElement) {
+        if (e && e->type == PatternElement::RestElement) {
+            bytecodeGenerator->addInstruction(Instruction::DestructureRestElement());
             initializeAndDestructureBindingElement(e, Reference::fromAccumulator(this));
-            if (hasError) {
-                end.link();
-                return;
-            }
         } else {
-            throwSyntaxError(bindingList->firstSourceLocation(), QString::fromLatin1("Support for rest elements in binding arrays not implemented!"));
+            Instruction::IteratorNext next;
+            next.returnUndefinedWhenDone = true;
+            bytecodeGenerator->addInstruction(next);
+            if (!e)
+                continue;
+            if (e->type != PatternElement::RestElement) {
+                initializeAndDestructureBindingElement(e, Reference::fromAccumulator(this));
+                if (hasError) {
+                    end.link();
+                    return;
+                }
+            }
         }
     }
     end.link();