X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Floader%2FInterpreter.cpp;h=d13c3c6424bfbdd60ccc5cefd19d96f85a56440a;hb=b20681c1bf555c337b15796b3910d0d48488b102;hp=9e076c1cb68494c46ce18c54bacf41ff578312c7;hpb=05112fcfdbd0c452c80b6786bf6121d6f63b852a;p=l2e.git

diff --git a/src/loader/Interpreter.cpp b/src/loader/Interpreter.cpp
index 9e076c1..d13c3c6 100644
--- a/src/loader/Interpreter.cpp
+++ b/src/loader/Interpreter.cpp
@@ -1,34 +1,138 @@
-/*
- * Interpreter.cpp
- *
- *  Created on: Aug 26, 2012
- *      Author: holy
- */
-
 #include "Interpreter.h"
 
 #include "ParsedSource.h"
+#include "TypeDescription.h"
 #include "../battle/Hero.h"
 #include "../battle/Monster.h"
+#include "../battle/PartyLayout.h"
+#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"
 #include "../graphics/ComplexAnimation.h"
+#include "../graphics/Font.h"
+#include "../graphics/Frame.h"
+#include "../graphics/Gauge.h"
+#include "../graphics/Menu.h"
 #include "../graphics/SimpleAnimation.h"
 #include "../graphics/Sprite.h"
 
+#include <algorithm>
+#include <cstring>
+#include <SDL_image.h>
+
 using battle::Hero;
 using battle::Monster;
-using battle::Stats;
+using battle::PartyLayout;
+using common::Ikari;
+using common::Item;
+using common::Script;
+using common::Spell;
+using common::Stats;
+using common::TargetingMode;
 using graphics::Animation;
+using graphics::Color;
+using graphics::Font;
+using graphics::Frame;
+using graphics::Gauge;
 using graphics::ComplexAnimation;
 using graphics::SimpleAnimation;
 using graphics::Sprite;
-using geometry::Vector;
-using std::map;
+using math::Vector;
+using std::make_pair;
 using std::set;
 using std::string;
 using std::vector;
 
 namespace loader {
 
+Interpreter::~Interpreter() {
+	for (std::map<string, SDL_Surface *>::const_iterator i(imageCache.begin()), end(imageCache.end()); i != end; ++i) {
+		SDL_FreeSurface(i->second);
+	}
+}
+
+
+const Interpreter::ParsedDefinition &Interpreter::GetDefinition(const string &identifier) {
+	std::map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(identifier));
+	if (i != parsedDefinitions.end()) {
+		return i->second;
+	} else if (source.IsDefined(identifier)) {
+		ReadDefinition(source.GetDefinition(identifier));
+		return parsedDefinitions.at(identifier);
+	} else {
+		throw Error("access to undefined object " + identifier);
+	}
+}
+
+const Interpreter::ParsedDefinition &Interpreter::GetDefinition(const string &identifier) const {
+	std::map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(identifier));
+	if (i != parsedDefinitions.end()) {
+		return i->second;
+	} else {
+		throw Error("access to undefined object " + identifier);
+	}
+}
+
+
+void *Interpreter::GetObject(
+		int typeId,
+		const std::string &name) {
+	std::map<string, ParsedDefinition>::const_iterator
+			i(parsedDefinitions.find(name));
+	if (i != parsedDefinitions.end()) {
+		const TypeDescription &requested =
+				TypeDescription::Get(typeId);
+		const TypeDescription &actual =
+				TypeDescription::Get(i->second.type);
+		if (requested.TypeId() == actual.TypeId()) {
+			return values[actual.TypeId()][i->second.id];
+		} else if (actual.IsSubtypeOf(requested)) {
+			char *sub = reinterpret_cast<char *>(
+					values[actual.TypeId()][i->second.id]);
+			std::ptrdiff_t offset =
+					actual.SupertypeOffset(requested);
+			return sub - offset;
+		} else {
+			throw Error("cannot cast " + actual.TypeName()
+					+ " to " + requested.TypeName());
+		}
+	} else {
+		throw Error("access to undefined object " + name);
+	}
+}
+
+const void *Interpreter::GetObject(
+		int typeId,
+		const std::string &name) const {
+	std::map<string, ParsedDefinition>::const_iterator
+			i(parsedDefinitions.find(name));
+	if (i != parsedDefinitions.end()) {
+		const TypeDescription &requested =
+				TypeDescription::Get(typeId);
+		const TypeDescription &actual =
+				TypeDescription::Get(i->second.type);
+		if (requested.TypeId() == actual.TypeId()) {
+			return values.at(actual.TypeId()).at(i->second.id);
+		} else if (actual.IsSubtypeOf(requested)) {
+			char *sub = reinterpret_cast<char *>(
+					values.at(actual.TypeId()).at(i->second.id));
+			std::ptrdiff_t offset =
+					actual.SupertypeOffset(requested);
+			return sub - offset;
+		} else {
+			throw Error("cannot cast " + actual.TypeName()
+					+ " to " + requested.TypeName());
+		}
+	} else {
+		throw Error("access to undefined object " + name);
+	}
+}
+
+
 void Interpreter::ReadSource() {
 	for (set<string>::const_iterator i(source.Exports().begin()), end(source.Exports().end()); i != end; ++i) {
 		ReadDefinition(source.GetDefinition(*i));
@@ -47,318 +151,836 @@ void Interpreter::ReadDefinition(const Definition &dfn) {
 }
 
 void Interpreter::ReadLiteral(const Definition &dfn) {
-	switch (dfn.GetLiteral()->GetType()) {
+	const string &typeName(dfn.GetLiteral()->IsArray() ? "Array" : dfn.GetLiteral()->GetTypeName());
+	int typeId(TypeDescription::GetTypeId(typeName));
+	int id(values[typeId].size());
+	const TypeDescription &td(TypeDescription::Get(typeId));
+	int size(
+			(dfn.GetLiteral()->GetType() == Literal::PATH
+					|| dfn.GetLiteral()->GetType() == Literal::STRING)
+			? dfn.GetLiteral()->GetString().size() : td.Size());
+	char *object(alloc.Alloc(size));
+	values[typeId].push_back(object);
+	parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, typeId, id)));
+	if (dfn.GetLiteral()->GetType() == Literal::OBJECT) {
+		ReadObject(typeId, id, object, *dfn.GetLiteral()->GetProperties());
+	} else {
+		ReadLiteral(typeId, id, object, *dfn.GetLiteral());
+	}
+}
+
+void Interpreter::ReadLiteral(int typeId, int id, char *object, const Literal &literal) {
+	switch (literal.GetType()) {
 		case Literal::ARRAY_VALUES:
-			throw Error("unhandled literal: array of values");
-			break;
 		case Literal::ARRAY_PROPS:
-			throw Error("unhandled literal: array of properties");
+		case Literal::ARRAY_IDENTS:
+			throw Error("named arrays are not supported, sorry");
 			break;
 		case Literal::BOOLEAN:
-			throw Error("unhandled literal: boolean");
+			new (object) bool(literal.GetBoolean());
 			break;
 		case Literal::COLOR:
-			throw Error("unhandled literal: color");
+			new (object) Color(literal.GetRed(), literal.GetGreen(), literal.GetBlue(), literal.GetAlpha());
 			break;
 		case Literal::NUMBER:
-			numbers[dfn.Identifier()] = dfn.GetLiteral()->GetNumber();
+			new (object) int(literal.GetNumber());
+			break;
+		case Literal::PATH:
+			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:
-			throw Error("unhandled literal: string");
+			std::memcpy(object, literal.GetString().c_str(), literal.GetString().size());
+			object[literal.GetString().size()] = '\0';
 			break;
 		case Literal::VECTOR:
-			throw Error("unhandled literal: vector");
+			new (object) Vector<int>(literal.GetX(), literal.GetY());
 			break;
 		case Literal::OBJECT:
-			throw Error("unhandled literal: object");
-			break;
+			throw Error("illogical branch: read literal object as non-object literal");
 	}
 }
 
-Animation *Interpreter::GetAnimation(const Value &v) {
+
+void *Interpreter::GetObject(int typeId, const Value &v) {
 	if (v.IsLiteral()) {
-		if (v.GetLiteral().GetTypeName() == "ComplexAnimation") {
-			ComplexAnimation *a(new ComplexAnimation);
-			ReadComplexAnimation(*a, *v.GetLiteral().GetProperties());
-			return a;
+		if (v.GetLiteral().IsObject()) {
+			int typeId(TypeDescription::GetTypeId(v.GetLiteral().GetTypeName()));
+			const TypeDescription &td(TypeDescription::Get(typeId));
+			char *object(alloc.Alloc(td.Size()));
+			td.Construct(object);
+			int id(values[typeId].size());
+			values[typeId].push_back(object);
+			ReadObject(typeId, id, object, *v.GetLiteral().GetProperties());
+			return object;
 		} else {
-			SimpleAnimation *a(new SimpleAnimation);
-			ReadSimpleAnimation(*a, *v.GetLiteral().GetProperties());
-			return a;
-		}
-	} else if (animations.count(v.GetIdentifier())) {
-		return animations[v.GetIdentifier()];
-	} else if (source.IsDefined(v.GetIdentifier())) {
-		ReadDefinition(source.GetDefinition(v.GetIdentifier()));
-		if (animations.count(v.GetIdentifier())) {
-			return animations[v.GetIdentifier()];
-		} else {
-			throw Error("cannot use " + source.GetDefinition(v.GetIdentifier()).Identifier() + " " + v.GetIdentifier() + " as animation");
+			int typeId(0), id(0);
+			switch (v.GetLiteral().GetType()) {
+				case Literal::ARRAY_VALUES:
+				case Literal::ARRAY_PROPS:
+				case Literal::ARRAY_IDENTS:
+					throw Error("cannot copy arrays, sorry");
+					break;
+				case Literal::BOOLEAN:
+					{
+						typeId = TypeDescription::GetTypeId("Boolean");
+						id = values[typeId].size();
+						const TypeDescription &td(TypeDescription::Get(typeId));
+						char *object(alloc.Alloc(td.Size()));
+						values[typeId].push_back(new (object) bool(v.GetLiteral().GetBoolean()));
+					}
+					break;
+				case Literal::COLOR:
+					{
+						typeId = TypeDescription::GetTypeId("Color");
+						id = values[typeId].size();
+						const TypeDescription &td(TypeDescription::Get(typeId));
+						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;
+				case Literal::NUMBER:
+					{
+						typeId = TypeDescription::GetTypeId("Number");
+						id = values[typeId].size();
+						const TypeDescription &td(TypeDescription::Get(typeId));
+						char *object(alloc.Alloc(td.Size()));
+						values[typeId].push_back(new (object) int(v.GetLiteral().GetNumber()));
+					}
+					break;
+				case Literal::PATH:
+					{
+						typeId = TypeDescription::GetTypeId("Path");
+						id = values[typeId].size();
+						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");
+						char *script(ReadScript(v.GetLiteral().GetScript()));
+						id = values[typeId].size();
+						values[typeId].push_back(script);
+					}
+					break;
+				case Literal::STRING:
+					{
+						typeId = TypeDescription::GetTypeId("String");
+						id = values[typeId].size();
+						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::VECTOR:
+					{
+						typeId = TypeDescription::GetTypeId("Vector");
+						id = values[typeId].size();
+						const TypeDescription &td(TypeDescription::Get(typeId));
+						char *object(alloc.Alloc(td.Size()));
+						values[typeId].push_back(new (object) Vector<int>(v.GetLiteral().GetX(), v.GetLiteral().GetY()));
+					}
+					break;
+				case Literal::OBJECT:
+					{
+						typeId = TypeDescription::GetTypeId(v.GetLiteral().GetTypeName());
+						const TypeDescription &td(TypeDescription::Get(typeId));
+						id = values[typeId].size();
+						char *object(alloc.Alloc(td.Size()));
+						td.Construct(object);
+						ReadObject(typeId, id, object, *v.GetLiteral().GetProperties());
+					}
+					break;
+			}
+			return values[typeId][id];
 		}
 	} else {
-		throw Error("use of undefined Animation " + v.GetIdentifier());
+		ReadDefinition(source.GetDefinition(v.GetIdentifier()));
+		return GetObject(typeId, v.GetIdentifier());
 	}
 }
 
-const vector<Value *> &Interpreter::GetValueArray(const Value &v) {
-	if (v.IsLiteral()) {
-		return v.GetLiteral().GetValues();
-	} else {
-		throw Error("identifier resolution not implemented for arrays of values");
-	}
-}
 
-const vector<PropertyList *> &Interpreter::GetPropertyListArray(const Value &v) {
-	if (v.IsLiteral()) {
-		return v.GetLiteral().GetPropertyLists();
-	} else {
-		throw Error("identifier resolution not implemented for arrays of property lists");
-	}
+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(alloc.Alloc(td.Size()));
+	td.Construct(object);
+	values[typeId].push_back(object);
+	parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, typeId, id)));
+	ReadObject(typeId, id, object, *dfn.GetProperties());
 }
 
-bool Interpreter::GetBoolean(const Value &v) {
-	if (v.IsLiteral()) {
-		return v.GetLiteral().GetBoolean();
-	} else {
-		throw Error("identifier resolution not implemented for booleans");
-	}
-}
 
-SDL_Surface *Interpreter::GetImage(const Value &v) {
-	if (v.IsLiteral()) {
-		// TODO: image lookup
-		return NULL;
-	} else {
-		throw Error("identifier resolution not implemented for images");
+void Interpreter::ReadObject(int typeId, int id, char *object, const PropertyList &props) {
+	const TypeDescription &td(TypeDescription::Get(typeId));
+	for (PropertyList::ConstIterator i(props.Begin()), end(props.End()); i != end; ++i) {
+		const FieldDescription &fd(td.GetField(i->first));
+		const TypeDescription &fieldType(TypeDescription::Get(fd.TypeId()));
+		if (CanLink(*i->second)) {
+			char *dest(object + fd.Offset());
+			if (fd.IsAggregate()) {
+				int arraySize(i->second->GetLiteral().ArraySize());
+				size_t memberSize = fd.IsReferenced() ? sizeof(char *) : fieldType.Size();
+				Array array;
+				array.typeId = fd.TypeId();
+				array.size = arraySize * memberSize;
+				array.data = alloc.Alloc(array.size);
+				array.ref = fd.IsReferenced();
+				arrays.push_back(array);
+				std::memset(array.data, 0, array.size);
+				char *iter = reinterpret_cast<char *>(array.data);
+				if (i->second->GetLiteral().GetType() == Literal::ARRAY_PROPS) {
+					const vector<PropertyList *> &list(i->second->GetLiteral().GetPropertyLists());
+					for (vector<PropertyList *>::const_iterator
+							j(list.begin()), end(list.end());
+							j != end; ++j, iter += memberSize) {
+						char *member;
+						if (fd.IsReferenced()) {
+							member = alloc.Alloc(fieldType.Size());
+							*reinterpret_cast<char **>(iter) = member;
+						} else {
+							member = iter;
+						}
+						fieldType.Construct(member);
+						ReadObject(fieldType.TypeId(), -1, member, **j);
+					}
+				} else if (i->second->GetLiteral().GetType() == Literal::ARRAY_VALUES) {
+					const vector<Value *> &list(i->second->GetLiteral().GetValues());
+					for (vector<Value *>::const_iterator j(list.begin()), end(list.end());
+							j != end; ++j, iter += memberSize) {
+						char *member;
+						if (fd.IsReferenced()) {
+							member = alloc.Alloc(fieldType.Size());
+							*reinterpret_cast<char **>(iter) = member;
+						} else {
+							member = iter;
+						}
+						fieldType.Construct(member);
+						ReadLiteral(fieldType.TypeId(), -1, member, (*j)->GetLiteral());
+					}
+				} else {
+					if (!fd.IsReferenced()) {
+						// TODO: implement inline identifier arrays
+						throw std::runtime_error("inline identifier arrays not implemented (yet)");
+					}
+					const vector<string> &list(i->second->GetLiteral().GetIdentifiers());
+					for (vector<string>::const_iterator j(list.begin()), end(list.end());
+							j != end; ++j, iter += memberSize) {
+						if (source.IsDefined(*j)) {
+							*reinterpret_cast<void **>(iter)
+									= GetObject(fd.TypeId(), *j);
+						} else {
+							Postpone(reinterpret_cast<char *>(array.data),
+									iter, *j, fd.TypeId(), false);
+						}
+					}
+				}
+				std::memcpy(dest, &array.data, sizeof(char *));
+				dest += sizeof(char *);
+				std::memcpy(dest, &arraySize, sizeof(int));
+			} 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")) {
+					src = reinterpret_cast<char *>(GetImage(src));
+				}
+				if (fd.IsReferenced()) {
+					std::memcpy(dest, &src, sizeof(char *));
+				} else {
+					std::memcpy(dest, src, fieldType.Size());
+				}
+			}
+		} else {
+			Postpone(object, object + fd.Offset(), i->second->GetIdentifier(), fd.TypeId(), !fd.IsReferenced(), fd.IsAggregate());
+		}
 	}
+	td.Load(object);
 }
 
-int Interpreter::GetNumber(const Value &v) {
-	if (v.IsLiteral()) {
-		return v.GetLiteral().GetNumber();
-	} else if (numbers.count(v.GetIdentifier())) {
-		return numbers[v.GetIdentifier()];
-	} else {
-		ReadDefinition(source.GetDefinition(v.GetIdentifier()));
-		if (numbers.count(v.GetIdentifier())) {
-			return numbers[v.GetIdentifier()];
+
+void Interpreter::ReadScript(const std::vector<ScriptToken *> &s, Script *script) {
+	std::map<string, int> labels;
+	int size(0);
+	for (vector<ScriptToken *>::const_iterator i(s.begin()), end(s.end()); i != end; ++i) {
+		if ((*i)->GetType() == ScriptToken::LABEL) {
+			if (labels.count((*i)->Label())) {
+				throw Error("duplicate label " + (*i)->Label());
+			} else {
+				labels[(*i)->Label()] = size;
+			}
+		} else if ((*i)->GetType() != ScriptToken::COMMAND) {
+			throw Error("unexpected script token");
+		}
+		size += sizeof(Script::Code);
+		const string &cmd((*i)->CommandName());
+		if (cmd == "move") {
+			++i;
+			if (i == end) {
+				throw Error("unexpected script end after move");
+			}
+			const string &reg((*i)->RegisterName());
+			if (reg.size() != 2) {
+				throw Error("invalid register name " + reg);
+			}
+			++i;
+			if (i == end) {
+				throw Error("unexpected script end after move");
+			}
+			if ((*i)->GetType() != ScriptToken::REGISTER) {
+				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);
+				}
+			}
+		} else if (cmd == "add") {
+			++i;
+			if (i == end) {
+				throw Error("unexpected script end after add");
+			}
+			const string &reg((*i)->RegisterName());
+			if (reg.size() != 2) {
+				throw Error("invalid register name " + reg);
+			}
+			++i;
+			if (i == end) {
+				throw Error("unexpected script end after add");
+			}
+			if ((*i)->GetType() != ScriptToken::REGISTER) {
+				switch (reg[0]) {
+					case 'i':
+						size += sizeof(int);
+						break;
+					case 'v':
+						size += sizeof(Vector<int>);
+						break;
+					default:
+						throw Error("expected register after add " + reg);
+				}
+			}
+		} else if (cmd == "mod") {
+			++i;
+			if (i == end) {
+				throw Error("unexpected script end after mod");
+			}
+			++i;
+			if (i == end) {
+				throw Error("unexpected script end after mod");
+			}
+			if ((*i)->GetType() != ScriptToken::REGISTER) {
+				size += sizeof(int);
+			}
+		} else if (cmd == "rand") {
+			++i;
+			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");
+			}
+			if ((*i)->GetType() != ScriptToken::REGISTER) {
+				size += sizeof(int);
+			}
+			++i;
+			if (i == end) {
+				throw Error("unexpected script end after cmp");
+			}
+			if ((*i)->GetType() != ScriptToken::REGISTER) {
+				size += sizeof(int);
+			}
+		} 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 {
-			throw Error("use of undefined Number " + v.GetIdentifier());
+			throw Error("unknown command " + cmd);
 		}
 	}
-}
 
-const PropertyList *Interpreter::GetPropertyList(const Value &v) {
-	if (v.IsLiteral()) {
-		return v.GetLiteral().GetProperties();
-	} else {
-		throw Error("identifier resolution not implemented for property lists");
-	}
-}
+	char *text(alloc.Alloc(size));
+	int cursor(0);
+	for (vector<ScriptToken *>::const_iterator i(s.begin()), end(s.end()); i != end; ++i) {
+		if ((*i)->GetType() == ScriptToken::LABEL) {
+			continue;
+		}
+		if ((*i)->GetType() != ScriptToken::COMMAND) {
+			throw Error("unexpected script token");
+		}
+		const string &cmd((*i)->CommandName());
+		if (cmd == "move") {
+			Script::Code &code(CreateScriptCode(Script::COMMAND_MOVE, text + cursor));
+			cursor += sizeof(Script::Code);
+			code.numParams = 2;
+			++i;
+			const string &reg((*i)->RegisterName());
+			switch (reg[0]) {
+				case 'a':
+					code.type = Script::TYPE_ADDRESS;
+					break;
+				case 'i':
+					code.type = Script::TYPE_INTEGER;
+					break;
+				case 'v':
+					code.type = Script::TYPE_VECTOR;
+					break;
+				default:
+					throw Error("invalid register " + reg);
+			}
+			int regnum(reg[1] - '0');
+			if (regnum < 0 || regnum > 6) {
+				throw Error("invalid register " + reg);
+			}
+			code.reg1 = regnum;
+			++i;
 
-Sprite *Interpreter::GetSprite(const Value &v) {
-	if (v.IsLiteral()) {
-		Sprite *s(new Sprite);
-		ReadSprite(*s, *v.GetLiteral().GetProperties());
-		return s;
-	} else if (sprites.count(v.GetIdentifier())) {
-		return sprites[v.GetIdentifier()];
-	} else {
-		ReadDefinition(source.GetDefinition(v.GetIdentifier()));
-		if (sprites.count(v.GetIdentifier())) {
-			return sprites[v.GetIdentifier()];
+			if ((*i)->GetType() == ScriptToken::REGISTER) {
+				string reg2((*i)->RegisterName());
+				if (reg[0] != reg2[0]) {
+					throw Error("mixed-type commands not allowed");
+				}
+				int reg2num(reg[1] - '0');
+				if (reg2num < 0 || reg2num > 6) {
+					throw Error("invalid register " + reg2);
+				}
+				code.reg2 = reg2num;
+			} else {
+				code.reg2 = 7;
+				switch (code.type) {
+					case Script::TYPE_ADDRESS:
+						ReadScriptAddress(**i, text + cursor);
+						cursor += sizeof(void *);
+						break;
+					case Script::TYPE_INTEGER:
+						ReadScriptInteger(**i, text + cursor);
+						cursor += sizeof(int);
+						break;
+					case Script::TYPE_VECTOR:
+						ReadScriptVector(**i, text + cursor);
+						cursor += sizeof(Vector<int>);
+						break;
+				}
+			}
+		} else if (cmd == "add") {
+			Script::Code &code(CreateScriptCode(Script::COMMAND_ADD, text + cursor));
+			cursor += sizeof(Script::Code);
+			code.numParams = 2;
+			++i;
+			const string &reg((*i)->RegisterName());
+			switch (reg[0]) {
+				case 'i':
+					code.type = Script::TYPE_INTEGER;
+					break;
+				case 'v':
+					code.type = Script::TYPE_VECTOR;
+					break;
+				default:
+					throw Error("invalid register " + reg);
+			}
+			int regnum(reg[1] - '0');
+			if (regnum < 0 || regnum > 6) {
+				throw Error("invalid register " + reg);
+			}
+			code.reg1 = regnum;
+			++i;
+
+			if ((*i)->GetType() == ScriptToken::REGISTER) {
+				string reg2((*i)->RegisterName());
+				if (reg[0] != reg2[0]) {
+					throw Error("mixed-type commands not allowed");
+				}
+				int reg2num(reg[1] - '0');
+				if (reg2num < 0 || reg2num > 6) {
+					throw Error("invalid register name " + reg2);
+				}
+				code.reg2 = reg2num;
+			} else {
+				code.reg2 = 7;
+				switch (code.type) {
+					case Script::TYPE_INTEGER:
+						ReadScriptInteger(**i, text + cursor);
+						cursor += sizeof(int);
+						break;
+					case Script::TYPE_VECTOR:
+						ReadScriptVector(**i, text + cursor);
+						cursor += sizeof(Vector<int>);
+						break;
+				}
+			}
+		} else if (cmd == "mod") {
+			Script::Code &code(CreateScriptCode(Script::COMMAND_MOD, text + cursor));
+			cursor += sizeof(Script::Code);
+			code.numParams = 2;
+			++i;
+			const string &reg((*i)->RegisterName());
+			if (reg[0] != 'i') {
+				throw Error("invalid register " + reg);
+			}
+			code.type = Script::TYPE_INTEGER;
+			int regnum(reg[1] - '0');
+			if (regnum < 0 || regnum > 6) {
+				throw Error("invalid register " + reg);
+			}
+			code.reg1 = regnum;
+			++i;
+
+			if ((*i)->GetType() == ScriptToken::REGISTER) {
+				string reg2((*i)->RegisterName());
+				if (reg[0] != reg2[0]) {
+					throw Error("mixed-type commands not allowed");
+				}
+				int reg2num(reg[1] - '0');
+				if (reg2num < 0 || reg2num > 6) {
+					throw Error("invalid register name " + reg2);
+				}
+				code.reg2 = reg2num;
+			} else {
+				code.reg2 = 7;
+				ReadScriptInteger(**i, text + cursor);
+				cursor += sizeof(int);
+			}
+		} else if (cmd == "rand") {
+			Script::Code &code(CreateScriptCode(Script::COMMAND_RAND, text + cursor));
+			cursor += sizeof(Script::Code);
+			code.numParams = 1;
+			++i;
+			const string &reg((*i)->RegisterName());
+			if (reg[0] != 'i') {
+				throw Error("invalid register " + reg);
+			}
+			code.type = Script::TYPE_INTEGER;
+			int regnum(reg[1] - '0');
+			if (regnum < 0 || regnum > 6) {
+				throw Error("invalid register " + reg);
+			}
+			code.reg1 = regnum;
+		} else if (cmd == "cmp") {
+			Script::Code &code(CreateScriptCode(Script::COMMAND_CMP, text + cursor));
+			cursor += sizeof(Script::Code);
+			code.numParams = 2;
+			++i;
+			const string &reg((*i)->RegisterName());
+			if (reg[0] != 'i') {
+				throw Error("invalid register " + reg);
+			}
+			code.type = Script::TYPE_INTEGER;
+			int regnum(reg[1] - '0');
+			if (regnum < 0 || regnum > 6) {
+				throw Error("invalid register " + reg);
+			}
+			code.reg1 = regnum;
+			++i;
+
+			if ((*i)->GetType() == ScriptToken::REGISTER) {
+				string reg2((*i)->RegisterName());
+				if (reg[0] != reg2[0]) {
+					throw Error("mixed-type commands not allowed");
+				}
+				int reg2num(reg[1] - '0');
+				if (reg2num < 0 || reg2num > 6) {
+					throw Error("invalid register name " + reg2);
+				}
+				code.reg2 = reg2num;
+			} else {
+				code.reg2 = 7;
+				ReadScriptInteger(**i, text + cursor);
+				cursor += sizeof(int);
+			}
+		} else if (cmd == "jmp") {
+			Script::Code &code(CreateScriptCode(Script::COMMAND_JMP, text + cursor));
+			cursor += sizeof(Script::Code);
+			code.numParams = 1;
+			++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") {
+			Script::Code &code(CreateScriptCode(Script::COMMAND_JEQ, text + cursor));
+			cursor += sizeof(Script::Code);
+			code.numParams = 1;
+			++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") {
+			Script::Code &code(CreateScriptCode(Script::COMMAND_JNE, text + cursor));
+			cursor += sizeof(Script::Code);
+			code.numParams = 1;
+			++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") {
+			Script::Code &code(CreateScriptCode(Script::COMMAND_JL, text + cursor));
+			cursor += sizeof(Script::Code);
+			code.numParams = 1;
+			++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") {
+			Script::Code &code(CreateScriptCode(Script::COMMAND_JLE, text + cursor));
+			cursor += sizeof(Script::Code);
+			code.numParams = 1;
+			++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") {
+			Script::Code &code(CreateScriptCode(Script::COMMAND_JG, text + cursor));
+			cursor += sizeof(Script::Code);
+			code.numParams = 1;
+			++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") {
+			Script::Code &code(CreateScriptCode(Script::COMMAND_JGE, text + cursor));
+			cursor += sizeof(Script::Code);
+			code.numParams = 1;
+			++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") {
+			Script::Code &code(CreateScriptCode(Script::COMMAND_SYSC, text + cursor));
+			cursor += sizeof(Script::Code);
+			code.numParams = 0;
 		} else {
-			throw Error("use of undefined Sprite " + v.GetIdentifier());
+			throw Error("unknown command " + cmd);
 		}
 	}
-}
 
-const char *Interpreter::GetString(const Value &v) {
-	if (v.IsLiteral()) {
-		return v.GetLiteral().GetString().c_str();
-	} else {
-		throw Error("identifier resolution not implemented for strings");
-	}
+	script->text = text;
+	script->textlen = size;
 }
 
-Vector<int> Interpreter::GetVector(const Value &v) {
-	if (v.IsLiteral()) {
-		return Vector<int>(v.GetLiteral().GetX(), v.GetLiteral().GetY());
-	} else {
-		throw Error("identifier resolution not implemented for vectors");
-	}
+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;
 }
 
+Script::Code &Interpreter::CreateScriptCode(Script::Command c, char *dest) {
+	Script::Code &code(*reinterpret_cast<Script::Code *>(dest));
+	code.command = c;
+	code.numParams = 0;
+	code.type = Script::TYPE_NONE;
+	code.reg1 = 7;
+	code.reg2 = 7;
+	return code;
+}
 
-void Interpreter::ReadObject(const Definition &dfn) {
-	if (dfn.TypeName() == "Hero") {
-		Hero *h(new Hero);
-		ReadHero(*h, *dfn.GetProperties());
-		heroes[dfn.Identifier()] = h;
-	} else if (dfn.TypeName() == "Monster") {
-		Monster *m(new Monster);
-		ReadMonster(*m, *dfn.GetProperties());
-		monsters[dfn.Identifier()] = m;
-	} else if (dfn.TypeName() == "Sprite") {
-		Sprite *s(new Sprite);
-		ReadSprite(*s, *dfn.GetProperties());
-		sprites[dfn.Identifier()] = s;
+void Interpreter::ReadScriptAddress(const ScriptToken &t, char *dest) {
+	if (t.GetType() != ScriptToken::IDENTIFIER) {
+		throw Error("expected identifier for address");
+	}
+	if (source.IsDefined(t.Identifier())) {
+		const ParsedDefinition &def(GetDefinition(t.Identifier()));
+		void *addr(GetObject(def.type, t.Identifier()));
+		*reinterpret_cast<void **>(dest) = addr;
 	} else {
-		throw Error("unhandled object: " + dfn.TypeName());
+		throw Error("postponing values in scripts not implemented");
 	}
 }
 
-
-void Interpreter::ReadComplexAnimation(ComplexAnimation &a, const PropertyList &props) {
-	for (PropertyList::ConstIterator i(props.Begin()), end(props.End()); i != end; ++i) {
-		if (i->first == "sprite") {
-			a.SetSprite(GetSprite(*i->second));
-		} else if (i->first == "frametime") {
-			a.SetFrameTime(GetNumber(*i->second));
-		} else if (i->first == "repeat") {
-			a.SetRepeat(GetBoolean(*i->second));
-		} else if (i->first == "frames") {
-			const vector<PropertyList *> &values(GetPropertyListArray(*i->second));
-			for (vector<PropertyList *>::const_iterator i(values.begin()), end(values.end()); i != end; ++i) {
-				ComplexAnimation::FrameProp frame;
-				ReadComplexAnimationFrame(frame, **i);
-				a.AddFrame(frame);
-			}
+void Interpreter::ReadScriptInteger(const ScriptToken &t, char *dest) {
+	if (t.GetType() == ScriptToken::IDENTIFIER) {
+		if (source.IsDefined(t.Identifier())) {
+			void *num(GetObject(TypeDescription::GetTypeId("Number"), t.Identifier()));
+			*reinterpret_cast<int *>(dest) = *reinterpret_cast<int *>(num);
 		} else {
-			throw Error("unknown ComplexAnimation property: " + i->first);
+			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::ReadComplexAnimationFrame(ComplexAnimation::FrameProp &f, const PropertyList &props) {
-	for (PropertyList::ConstIterator i(props.Begin()), end(props.End()); i != end; ++i) {
-		if (i->first == "column") {
-			f.col = GetNumber(*i->second);
-		} else if (i->first == "row") {
-			f.row = GetNumber(*i->second);
-		} else if (i->first == "disposition") {
-			f.disposition = GetVector(*i->second);
+void Interpreter::ReadScriptVector(const ScriptToken &t, char *dest) {
+	if (t.GetType() == ScriptToken::IDENTIFIER) {
+		if (source.IsDefined(t.Identifier())) {
+			void *vec(GetObject(TypeDescription::GetTypeId("Vector"), t.Identifier()));
+			*reinterpret_cast<Vector<int> *>(dest) = *reinterpret_cast<Vector<int> *>(vec);
 		} else {
-			throw Error("unknown ComplexAnimationFrame property: " + i->first);
+			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");
 	}
 }
 
-void Interpreter::ReadHero(Hero &h, const PropertyList &props) {
-	for (PropertyList::ConstIterator i(props.Begin()), end(props.End()); i != end; ++i) {
-		if (i->first == "name") {
-			h.SetName(GetString(*i->second));
-		} else if (i->first == "sprite") {
-			h.SetSprite(GetSprite(*i->second));
-		} else if (i->first == "level") {
-			h.SetLevel(GetNumber(*i->second));
-		} else if (i->first == "maxHealth") {
-			h.SetMaxHealth(GetNumber(*i->second));
-		} else if (i->first == "health") {
-			h.SetHealth(GetNumber(*i->second));
-		} else if (i->first == "maxMana") {
-			h.SetMaxMana(GetNumber(*i->second));
-		} else if (i->first == "mana") {
-			h.SetMana(GetNumber(*i->second));
-		} else if (i->first == "ip") {
-			h.SetIP(GetNumber(*i->second));
-		} else if (i->first == "stats") {
-			battle::Stats stats;
-			ReadStats(stats, *GetPropertyList(*i->second));
-			h.SetStats(stats);
-		} else if (i->first == "attackAnimation") {
-			h.SetAttackAnimation(GetAnimation(*i->second));
-		} else if (i->first == "spellAnimation") {
-			h.SetSpellAnimation(GetAnimation(*i->second));
-		} else if (i->first == "meleeAnimation") {
-			h.SetMeleeAnimation(GetAnimation(*i->second));
-		} else {
-			throw Error("unknown Hero property: " + i->first);
-		}
+
+SDL_Surface *Interpreter::GetImage(const string &path) {
+	std::map<string, SDL_Surface *>::const_iterator result(imageCache.find(path));
+	if (result != imageCache.end()) {
+		return result->second;
+	} else {
+		SDL_Surface *image(IMG_Load(path.c_str()));
+		imageCache.insert(make_pair(path, image));
+		return image;
 	}
 }
 
-void Interpreter::ReadMonster(Monster &m, const PropertyList &props) {
-	for (PropertyList::ConstIterator i(props.Begin()), end(props.End()); i != end; ++i) {
-		if (i->first == "name") {
-			m.SetName(GetString(*i->second));
-		} else if (i->first == "sprite") {
-			m.SetSprite(GetSprite(*i->second));
-		} else if (i->first == "level") {
-			m.SetLevel(GetNumber(*i->second));
-		} else if (i->first == "maxHealth") {
-			m.SetMaxHealth(GetNumber(*i->second));
-		} else if (i->first == "health") {
-			m.SetHealth(GetNumber(*i->second));
-		} else if (i->first == "maxMana") {
-			m.SetMaxMana(GetNumber(*i->second));
-		} else if (i->first == "mana") {
-			m.SetMana(GetNumber(*i->second));
-		} else if (i->first == "stats") {
-			battle::Stats stats;
-			ReadStats(stats, *GetPropertyList(*i->second));
-			m.SetStats(stats);
-		} else if (i->first == "attackAnimation") {
-			m.SetAttackAnimation(GetAnimation(*i->second));
-		} else {
-			throw Error("unknown Monster property: " + i->first);
+const string &Interpreter::FindImage(SDL_Surface *img) const {
+	for (std::map<string, SDL_Surface *>::const_iterator
+			i(imageCache.begin()), end(imageCache.end());
+			i != end; ++i) {
+		if (i->second == img) {
+			return i->first;
 		}
 	}
+	throw Error("unable to locate image");
 }
 
-void Interpreter::ReadSimpleAnimation(SimpleAnimation &a, const PropertyList &props) {
-	for (PropertyList::ConstIterator i(props.Begin()), end(props.End()); i != end; ++i) {
-		if (i->first == "sprite") {
-			a.SetSprite(GetSprite(*i->second));
-		} else if (i->first == "frametime") {
-			a.SetFrameTime(GetNumber(*i->second));
-		} else if (i->first == "repeat") {
-			a.SetRepeat(GetBoolean(*i->second));
-		} else if (i->first == "framecount") {
-			a.SetNumFrames(GetNumber(*i->second));
-		} else if (i->first == "col") {
-			a.SetCol(GetNumber(*i->second));
-		} else if (i->first == "row") {
-			a.SetRow(GetNumber(*i->second));
-		} else {
-			throw Error("unknown SimpleAnimation property: " + i->first);
-		}
-	}
+
+bool Interpreter::CanLink(const Value &v) const {
+	return v.IsLiteral() || source.IsDefined(v.GetIdentifier());
 }
 
-void Interpreter::ReadSprite(Sprite &s, const PropertyList &props) {
-	for (PropertyList::ConstIterator i(props.Begin()), end(props.End()); i != end; ++i) {
-		if (i->first == "image") {
-			s.SetSurface(GetImage(*i->second));
-		} else if (i->first == "size") {
-			s.SetSize(GetVector(*i->second));
-		} else if (i->first == "offset") {
-			s.SetOffset(GetVector(*i->second));
-		} else {
-			throw Error("unknown Sprite property: " + i->first);
-		}
-	}
+void Interpreter::Postpone(
+		char *object,
+		char *dest,
+		const std::string &identifier,
+		int type,
+		bool inlined,
+		bool aggregate) {
+	postponedDefinitions.push_back(
+			PostponedDefinition(object, dest, identifier, type, inlined, aggregate));
 }
 
-void Interpreter::ReadStats(Stats &s, const PropertyList &props) {
-	for (PropertyList::ConstIterator i(props.Begin()), end(props.End()); i != end; ++i) {
-		if (i->first == "atp") {
-			s.SetAttack(GetNumber(*i->second));
-		} else if (i->first == "dfp") {
-			s.SetDefense(GetNumber(*i->second));
-		} else if (i->first == "str") {
-			s.SetStrength(GetNumber(*i->second));
-		} else if (i->first == "agl") {
-			s.SetAgility(GetNumber(*i->second));
-		} else if (i->first == "int") {
-			s.SetIntelligence(GetNumber(*i->second));
-		} else if (i->first == "gut") {
-			s.SetGut(GetNumber(*i->second));
-		} else if (i->first == "mgr") {
-			s.SetMagicResistance(GetNumber(*i->second));
-		} else {
-			throw Error("unknown Stats property: " + i->first);
-		}
+
+void Interpreter::CreateTypeDescriptions() {
+	{
+		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::Create(COLOR_ID, "Color"));
+		td.SetDescription(
+				"A color in RGB format with an optional alpha channel.\n"
+				"Components range from 0 to 255.\n"
+				"Alpha defaults to 255 if omitted.");
+		td.SetSize(sizeof(Color));
+	}
+	{
+		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::Create(NUMBER_ID, "Number"));
+		td.SetDescription("A signed integer.");
+		td.SetSize(sizeof(int));
+	}
+	{
+		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(STRING_ID, 0);
+	}
+	{
+		Script s;
+		TypeDescription &td(TypeDescription::Create(SCRIPT_ID, "Script"));
+		td.SetDescription("Collection of commands that define a behaviour.");
+		td.SetSize(sizeof(Script));
+		td.AddField("text", FieldDescription(((char *)&s.text) - ((char *)&s), STRING_ID).SetAggregate());
+	}
+	{
+		TypeDescription &td(TypeDescription::Create(STRING_ID, "String"));
+		td.SetDescription("Some characters.");
+		td.SetSize(1);
+	}
+	{
+		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>));
 	}
 }