From 3dcec77fb7bff637929555a2c6883991cb18430e Mon Sep 17 00:00:00 2001
From: jespergravgaard <jesper@balmangravgaard.dk>
Date: Mon, 13 Apr 2020 10:50:57 +0200
Subject: [PATCH] Added proper error when returning value from void function.
 Closes #400

---
 .../kickc/passes/Pass0GenerateStatementSequence.java     | 3 +++
 src/test/java/dk/camelot64/kickc/test/TestPrograms.java  | 5 +++++
 src/test/kc/returnfromvoid.c                             | 9 +++++++++
 3 files changed, 17 insertions(+)
 create mode 100644 src/test/kc/returnfromvoid.c

diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass0GenerateStatementSequence.java b/src/main/java/dk/camelot64/kickc/passes/Pass0GenerateStatementSequence.java
index d7d239728..52e89dc0a 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass0GenerateStatementSequence.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass0GenerateStatementSequence.java
@@ -1678,6 +1678,9 @@ public class Pass0GenerateStatementSequence extends KickCParserBaseVisitor<Objec
       KickCParser.CommaExprContext exprCtx = ctx.commaExpr();
       RValue rValue;
       if(exprCtx != null) {
+         if(SymbolType.VOID.equals(procedure.getReturnType())) {
+            throw new CompileError("Error! Return value from void function "+procedure.getFullName(), new StatementSource(ctx));
+         }
          PrePostModifierHandler.addPreModifiers(this, exprCtx, new StatementSource(ctx));
          rValue = (RValue) this.visit(exprCtx);
          Variable returnVar = procedure.getLocalVariable("return");
diff --git a/src/test/java/dk/camelot64/kickc/test/TestPrograms.java b/src/test/java/dk/camelot64/kickc/test/TestPrograms.java
index 98baf7bc0..7c08f1848 100644
--- a/src/test/java/dk/camelot64/kickc/test/TestPrograms.java
+++ b/src/test/java/dk/camelot64/kickc/test/TestPrograms.java
@@ -3845,6 +3845,11 @@ public class TestPrograms {
       assertError("noreturn.c", "Method must end with a return statement", false);
    }
 
+   @Test
+   public void testReturnFromVoid() throws IOException, URISyntaxException {
+      assertError("returnfromvoid.c", "Error! Return value from void function");
+   }
+
    @Test
    public void testProcedureNotFound() throws IOException, URISyntaxException {
       assertError("procedurenotfound.c", "Called procedure not found");
diff --git a/src/test/kc/returnfromvoid.c b/src/test/kc/returnfromvoid.c
new file mode 100644
index 000000000..4045bc84f
--- /dev/null
+++ b/src/test/kc/returnfromvoid.c
@@ -0,0 +1,9 @@
+// Return a value from a void function
+
+void main() {
+    print();
+}
+
+void print() {
+    return 2;
+}