add break and continue

Author: MESYETI

examples/break_continue.cal

@@ -0,0 +1,18 @@
+include "cores/select.cal"
+include "std/io.cal"
+
+let cell i
+0 i !
+
+while 1 do
+	i @ 1 + i !
+	i @ printdec new_line
+
+	if i @ 5 = then
+		break
+	end
+end
+
+while 1 do
+	break
+end

source/backends/linux86.d

@@ -16,7 +16,6 @@ private struct Word {
 	Node[] inlineNodes;
 }
 
-
 private struct Type {
 	ulong size;
 }
@@ -58,6 +57,7 @@ class BackendLinux86 : CompilerBackend {
 	bool             inScope;
 	uint             blockCounter;
 	bool             inWhile;
+	uint             currentLoop;
 	Variable[]       variables;
 	Global[string]   globals;
 	Array[]          arrays;
@@ -340,6 +340,7 @@ class BackendLinux86 : CompilerBackend {
 	override void CompileWhile(WhileNode node) {
 		++ blockCounter;
 		uint blockNum = blockCounter;
+		currentLoop   = blockNum;
 
 		output ~= format("jmp __while_%d_condition\n", blockNum);
 		output ~= format("__while_%d:\n", blockNum);
@@ -351,6 +352,8 @@ class BackendLinux86 : CompilerBackend {
 		foreach (ref inode ; node.doWhile) {
 			inWhile = true;
 			compiler.CompileNode(inode);
+
+			currentLoop = blockNum;
 		}
 
 		// restore scope
@@ -359,15 +362,14 @@ class BackendLinux86 : CompilerBackend {
 		}
 		variables = oldVars;
 
+		inWhile = false;
+
 		output ~= format("__while_%d_condition:\n", blockNum);
 
 		foreach (ref inode ; node.condition) {
-			inWhile = true;
 			compiler.CompileNode(inode);
 		}
 
-		inWhile = false;
-
 		output ~= "sub r15, 8\n";
 		output ~= "mov rax, [r15]\n";
 		output ~= "cmp rax, 0\n";
@@ -553,4 +555,20 @@ class BackendLinux86 : CompilerBackend {
 		NewConst(format("%s.max", node.name), node.values.maxElement());
 		NewConst(format("%s.sizeof", node.name), types[node.name].size);
 	}
+
+	override void CompileBreak(WordNode node) {
+		if (!inWhile) {
+			Error(node.error, "Not in while loop");
+		}
+
+		output ~= format("jmp __while_%d_end\n", currentLoop);
+	}
+
+	override void CompileContinue(WordNode node) {
+		if (!inWhile) {
+			Error(node.error, "Not in while loop");
+		}
+
+		output ~= format("jmp __while_%d_condition\n", currentLoop);
+	}
 }

source/backends/rm86.d

@@ -60,6 +60,7 @@ class BackendRM86 : CompilerBackend {
 	Array[]          arrays;
 	string           thisFunc;
 	bool             inWhile;
+	uint             currentLoop;
 
 	this() {
 		types["u8"]    = Type(1);
@@ -295,6 +296,7 @@ class BackendRM86 : CompilerBackend {
 	override void CompileWhile(WhileNode node) {
 		++ blockCounter;
 		uint blockNum = blockCounter;
+		currentLoop   = blockNum;
 
 		output ~= format("jmp __while_%d_condition\n", blockNum);
 		output ~= format("__while_%d:\n", blockNum);
@@ -306,6 +308,8 @@ class BackendRM86 : CompilerBackend {
 		foreach (ref inode ; node.doWhile) {
 			inWhile = true;
 			compiler.CompileNode(inode);
+
+			currentLoop = blockNum;
 		}
 
 		// restore scope
@@ -314,15 +318,14 @@ class BackendRM86 : CompilerBackend {
 		}
 		variables = oldVars;
 
+		inWhile = false;
+
 		output ~= format("__while_%d_condition:\n", blockNum);
 
 		foreach (ref inode ; node.condition) {
-			inWhile = true;
 			compiler.CompileNode(inode);
 		}
 
-		inWhile = false;
-
 		output ~= "sub si, 2\n";
 		output ~= "mov ax, [si]\n";
 		output ~= "cmp ax, 0\n";
@@ -514,4 +517,20 @@ class BackendRM86 : CompilerBackend {
 		NewConst(format("%s.max", node.name), node.values.maxElement());
 		NewConst(format("%s.sizeof", node.name), types[node.name].size);
 	}
+
+	override void CompileBreak(WordNode node) {
+		if (!inWhile) {
+			Error(node.error, "Not in while loop");
+		}
+
+		output ~= format("jmp __while_%d_end\n", currentLoop);
+	}
+
+	override void CompileContinue(WordNode node) {
+		if (!inWhile) {
+			Error(node.error, "Not in while loop");
+		}
+
+		output ~= format("jmp __while_%d_condition\n", currentLoop);
+	}
 }

source/backends/y16.d

@@ -351,4 +351,12 @@ class BackendY16 : CompilerBackend {
 		NewConst(format("%s.max", node.name), node.values.maxElement());
 		NewConst(format("%s.sizeof", node.name), types[node.name].size);
 	}
+
+	override void CompileBreak(WordNode node) {
+		assert(0);
+	}
+
+	override void CompileContinue(WordNode node) {
+		assert(0);
+	}
 }

source/compiler.d

@@ -37,6 +37,8 @@ class CompilerBackend {
 	abstract void CompileReturn(WordNode node);
 	abstract void CompileConst(ConstNode node);
 	abstract void CompileEnum(EnumNode node);
+	abstract void CompileBreak(WordNode node);
+	abstract void CompileContinue(WordNode node);
 
 	final void Error(Char, A...)(ErrorInfo error, in Char[] fmt, A args) {
 		ErrorBegin(error);
@@ -73,13 +75,10 @@ class Compiler {
 				auto node = cast(WordNode) inode;
 
 				switch (node.name) {
-					case "return": {
-						backend.CompileReturn(node);
-						break;
-					}
-					default: {
-						backend.CompileWord(node);
-					}
+					case "return":   backend.CompileReturn(node); break;
+					case "continue": backend.CompileContinue(node); break;
+					case "break":    backend.CompileBreak(node); break;
+					default:         backend.CompileWord(node);
 				}
 				break;
 			}