add return

.gitignore

@@ -18,3 +18,4 @@ out.asm
 out.com
 out.bin
 test.cal
+out.c

examples/return.cal

@@ -0,0 +1,10 @@
+include "cores/select.cal"
+include "std/io.cal"
+
+func returnExample begin
+	"Hello 1\r\n" printlstr
+	return
+	"Hello 2\r\n" printlstr
+end
+
+returnExample

source/app.d

@@ -25,6 +25,7 @@ Flags:
 
 Backends:
 	rm86 - Real mode x86
+	y16  - YETI-16 Mk2
 ";
 
 int main(string[] args) {
@@ -56,7 +57,7 @@ int main(string[] args) {
 						stderr.writeln("-o requires FILE parameter");
 						return 1;
 					}
-					if (outFile != "") {
+					if (outFile != "out.asm") {
 						stderr.writeln("Output file set multiple times");
 						return 1;
 					}

source/backends/rm86.d

@@ -58,6 +58,7 @@ class BackendRM86 : CompilerBackend {
 	Constant[string] consts;
 	bool             inScope;
 	Array[]          arrays;
+	string           thisFunc;
 
 	this() {
 		types["u8"]    = Type(1);
@@ -185,6 +186,8 @@ class BackendRM86 : CompilerBackend {
 			Error(node.error, "Name '%s' can't be used", node.name);
 		}
 
+		thisFunc = node.name;
+
 		if (node.inline) {
 			words[node.name] = Word(true, node.nodes);
 		}
@@ -437,4 +440,17 @@ class BackendRM86 : CompilerBackend {
 		NewConst(format("%s.sizeof", node.name), offset);
 		types[node.name] = Type(offset);
 	}
+
+	override void CompileReturn(WordNode node) {
+		if (!inScope) {
+			Error(node.error, "Return used outside of function");
+		}
+
+		size_t scopeSize;
+		foreach (ref var ; variables) {
+			scopeSize += var.Size();
+		}
+		output ~= format("add sp, %d\n", scopeSize);
+		output ~= "ret\n";
+	}
 }

source/backends/y16.d

@@ -305,4 +305,8 @@ class BackendY16 : CompilerBackend {
 	override void CompileStruct(StructNode node) {
 		assert(0);
 	}
+
+	override void CompileReturn(WordNode node) {
+		assert(0);
+	}
 }

source/compiler.d

@@ -29,6 +29,7 @@ class CompilerBackend {
 	abstract void CompileArray(ArrayNode node);
 	abstract void CompileString(StringNode node);
 	abstract void CompileStruct(StructNode node);
+	abstract void CompileReturn(WordNode node);
 
 	final void Error(Char, A...)(ErrorInfo error, in Char[] fmt, A args) {
 		ErrorBegin(error);
@@ -61,7 +62,17 @@ class Compiler {
 	void CompileNode(Node inode) {
 		switch (inode.type) {
 			case NodeType.Word: {
-				backend.CompileWord(cast(WordNode) inode);
+				auto node = cast(WordNode) inode;
+
+				switch (node.name) {
+					case "return": {
+						backend.CompileReturn(node);
+						break;
+					}
+					default: {
+						backend.CompileWord(node);
+					}
+				}
 				break;
 			}
 			case NodeType.Integer: {

source/lexer.d

@@ -125,10 +125,12 @@ class Lexer {
 
 	void Lex() {
 		char[char] escapes = [
-			'n': '\n',
-			'r': '\r',
-			't': '\t',
-			'e': '\x1b'
+			'n':  '\n',
+			'r':  '\r',
+			't':  '\t',
+			'e':  '\x1b',
+			'"':  '"',
+			'\\': '\\'
 		];
 
 		for (i = 0; i < code.length; ++ i) {