X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Floader%2FInterpreter.cpp;h=c2ce0d4145abf20ee1b90c291ad7965d2e5446aa;hb=77915e0186f4fc0788054eb34651c726b80d981c;hp=a3d382ceba7618f9f1782bf718c1cf49293753be;hpb=4bc70f5311dcbcca4e6b9e852bbcb19602f50eeb;p=l2e.git

diff --git a/src/loader/Interpreter.cpp b/src/loader/Interpreter.cpp
index a3d382c..c2ce0d4 100644
--- a/src/loader/Interpreter.cpp
+++ b/src/loader/Interpreter.cpp
@@ -14,6 +14,7 @@
 #include "../battle/Resources.h"
 #include "../common/Ikari.h"
 #include "../common/Item.h"
+#include "../common/Script.h"
 #include "../common/Spell.h"
 #include "../common/Stats.h"
 #include "../common/TargetingMode.h"
@@ -34,6 +35,7 @@ using battle::Monster;
 using battle::PartyLayout;
 using common::Ikari;
 using common::Item;
+using common::Script;
 using common::Spell;
 using common::Stats;
 using common::TargetingMode;
@@ -54,18 +56,9 @@ using std::vector;
 namespace loader {
 
 Interpreter::~Interpreter() {
-	for (vector<PostponedDefinition>::const_iterator i(postponedDefinitions.begin()), end(postponedDefinitions.end()); i != end; ++i) {
-		delete i->identifier;
-	}
 	for (std::map<string, SDL_Surface *>::const_iterator i(imageCache.begin()), end(imageCache.end()); i != end; ++i) {
 		SDL_FreeSurface(i->second);
 	}
-	// TODO: maybe need to reverse the array deletion check if most objects turn out to be arrays (of char)
-	for (std::map<int, vector<void *> >::const_iterator i(values.begin()), end(values.end()); i != end; ++i) {
-		for (vector<void *>::const_iterator j(i->second.begin()), end(i->second.end()); j != end; ++j) {
-			delete[] reinterpret_cast<char *>(*j);
-		}
-	}
 }
 
 
@@ -120,7 +113,7 @@ void Interpreter::ReadLiteral(const Definition &dfn) {
 			(dfn.GetLiteral()->GetType() == Literal::PATH
 					|| dfn.GetLiteral()->GetType() == Literal::STRING)
 			? dfn.GetLiteral()->GetString().size() : td.Size());
-	char *object(new char[size]);
+	char *object(alloc.Alloc(size));
 	if (dfn.GetLiteral()->GetType() == Literal::OBJECT) {
 		ReadObject(typeId, id, object, *dfn.GetLiteral()->GetProperties());
 	} else {
@@ -151,6 +144,10 @@ void Interpreter::ReadLiteral(int typeId, int id, char *object, const Literal &l
 			std::memcpy(object, literal.GetString().c_str(), literal.GetString().size());
 			object[literal.GetString().size()] = '\0';
 			break;
+		case Literal::SCRIPT:
+			new (object) Script;
+			ReadScript(literal.GetScript(), reinterpret_cast<Script *>(object));
+			break;
 		case Literal::STRING:
 			std::memcpy(object, literal.GetString().c_str(), literal.GetString().size());
 			object[literal.GetString().size()] = '\0';
@@ -160,7 +157,6 @@ void Interpreter::ReadLiteral(int typeId, int id, char *object, const Literal &l
 			break;
 		case Literal::OBJECT:
 			throw Error("illogical branch: read literal object as non-object literal");
-			break;
 	}
 }
 
@@ -170,7 +166,7 @@ void *Interpreter::GetObject(int typeId, const Value &v) {
 		if (v.GetLiteral().IsObject()) {
 			int typeId(TypeDescription::GetTypeId(v.GetLiteral().GetTypeName()));
 			const TypeDescription &td(TypeDescription::Get(typeId));
-			char *object(new char[td.Size()]);
+			char *object(alloc.Alloc(td.Size()));
 			td.Construct(object);
 			int id(values[typeId].size());
 			values[typeId].push_back(object);
@@ -190,7 +186,7 @@ void *Interpreter::GetObject(int typeId, const Value &v) {
 						typeId = TypeDescription::GetTypeId("Boolean");
 						id = values[typeId].size();
 						const TypeDescription &td(TypeDescription::Get(typeId));
-						char *object(new char[td.Size()]);
+						char *object(alloc.Alloc(td.Size()));
 						values[typeId].push_back(new (object) bool(v.GetLiteral().GetBoolean()));
 					}
 					break;
@@ -199,7 +195,7 @@ void *Interpreter::GetObject(int typeId, const Value &v) {
 						typeId = TypeDescription::GetTypeId("Color");
 						id = values[typeId].size();
 						const TypeDescription &td(TypeDescription::Get(typeId));
-						char *object(new char[td.Size()]);
+						char *object(alloc.Alloc(td.Size()));
 						values[typeId].push_back(new (object) Color(v.GetLiteral().GetRed(), v.GetLiteral().GetGreen(), v.GetLiteral().GetBlue(), v.GetLiteral().GetAlpha()));
 					}
 					break;
@@ -208,7 +204,7 @@ void *Interpreter::GetObject(int typeId, const Value &v) {
 						typeId = TypeDescription::GetTypeId("Number");
 						id = values[typeId].size();
 						const TypeDescription &td(TypeDescription::Get(typeId));
-						char *object(new char[td.Size()]);
+						char *object(alloc.Alloc(td.Size()));
 						values[typeId].push_back(new (object) int(v.GetLiteral().GetNumber()));
 					}
 					break;
@@ -216,17 +212,24 @@ void *Interpreter::GetObject(int typeId, const Value &v) {
 					{
 						typeId = TypeDescription::GetTypeId("Path");
 						id = values[typeId].size();
-						char *str(new char[v.GetLiteral().GetString().size() + 1]);
+						char *str(alloc.Alloc(v.GetLiteral().GetString().size() + 1));
 						std::memcpy(str, v.GetLiteral().GetString().c_str(), v.GetLiteral().GetString().size());
 						str[v.GetLiteral().GetString().size()] = '\0';
 						values[typeId].push_back(str);
 					}
 					break;
+				case Literal::SCRIPT:
+					{
+						typeId = TypeDescription::GetTypeId("Script");
+						id = values[typeId].size();
+						values[typeId].push_back(ReadScript(v.GetLiteral().GetScript()));
+					}
+					break;
 				case Literal::STRING:
 					{
 						typeId = TypeDescription::GetTypeId("String");
 						id = values[typeId].size();
-						char *str(new char[v.GetLiteral().GetString().size() + 1]);
+						char *str(alloc.Alloc(v.GetLiteral().GetString().size() + 1));
 						std::memcpy(str, v.GetLiteral().GetString().c_str(), v.GetLiteral().GetString().size());
 						str[v.GetLiteral().GetString().size()] = '\0';
 						values[typeId].push_back(str);
@@ -237,7 +240,7 @@ void *Interpreter::GetObject(int typeId, const Value &v) {
 						typeId = TypeDescription::GetTypeId("Vector");
 						id = values[typeId].size();
 						const TypeDescription &td(TypeDescription::Get(typeId));
-						char *object(new char[td.Size()]);
+						char *object(alloc.Alloc(td.Size()));
 						values[typeId].push_back(new (object) Vector<int>(v.GetLiteral().GetX(), v.GetLiteral().GetY()));
 					}
 					break;
@@ -246,7 +249,7 @@ void *Interpreter::GetObject(int typeId, const Value &v) {
 						typeId = TypeDescription::GetTypeId(v.GetLiteral().GetTypeName());
 						const TypeDescription &td(TypeDescription::Get(typeId));
 						id = values[typeId].size();
-						char *object(new char[td.Size()]);
+						char *object(alloc.Alloc(td.Size()));
 						td.Construct(object);
 						ReadObject(typeId, id, object, *v.GetLiteral().GetProperties());
 					}
@@ -265,7 +268,7 @@ void Interpreter::ReadObject(const Definition &dfn) {
 	int typeId(TypeDescription::GetTypeId(dfn.TypeName()));
 	const TypeDescription &td(TypeDescription::Get(typeId));
 	int id(values[typeId].size());
-	char *object(new char[td.Size()]);
+	char *object(alloc.Alloc(td.Size()));
 	td.Construct(object);
 	values[typeId].push_back(object);
 	ReadObject(typeId, id, object, *dfn.GetProperties());
@@ -282,7 +285,7 @@ void Interpreter::ReadObject(int typeId, int id, char *object, const PropertyLis
 			char *dest(object + fd.Offset());
 			if (fd.IsAggregate()) {
 				int arraySize(i->second->GetLiteral().ArraySize());
-				char *aggregate(new char[fieldType.Size() * arraySize]);
+				char *aggregate(alloc.Alloc(fieldType.Size() * arraySize));
 				char *iter(aggregate);
 				if (i->second->GetLiteral().GetType() == Literal::ARRAY_PROPS) {
 					const vector<PropertyList *> &list(i->second->GetLiteral().GetPropertyLists());
@@ -304,6 +307,13 @@ void Interpreter::ReadObject(int typeId, int id, char *object, const PropertyLis
 				} else {
 					throw Error("aggregate type fields must be referenced");
 				}
+			} else if (i->second->IsLiteral() && !fd.IsReferenced()) {
+				// inline literals
+				if (i->second->GetLiteral().IsObject()) {
+					ReadObject(fd.TypeId(), -1, dest, *i->second->GetLiteral().GetProperties());
+				} else {
+					ReadLiteral(fd.TypeId(), -1, dest, i->second->GetLiteral());
+				}
 			} else {
 				char *src(reinterpret_cast<char *>(GetObject(fd.TypeId(), *i->second)));
 				if (fd.TypeId() == TypeDescription::GetTypeId("Image")) {
@@ -323,6 +333,248 @@ void Interpreter::ReadObject(int typeId, int id, char *object, const PropertyLis
 }
 
 
+void Interpreter::ReadScript(const std::vector<ScriptToken *> &s, Script *script) {
+	int size(0);
+	for (vector<ScriptToken *>::const_iterator i(s.begin()), end(s.end()); i != end; ++i) {
+		if ((*i)->GetType() != ScriptToken::COMMAND) {
+			throw Error("unexpected script token");
+		}
+		++size;
+		const string &cmd((*i)->CommandName());
+		if (cmd == "move") {
+			++i;
+			if (i == end) {
+				throw Error("unexpected script end after move");
+			}
+			const string &reg((*i)->RegisterName());
+			switch (reg[0]) {
+				case 'a':
+					size += sizeof(void *);
+					break;
+				case 'i':
+					size += sizeof(int);
+					break;
+				case 'v':
+					size += sizeof(Vector<int>);
+					break;
+				default:
+					throw Error("unknown register " + reg);
+			}
+			++i;
+			if (i == end) {
+				throw Error("unexpected script end after move");
+			}
+		} else if (cmd == "add") {
+			++i;
+			if (i == end) {
+				throw Error("unexpected script end after add");
+			}
+			const string &reg((*i)->RegisterName());
+			switch (reg[0]) {
+				case 'i':
+					size += sizeof(int);
+					break;
+				case 'v':
+					size += sizeof(Vector<int>);
+					break;
+				default:
+					throw Error("expected register after add " + reg);
+			}
+			++i;
+			if (i == end) {
+				throw Error("unexpected script end after add");
+			}
+		} else if (cmd == "mod") {
+			++i;
+			if (i == end) {
+				throw Error("unexpected script end after mod");
+			}
+			size += sizeof(int);
+			++i;
+			if (i == end) {
+				throw Error("unexpected script end after mod");
+			}
+		} else if (cmd == "rand") {
+			++i;
+			if (i == end) {
+				throw Error("unexpected script end after rand");
+			}
+			size += sizeof(int);
+			++i;
+			if (i == end) {
+				throw Error("unexpected script end after rand");
+			}
+		} else if (cmd == "sysc") {
+
+		} else {
+			throw Error("unknown command " + cmd);
+		}
+	}
+
+	unsigned char *text(reinterpret_cast<unsigned char *>(alloc.Alloc(size)));
+	int cursor(0);
+	for (vector<ScriptToken *>::const_iterator i(s.begin()), end(s.end()); i != end; ++i) {
+		if ((*i)->GetType() != ScriptToken::COMMAND) {
+			throw Error("unexpected script token");
+		}
+		const string &cmd((*i)->CommandName());
+		if (cmd == "move") {
+			++i;
+			const string &reg((*i)->RegisterName());
+			++i;
+			if (reg == "a0") {
+				text[cursor] = Script::CODE_MOVE_A0;
+				++cursor;
+				ReadScriptAddress(**i, text + cursor);
+				cursor += sizeof(void *);
+			} else if (reg == "a1") {
+				text[cursor] = Script::CODE_MOVE_A1;
+				++cursor;
+				ReadScriptAddress(**i, text + cursor);
+				cursor += sizeof(void *);
+			} else if (reg == "i0") {
+				text[cursor] = Script::CODE_MOVE_I0;
+				++cursor;
+				ReadScriptInteger(**i, text + cursor);
+				cursor += sizeof(int);
+			} else if (reg == "i1") {
+				text[cursor] = Script::CODE_MOVE_I1;
+				++cursor;
+				ReadScriptInteger(**i, text + cursor);
+				cursor += sizeof(int);
+			} else if (reg == "v0") {
+				text[cursor] = Script::CODE_MOVE_V0;
+				++cursor;
+				ReadScriptVector(**i, text + cursor);
+				cursor += sizeof(Vector<int>);
+			} else if (reg == "v1") {
+				text[cursor] = Script::CODE_MOVE_V1;
+				++cursor;
+				ReadScriptVector(**i, text + cursor);
+				cursor += sizeof(Vector<int>);
+			} else {
+				throw Error("unknown register " + reg);
+			}
+		} else if (cmd == "add") {
+			++i;
+			const string &reg((*i)->RegisterName());
+			++i;
+			if (reg == "i0") {
+				text[cursor] = Script::CODE_ADD_I0;
+				++cursor;
+				ReadScriptInteger(**i, text + cursor);
+				cursor += sizeof(int);
+			} else if (reg == "i1") {
+				text[cursor] = Script::CODE_ADD_I1;
+				++cursor;
+				ReadScriptInteger(**i, text + cursor);
+				cursor += sizeof(int);
+			} else if (reg == "v0") {
+				text[cursor] = Script::CODE_ADD_V0;
+				++cursor;
+				ReadScriptVector(**i, text + cursor);
+				cursor += sizeof(Vector<int>);
+			} else if (reg == "v1") {
+				text[cursor] = Script::CODE_ADD_V1;
+				++cursor;
+				ReadScriptVector(**i, text + cursor);
+				cursor += sizeof(Vector<int>);
+			} else {
+				throw Error("unexpected register " + reg);
+			}
+		} else if (cmd == "mod") {
+			++i;
+			const string &reg((*i)->RegisterName());
+			++i;
+			if (reg == "i0") {
+				text[cursor] = Script::CODE_MOD_I0;
+				++cursor;
+				ReadScriptInteger(**i, text + cursor);
+				cursor += sizeof(int);
+			} else if (reg == "i1") {
+				text[cursor] = Script::CODE_MOD_I1;
+				++cursor;
+				ReadScriptInteger(**i, text + cursor);
+				cursor += sizeof(int);
+			} else {
+				throw Error("unexpected register " + reg);
+			}
+		} else if (cmd == "rand") {
+			++i;
+			const string &reg((*i)->RegisterName());
+			if (reg == "i0") {
+				text[cursor] = Script::CODE_RAND_I0;
+				++cursor;
+			} else if (reg == "i1") {
+				text[cursor] = Script::CODE_RAND_I1;
+				++cursor;
+			} else {
+				throw Error("unexpected register " + reg);
+			}
+		} else if (cmd == "sysc") {
+			text[cursor] = Script::CODE_SYSCALL;
+			++cursor;
+		} else {
+			throw Error("unknown command " + cmd);
+		}
+	}
+
+	script->text = text;
+	script->textlen = size;
+}
+
+char *Interpreter::ReadScript(const vector<ScriptToken *> &s) {
+	char *mem(alloc.Alloc(sizeof(Script)));
+	new (mem) Script;
+	Script *script(reinterpret_cast<Script *>(mem));
+	ReadScript(s, script);
+	return mem;
+}
+
+void Interpreter::ReadScriptAddress(const ScriptToken &t, unsigned char *dest) {
+	if (t.GetType() != ScriptToken::IDENTIFIER) {
+		throw Error("expected identifier for address");
+	}
+	if (source.IsDefined(t.GetIdentifier())) {
+		const ParsedDefinition &def(GetDefinition(t.GetIdentifier()));
+		void *addr(GetObject(def.type, t.GetIdentifier()));
+		*reinterpret_cast<void **>(dest) = addr;
+	} else {
+		throw Error("postponing values in scripts not implemented");
+	}
+}
+
+void Interpreter::ReadScriptInteger(const ScriptToken &t, unsigned char *dest) {
+	if (t.GetType() == ScriptToken::IDENTIFIER) {
+		if (source.IsDefined(t.GetIdentifier())) {
+			void *num(GetObject(TypeDescription::GetTypeId("Number"), t.GetIdentifier()));
+			*reinterpret_cast<int *>(dest) = *reinterpret_cast<int *>(num);
+		} else {
+			throw Error("postponing values in scripts not implemented");
+		}
+	} else if (t.GetType() == ScriptToken::LITERAL) {
+		*reinterpret_cast<int *>(dest) = t.GetLiteral()->GetNumber();
+	} else {
+		throw Error("expected identifier or integer literal");
+	}
+}
+
+void Interpreter::ReadScriptVector(const ScriptToken &t, unsigned char *dest) {
+	if (t.GetType() == ScriptToken::IDENTIFIER) {
+		if (source.IsDefined(t.GetIdentifier())) {
+			void *vec(GetObject(TypeDescription::GetTypeId("Vector"), t.GetIdentifier()));
+			*reinterpret_cast<Vector<int> *>(dest) = *reinterpret_cast<Vector<int> *>(vec);
+		} else {
+			throw Error("postponing values in scripts not implemented");
+		}
+	} else if (t.GetType() == ScriptToken::LITERAL) {
+		*reinterpret_cast<Vector<int> *>(dest) = Vector<int>(t.GetLiteral()->GetX(), t.GetLiteral()->GetY());
+	} else {
+		throw Error("expected identifier or vector literal");
+	}
+}
+
+
 SDL_Surface *Interpreter::GetImage(const string &path) {
 	std::map<string, SDL_Surface *>::const_iterator result(imageCache.find(path));
 	if (result != imageCache.end()) {
@@ -340,7 +592,7 @@ bool Interpreter::CanLink(const Value &v) const {
 }
 
 void Interpreter::Postpone(int type, int id, std::ptrdiff_t offset, const std::string &identifier, int linkedType, bool inlined) {
-	char *str(new char[identifier.size() + 1]);
+	char *str(alloc.Alloc(identifier.size() + 1));
 	std::memcpy(str, identifier.c_str(), identifier.size());
 	str[identifier.size()] = '\0';
 	postponedDefinitions.push_back(PostponedDefinition(type, id, offset, str, linkedType, inlined));
@@ -378,6 +630,11 @@ void Interpreter::CreateTypeDescriptions() {
 		td.SetSize(1);
 		td.AddSupertype(stringId, 0);
 	}
+	{
+		TypeDescription &td(TypeDescription::CreateOrGet("Script"));
+		td.SetDescription("Collection of commands that define a behaviour.");
+		td.SetSize(sizeof(Script));
+	}
 	{
 		TypeDescription &td(TypeDescription::CreateOrGet("String"));
 		td.SetDescription("Some characters.");