Loops are local to functions

Loops need to be reset when parsing an inner function,
as labels can't cross these boundaries.
Also throw a syntax error when a continue statement
outside a loop is encountered.

Change-Id: I69484a2f7a550590194e82667bc4c66aba89ae43
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

diff --git a/qv4codegen.cpp b/qv4codegen.cpp
index 4e5def9..da2a17c 100644 (file)
--- a/qv4codegen.cpp
+++ b/qv4codegen.cpp
@@ -1888,6 +1888,7 @@ IR::Function *Codegen::defineFunction(const QString &name, AST::Node *ast,
     IR::ExprList *throwArgs = function->New<IR::ExprList>();
     throwArgs->expr = throwBlock->TEMP(returnAddress);
     throwBlock->EXP(throwBlock->CALL(throwBlock->NAME(IR::Name::builtin_throw, /*line*/0, /*column*/0), throwArgs));
+    Loop *loop = 0;
 
     qSwap(_function, function);
     qSwap(_block, entryBlock);
@@ -1895,6 +1896,7 @@ IR::Function *Codegen::defineFunction(const QString &name, AST::Node *ast,
     qSwap(_throwBlock, throwBlock);
     qSwap(_returnAddress, returnAddress);
     qSwap(_tryCleanup, tryCleanup);
+    qSwap(_loop, loop);
 
     for (FormalParameterList *it = formals; it; it = it->next) {
         _function->RECEIVE(it->name.toString());
@@ -1928,6 +1930,7 @@ IR::Function *Codegen::defineFunction(const QString &name, AST::Node *ast,
     qSwap(_throwBlock, throwBlock);
     qSwap(_returnAddress, returnAddress);
     qSwap(_tryCleanup, tryCleanup);
+    qSwap(_loop, loop);
 
     leaveEnvironment();
 
@@ -1987,45 +1990,45 @@ bool Codegen::visit(BreakStatement *ast)
 {
     if (!_loop)
         throwSyntaxError(ast->lastSourceLocation(), QCoreApplication::translate("qv4codegen", "Break outside of loop"));
-    unwindException(_loop->tryCleanup);
+    Loop *loop = 0;
     if (ast->label.isEmpty())
-        _block->JUMP(_loop->breakBlock);
+        loop = _loop;
     else {
-        for (Loop *loop = _loop; loop; loop = loop->parent) {
-            if (loop->labelledStatement && loop->labelledStatement->label == ast->label) {
-                _block->JUMP(loop->breakBlock);
-                return false;
-            }
+        for (loop = _loop; loop; loop = loop->parent) {
+            if (loop->labelledStatement && loop->labelledStatement->label == ast->label)
+                break;
         }
-        throwSyntaxError(ast->lastSourceLocation(), QCoreApplication::translate("qv4codegen", "Undefined label '%1'").arg(ast->label.toString()));
+        if (!loop)
+            throwSyntaxError(ast->lastSourceLocation(), QCoreApplication::translate("qv4codegen", "Undefined label '%1'").arg(ast->label.toString()));
     }
-
+    unwindException(loop->tryCleanup);
+    _block->JUMP(loop->breakBlock);
     return false;
 }
 
 bool Codegen::visit(ContinueStatement *ast)
 {
-    unwindException(_loop->tryCleanup);
-
+    Loop *loop = 0;
     if (ast->label.isEmpty()) {
-        for (Loop *loop = _loop; loop; loop = loop->parent) {
-            if (loop->continueBlock) {
-                _block->JUMP(loop->continueBlock);
-                return false;
-            }
+        for (loop = _loop; loop; loop = loop->parent) {
+            if (loop->continueBlock)
+                break;
         }
     } else {
-        for (Loop *loop = _loop; loop; loop = loop->parent) {
+        for (loop = _loop; loop; loop = loop->parent) {
             if (loop->labelledStatement && loop->labelledStatement->label == ast->label) {
-                if (! loop->continueBlock)
-                    break;
-
-                _block->JUMP(loop->continueBlock);
-                return false;
+                if (!loop->continueBlock)
+                    loop = 0;
+                break;
             }
         }
+        if (!loop)
+            throwSyntaxError(ast->lastSourceLocation(), QCoreApplication::translate("qv4codegen", "Undefined label '%1'").arg(ast->label.toString()));
     }
-    throwSyntaxError(ast->lastSourceLocation(), QCoreApplication::translate("qv4codegen", "Undefined label '%1'").arg(ast->label.toString()));
+    if (!loop)
+        throwSyntaxError(ast->lastSourceLocation(), QCoreApplication::translate("qv4codegen", "continue outside of loop"));
+    unwindException(loop->tryCleanup);
+    _block->JUMP(loop->continueBlock);
     return false;
 }
 

diff --git a/tests/TestExpectations b/tests/TestExpectations
index a6d9ca6..8891965 100644 (file)
--- a/tests/TestExpectations
+++ b/tests/TestExpectations
@@ -191,14 +191,12 @@ S14_A2 failing
 14.1-5-s failing
 15.1.1.3-3 failing
 S15.1.2.1_A3.2_T8 failing
-S15.1.2.1_A3.3_T1 failing
 S15.1.2.1_A3.3_T3 failing
 S15.1.2.1_A4.1 failing
 S15.1.2.1_A4.2 failing
 S15.1.2.1_A4.3 failing
 S15.1.2.1_A4.4 failing
 S15.1.2.1_A4.7 failing
-S12.7_A7 failing
 S12.8_A4_T1 failing
 S12.8_A4_T2 failing
 S12.8_A4_T3 failing