From 5f5a544a210f4ccda8cc42aba5ff1724fc437912 Mon Sep 17 00:00:00 2001
From: MESYETI <mesyeti@protonmail.com>
Date: Thu, 4 Apr 2024 19:08:20 +0100
Subject: [PATCH] add return

---
 .gitignore             |   1 +
 a.out                  | Bin 0 -> 15632 bytes
 examples/return.cal    |  10 ++++++++++
 source/app.d           |   3 ++-
 source/backends/c.d    |  12 ------------
 source/backends/rm86.d |  16 ++++++++++++++++
 source/backends/y16.d  |   4 ++++
 source/compiler.d      |  13 ++++++++++++-
 source/lexer.d         |  10 ++++++----
 9 files changed, 51 insertions(+), 18 deletions(-)
 create mode 100755 a.out
 create mode 100644 examples/return.cal
 delete mode 100644 source/backends/c.d

diff --git a/.gitignore b/.gitignore
index f856745..f8a5561 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ out.asm
 out.com
 out.bin
 test.cal
+out.c
diff --git a/a.out b/a.out
new file mode 100755
index 0000000000000000000000000000000000000000..687343a5b20b07d1202cb7fa7168128f6be98029
GIT binary patch
literal 15632
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
B2h{)o

literal 0
HcmV?d00001

diff --git a/examples/return.cal b/examples/return.cal
new file mode 100644
index 0000000..12cc57e
--- /dev/null
+++ b/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
diff --git a/source/app.d b/source/app.d
index 3dd810a..d298630 100644
--- a/source/app.d
+++ b/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;
 					}
diff --git a/source/backends/c.d b/source/backends/c.d
deleted file mode 100644
index 5f419fa..0000000
--- a/source/backends/c.d
+++ /dev/null
@@ -1,12 +0,0 @@
-module callisto.backends.c;
-
-import std.conv;
-import std.stdio;
-import std.range;
-import std.format;
-import std.algorithm;
-import callisto.util;
-import callisto.error;
-import callisto.parser;
-import callisto.compiler;
-import callisto.language;
diff --git a/source/backends/rm86.d b/source/backends/rm86.d
index e3fd6fa..41d3687 100644
--- a/source/backends/rm86.d
+++ b/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";
+	}
 }
diff --git a/source/backends/y16.d b/source/backends/y16.d
index 76f0996..8ed771f 100644
--- a/source/backends/y16.d
+++ b/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);
+	}
 }
diff --git a/source/compiler.d b/source/compiler.d
index 0387d72..419cd53 100644
--- a/source/compiler.d
+++ b/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: {
diff --git a/source/lexer.d b/source/lexer.d
index 85bb2aa..cb5a10d 100644
--- a/source/lexer.d
+++ b/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) {