X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Floader%2FInterpreter.cpp;h=5adb08e237f20b42c4fb6b9bf4cdf7cfa462d981;hb=def25cbd91b3ee6222daa529818d1f35027d0df9;hp=bd7473aebab2a8673d4f419adbdc359efaa59e8b;hpb=535f472174fd386567bec7002f645183b80cb2ef;p=l2e.git

diff --git a/src/loader/Interpreter.cpp b/src/loader/Interpreter.cpp
index bd7473a..5adb08e 100644
--- a/src/loader/Interpreter.cpp
+++ b/src/loader/Interpreter.cpp
@@ -420,6 +420,58 @@ void Interpreter::ReadScript(const std::vector<ScriptToken *> &s, Script *script
 			if (i == end) {
 				throw Error("unexpected script end after rand");
 			}
+		} else if (cmd == "cmp") {
+			++i;
+			if (i == end) {
+				throw Error("unexpected script end after cmp");
+			}
+			size += sizeof(int);
+			++i;
+			if (i == end) {
+				throw Error("unexpected script end after cmp");
+			}
+		} else if (cmd == "jmp") {
+			size += sizeof(int);
+			++i;
+			if (i == end) {
+				throw Error("unexpected script end after cmp");
+			}
+		} else if (cmd == "jeq") {
+			size += sizeof(int);
+			++i;
+			if (i == end) {
+				throw Error("unexpected script end after cmp");
+			}
+		} else if (cmd == "jne") {
+			size += sizeof(int);
+			++i;
+			if (i == end) {
+				throw Error("unexpected script end after cmp");
+			}
+		} else if (cmd == "jl") {
+			size += sizeof(int);
+			++i;
+			if (i == end) {
+				throw Error("unexpected script end after cmp");
+			}
+		} else if (cmd == "jle") {
+			size += sizeof(int);
+			++i;
+			if (i == end) {
+				throw Error("unexpected script end after cmp");
+			}
+		} else if (cmd == "jg") {
+			size += sizeof(int);
+			++i;
+			if (i == end) {
+				throw Error("unexpected script end after cmp");
+			}
+		} else if (cmd == "jge") {
+			size += sizeof(int);
+			++i;
+			if (i == end) {
+				throw Error("unexpected script end after cmp");
+			}
 		} else if (cmd == "sysc") {
 
 		} else {
@@ -530,6 +582,91 @@ void Interpreter::ReadScript(const std::vector<ScriptToken *> &s, Script *script
 			} else {
 				throw Error("unexpected register " + reg);
 			}
+		} else if (cmd == "cmp") {
+			++i;
+			const string &reg((*i)->RegisterName());
+			++i;
+			if (reg == "i0") {
+				if ((*i)->GetType() == ScriptToken::REGISTER && (*i)->RegisterName() == "i1") {
+					text[cursor] = Script::CODE_CMP_I0_I1;
+					++cursor;
+				} else {
+					text[cursor] = Script::CODE_CMP_I0;
+					++cursor;
+					ReadScriptInteger(**i, text + cursor);
+					cursor += sizeof(int);
+				}
+			} else if (reg == "i1") {
+				text[cursor] = Script::CODE_CMP_I1;
+				++cursor;
+				ReadScriptInteger(**i, text + cursor);
+				cursor += sizeof(int);
+			} else {
+				throw Error("cannot use " + reg + " as lhs for comparison");
+			}
+		} else if (cmd == "jmp") {
+			text[cursor] = Script::CODE_JUMP;
+			++cursor;
+			++i;
+			if (!labels.count((*i)->Identifier())) {
+				throw Error("use of undefined label " + (*i)->Identifier());
+			}
+			*reinterpret_cast<int *>(text + cursor) = labels[(*i)->Identifier()];
+			cursor += sizeof(int);
+		} else if (cmd == "jeq") {
+			text[cursor] = Script::CODE_JUMP_EQUAL;
+			++cursor;
+			++i;
+			if (!labels.count((*i)->Identifier())) {
+				throw Error("use of undefined label " + (*i)->Identifier());
+			}
+			*reinterpret_cast<int *>(text + cursor) = labels[(*i)->Identifier()];
+			cursor += sizeof(int);
+		} else if (cmd == "jne") {
+			text[cursor] = Script::CODE_JUMP_NOT_EQUAL;
+			++cursor;
+			++i;
+			if (!labels.count((*i)->Identifier())) {
+				throw Error("use of undefined label " + (*i)->Identifier());
+			}
+			*reinterpret_cast<int *>(text + cursor) = labels[(*i)->Identifier()];
+			cursor += sizeof(int);
+		} else if (cmd == "jl") {
+			text[cursor] = Script::CODE_JUMP_LESS;
+			++cursor;
+			++i;
+			if (!labels.count((*i)->Identifier())) {
+				throw Error("use of undefined label " + (*i)->Identifier());
+			}
+			*reinterpret_cast<int *>(text + cursor) = labels[(*i)->Identifier()];
+			cursor += sizeof(int);
+		} else if (cmd == "jle") {
+			text[cursor] = Script::CODE_JUMP_LESS_EQUAL;
+			++cursor;
+			++i;
+			if (!labels.count((*i)->Identifier())) {
+				throw Error("use of undefined label " + (*i)->Identifier());
+			}
+			*reinterpret_cast<int *>(text + cursor) = labels[(*i)->Identifier()];
+			cursor += sizeof(int);
+		} else if (cmd == "jg") {
+			text[cursor] = Script::CODE_JUMP_GREATER;
+			++cursor;
+			++i;
+			if (!labels.count((*i)->Identifier())) {
+				throw Error("use of undefined label " + (*i)->Identifier());
+			}
+			*reinterpret_cast<int *>(text + cursor) = labels[(*i)->Identifier()];
+			cursor += sizeof(int);
+		} else if (cmd == "jge") {
+			text[cursor] = Script::CODE_JUMP_GREATER_EQUAL;
+			++cursor;
+			++i;
+			if (!labels.count((*i)->Identifier())) {
+				throw Error("use of undefined label " + (*i)->Identifier());
+			}
+			*reinterpret_cast<int *>(text + cursor) = labels[(*i)->Identifier()];
+			cursor += sizeof(int);
 		} else if (cmd == "sysc") {
 			text[cursor] = Script::CODE_SYSCALL;
 			++cursor;
@@ -620,12 +757,12 @@ void Interpreter::Postpone(int type, int id, std::ptrdiff_t offset, const std::s
 
 void Interpreter::CreateTypeDescriptions() {
 	{
-		TypeDescription &td(TypeDescription::CreateOrGet("Boolean"));
+		TypeDescription &td(TypeDescription::Create(BOOLEAN_ID, "Boolean"));
 		td.SetDescription("Logical value which can be either true or false.");
 		td.SetSize(sizeof(bool));
 	}
 	{
-		TypeDescription &td(TypeDescription::CreateOrGet("Color"));
+		TypeDescription &td(TypeDescription::Create(COLOR_ID, "Color"));
 		td.SetDescription(
 				"A color in RGB format with an optional alpha channel.\n"
 				"Components range from 0 to 255.\n"
@@ -633,34 +770,33 @@ void Interpreter::CreateTypeDescriptions() {
 		td.SetSize(sizeof(Color));
 	}
 	{
-		TypeDescription &td(TypeDescription::CreateOrGet("Image"));
+		TypeDescription &td(TypeDescription::Create(IMAGE_ID, "Image"));
 		td.SetDescription("Path to a PNG file with image data.");
 		td.SetSize(sizeof(SDL_Surface));
 	}
 	{
-		TypeDescription &td(TypeDescription::CreateOrGet("Number"));
+		TypeDescription &td(TypeDescription::Create(NUMBER_ID, "Number"));
 		td.SetDescription("A signed integer.");
 		td.SetSize(sizeof(int));
 	}
-	{
-		int stringId(TypeDescription::GetTypeId("String"));
-		TypeDescription &td(TypeDescription::CreateOrGet("Path"));
+	{;
+		TypeDescription &td(TypeDescription::Create(PATH_ID, "Path"));
 		td.SetDescription("A path in the filesystem which is interpreted relative to the source file's location.");
 		td.SetSize(1);
-		td.AddSupertype(stringId, 0);
+		td.AddSupertype(STRING_ID, 0);
 	}
 	{
-		TypeDescription &td(TypeDescription::CreateOrGet("Script"));
+		TypeDescription &td(TypeDescription::Create(SCRIPT_ID, "Script"));
 		td.SetDescription("Collection of commands that define a behaviour.");
 		td.SetSize(sizeof(Script));
 	}
 	{
-		TypeDescription &td(TypeDescription::CreateOrGet("String"));
+		TypeDescription &td(TypeDescription::Create(STRING_ID, "String"));
 		td.SetDescription("Some characters.");
 		td.SetSize(1);
 	}
 	{
-		TypeDescription &td(TypeDescription::CreateOrGet("Vector"));
+		TypeDescription &td(TypeDescription::Create(VECTOR_ID, "Vector"));
 		td.SetDescription("A pair of numbers usually describing a 2D translation or offset.");
 		td.SetSize(sizeof(Vector<int>));
 	}