From cdc2d0f542c003d005bd87461996255f792f4eb9 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <Mikhail.Glukhikh@jetbrains.com>
Date: Mon, 6 Apr 2015 16:04:59 +0300
Subject: [PATCH] Tests for when / break / continue fixed

---
 .../testData/expression/when/cases/whileWithOneStmWhen.kt     | 4 ++--
 .../testData/webDemoCanvasExamples/cases/Traffic light.kt     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/js/js.translator/testData/expression/when/cases/whileWithOneStmWhen.kt b/js/js.translator/testData/expression/when/cases/whileWithOneStmWhen.kt
index 81e9f4e8315..e3584297e40 100644
--- a/js/js.translator/testData/expression/when/cases/whileWithOneStmWhen.kt
+++ b/js/js.translator/testData/expression/when/cases/whileWithOneStmWhen.kt
@@ -4,9 +4,9 @@ package foo
 fun box(): Boolean {
     var result = false
     var i = 1
-    while(i==1)
+    @loop while(i==1)
         when (i) {
-            1 -> { result = true; break }
+            1 -> { result = true; break@loop }
             else -> result = false
         }
     return result;
diff --git a/js/js.translator/testData/webDemoCanvasExamples/cases/Traffic light.kt b/js/js.translator/testData/webDemoCanvasExamples/cases/Traffic light.kt
index e77d9b7b2fc..38b572830fd 100644
--- a/js/js.translator/testData/webDemoCanvasExamples/cases/Traffic light.kt	
+++ b/js/js.translator/testData/webDemoCanvasExamples/cases/Traffic light.kt	
@@ -381,7 +381,7 @@ class CanvasState(val canvas: HTMLCanvasElement) {
     {
         jq(canvas).click {
             val mousePos = mousePos(it)
-            for (shape in shapes) {
+            @shapeLoop for (shape in shapes) {
                 if (shape is Button && mousePos in shape) {
                     val name = shape.src
                     shape.mouseClick()
@@ -401,7 +401,7 @@ class CanvasState(val canvas: HTMLCanvasElement) {
                             trafficLightDown.setGreen()
 
                         }
-                        else -> continue
+                        else -> continue@shapeLoop
                     }
 
                 }