From bfe90bdf042ef19debcd5e5f879beba46091c449 Mon Sep 17 00:00:00 2001
From: jespergravgaard <jesper@balmangravgaard.dk>
Date: Sun, 25 Aug 2019 15:01:04 +0200
Subject: [PATCH] Better error when encountering continue in switch that is not
 inside loop. Closes #282

---
 .../Pass0GenerateStatementSequence.java       | 26 ++++++++++++++-----
 .../dk/camelot64/kickc/test/TestPrograms.java |  7 +----
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass0GenerateStatementSequence.java b/src/main/java/dk/camelot64/kickc/passes/Pass0GenerateStatementSequence.java
index b495e61a3..a422ec557 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass0GenerateStatementSequence.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass0GenerateStatementSequence.java
@@ -855,8 +855,12 @@ public class Pass0GenerateStatementSequence extends KickCParserBaseVisitor<Objec
       /** The label that a continue will jump to. Null if no continue has been encountered. */
       Label continueLabel;
 
-      public Loop(Scope loopScope) {
+      /** true if the loop is a switch-statement. */
+      boolean isSwitch;
+
+      public Loop(Scope loopScope, boolean isSwitch) {
          this.loopScope = loopScope;
+         this.isSwitch = isSwitch;
       }
 
       Label getBreakLabel() {
@@ -895,7 +899,7 @@ public class Pass0GenerateStatementSequence extends KickCParserBaseVisitor<Objec
       // Create the block scope early - to keep all statements of the loop inside it
       BlockScope blockScope = getCurrentScope().addBlockScope();
       scopeStack.push(blockScope);
-      loopStack.push(new Loop(blockScope));
+      loopStack.push(new Loop(blockScope, false));
       Label beginJumpLabel = getCurrentScope().addLabelIntermediate();
       Label doJumpLabel = getCurrentScope().addLabelIntermediate();
       Label endJumpLabel = getCurrentScope().addLabelIntermediate();
@@ -930,7 +934,7 @@ public class Pass0GenerateStatementSequence extends KickCParserBaseVisitor<Objec
       // Create the block scope early - to keep all statements of the loop inside it
       BlockScope blockScope = getCurrentScope().addBlockScope();
       scopeStack.push(blockScope);
-      loopStack.push(new Loop(blockScope));
+      loopStack.push(new Loop(blockScope, false));
       List<Comment> comments = ensureUnusedComments(getCommentsSymbol(ctx));
       Label beginJumpLabel = getCurrentScope().addLabelIntermediate();
       StatementLabel beginJumpTarget = new StatementLabel(beginJumpLabel.getRef(), StatementSource.doWhile(ctx), comments);
@@ -957,7 +961,7 @@ public class Pass0GenerateStatementSequence extends KickCParserBaseVisitor<Objec
       // Create a block scope - to keep all statements of the loop inside it
       BlockScope blockScope = getCurrentScope().addBlockScope();
       scopeStack.push(blockScope);
-      Loop switchLoop = new Loop(blockScope);
+      Loop switchLoop = new Loop(blockScope, true);
       if(containingLoop != null) {
          switchLoop.setContinueLabel(containingLoop.getOrCreateContinueLabel());
       }
@@ -1030,7 +1034,7 @@ public class Pass0GenerateStatementSequence extends KickCParserBaseVisitor<Objec
    public Object visitForClassic(KickCParser.ForClassicContext ctx) {
       BlockScope blockScope = getCurrentScope().addBlockScope();
       scopeStack.push(blockScope);
-      loopStack.push(new Loop(blockScope));
+      loopStack.push(new Loop(blockScope, false));
       // Add initialization
       this.visit(ctx.forClassicInit());
       KickCParser.StmtForContext stmtForCtx = (KickCParser.StmtForContext) ctx.getParent();
@@ -1086,7 +1090,7 @@ public class Pass0GenerateStatementSequence extends KickCParserBaseVisitor<Objec
    public Object visitForRange(KickCParser.ForRangeContext ctx) {
       BlockScope blockScope = getCurrentScope().addBlockScope();
       scopeStack.push(blockScope);
-      loopStack.push(new Loop(blockScope));
+      loopStack.push(new Loop(blockScope, false));
 
       StatementSource statementSource = StatementSource.forRanged(ctx);
 
@@ -1194,7 +1198,15 @@ public class Pass0GenerateStatementSequence extends KickCParserBaseVisitor<Objec
          throw new CompileError("Continue not inside a loop! ", new StatementSource(ctx));
       }
       Loop currentLoop = loopStack.peek();
-      Label continueLabel = currentLoop.getOrCreateContinueLabel();
+      Label continueLabel;
+      if(currentLoop.isSwitch) {
+         continueLabel = currentLoop.getContinueLabel();
+         if(continueLabel==null) {
+            throw new CompileError("Continue not inside a loop! ", new StatementSource(ctx));
+         }
+      }  else {
+         continueLabel = currentLoop.getOrCreateContinueLabel();
+      }
       Statement continueJmpStmt = new StatementJump(continueLabel.getRef(), new StatementSource(ctx), Comment.NO_COMMENTS);
       sequence.addStatement(continueJmpStmt);
       return null;
diff --git a/src/test/java/dk/camelot64/kickc/test/TestPrograms.java b/src/test/java/dk/camelot64/kickc/test/TestPrograms.java
index a8bb9e592..49ff98a76 100644
--- a/src/test/java/dk/camelot64/kickc/test/TestPrograms.java
+++ b/src/test/java/dk/camelot64/kickc/test/TestPrograms.java
@@ -36,7 +36,6 @@ public class TestPrograms {
    public TestPrograms() {
    }
 
-
    @Test
    public void testAsmMnemonicNames() throws IOException, URISyntaxException {
       compileAndCompare("asm-mnemonic-names");
@@ -47,7 +46,6 @@ public class TestPrograms {
       compileAndCompare("parse-negated-struct-ref");
    }
 
-
    @Test
    public void testLongPointer1() throws IOException, URISyntaxException {
       compileAndCompare("long-pointer-1");
@@ -124,13 +122,10 @@ public class TestPrograms {
    //   compileAndCompare("loophead-problem");
    //}
 
-   // TODO: Fail with proper error when continue is encountered without a loop https://gitlab.com/camelot/kickc/issues/282
-   /*
    @Test
    public void testSwitch3Err() throws IOException, URISyntaxException {
-      compileAndCompare("switch-3-err");
+      assertError("switch-3-err", "Continue not inside a loop!");
    }
-   */
 
    @Test
    public void testSwitch4() throws IOException, URISyntaxException {