]> git.localhorst.tv Git - l2e.git/blobdiff - src/loader/Interpreter.cpp
lousy implementation of "array of identifiers" type
[l2e.git] / src / loader / Interpreter.cpp
index 1005c64db76e5bbbbe7f3aa800e9868e646a30cd..e64110dbf7175801cbd2cde01aea701ce874d4d1 100644 (file)
@@ -1,10 +1,3 @@
-/*
- * Interpreter.cpp
- *
- *  Created on: Aug 26, 2012
- *      Author: holy
- */
-
 #include "Interpreter.h"
 
 #include "ParsedSource.h"
@@ -14,7 +7,9 @@
 #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"
 using battle::Hero;
 using battle::Monster;
 using battle::PartyLayout;
-using battle::Stats;
 using common::Ikari;
 using common::Item;
+using common::Script;
 using common::Spell;
+using common::Stats;
 using common::TargetingMode;
 using graphics::Animation;
 using graphics::Color;
@@ -46,7 +42,6 @@ using graphics::SimpleAnimation;
 using graphics::Sprite;
 using geometry::Vector;
 using std::make_pair;
-using std::map;
 using std::set;
 using std::string;
 using std::vector;
@@ -54,23 +49,27 @@ 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 (map<string, SDL_Surface *>::const_iterator i(imageCache.begin()), end(imageCache.end()); i != end; ++i) {
+       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 (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);
-               }
+}
+
+
+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);
        }
 }
 
 
 void *Interpreter::GetObject(int typeId, const std::string &name) {
-       map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(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));
@@ -115,23 +114,22 @@ 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));
+       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());
        }
-       values[typeId].push_back(object);
-       parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, typeId, id)));
 }
 
 void Interpreter::ReadLiteral(int typeId, int id, char *object, const Literal &literal) {
        switch (literal.GetType()) {
                case Literal::ARRAY_VALUES:
-                       throw Error("named value arrays are not supported, sorry");
-                       break;
                case Literal::ARRAY_PROPS:
-                       throw Error("named property list arrays are not supported, sorry");
+               case Literal::ARRAY_IDENTS:
+                       throw Error("named arrays are not supported, sorry");
                        break;
                case Literal::BOOLEAN:
                        new (object) bool(literal.GetBoolean());
@@ -146,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';
@@ -155,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;
        }
 }
 
@@ -165,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);
@@ -175,17 +176,16 @@ void *Interpreter::GetObject(int typeId, const Value &v) {
                        int typeId(0), id(0);
                        switch (v.GetLiteral().GetType()) {
                                case Literal::ARRAY_VALUES:
-                                       throw Error("cannot copy value arrays, sorry");
-                                       break;
                                case Literal::ARRAY_PROPS:
-                                       throw Error("cannot copy property list arrays, sorry");
+                               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(new char[td.Size()]);
+                                               char *object(alloc.Alloc(td.Size()));
                                                values[typeId].push_back(new (object) bool(v.GetLiteral().GetBoolean()));
                                        }
                                        break;
@@ -194,7 +194,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;
@@ -203,7 +203,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;
@@ -211,17 +211,25 @@ 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");
+                                               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(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);
@@ -232,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;
@@ -241,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());
                                        }
@@ -260,11 +268,11 @@ 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());
        parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, typeId, id)));
+       ReadObject(typeId, id, object, *dfn.GetProperties());
 }
 
 
@@ -277,20 +285,35 @@ 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 *iter(aggregate);
+                               char *aggregate;
                                if (i->second->GetLiteral().GetType() == Literal::ARRAY_PROPS) {
+                                       aggregate = alloc.Alloc(fieldType.Size() * arraySize);
+                                       char *iter = aggregate;
                                        const vector<PropertyList *> &list(i->second->GetLiteral().GetPropertyLists());
                                        for (vector<PropertyList *>::const_iterator j(list.begin()), end(list.end()); j != end; ++j, iter += fieldType.Size()) {
                                                fieldType.Construct(iter);
                                                ReadObject(fieldType.TypeId(), -1, iter, **j);
                                        }
-                               } else {
+                               } else if (i->second->GetLiteral().GetType() == Literal::ARRAY_VALUES) {
+                                       aggregate = alloc.Alloc(fieldType.Size() * arraySize);
+                                       char *iter = aggregate;
                                        const vector<Value *> &list(i->second->GetLiteral().GetValues());
                                        for (vector<Value *>::const_iterator j(list.begin()), end(list.end()); j != end; ++j, iter += fieldType.Size()) {
                                                fieldType.Construct(iter);
                                                ReadLiteral(fieldType.TypeId(), -1, iter, (*j)->GetLiteral());
                                        }
+                               } else {
+                                       aggregate = alloc.Alloc(sizeof(char *) * arraySize);
+                                       char *iter = aggregate;
+                                       const vector<string> &list(i->second->GetLiteral().GetIdentifiers());
+                                       for (vector<string>::const_iterator j(list.begin()), end(list.end()); j != end; ++j, iter += sizeof(void *)) {
+                                               if (source.IsDefined(*j)) {
+                                                       *reinterpret_cast<void **>(iter)
+                                                                       = GetObject(fd.TypeId(), *j);
+                                               } else {
+                                                       Postpone(typeId, id, fd.Offset() + (iter - aggregate), *j, fd.TypeId(), false);
+                                               }
+                                       }
                                }
                                if (fd.IsReferenced()) {
                                        std::memcpy(dest, &aggregate, sizeof(char *));
@@ -299,6 +322,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")) {
@@ -311,14 +341,497 @@ void Interpreter::ReadObject(int typeId, int id, char *object, const PropertyLis
                                }
                        }
                } else {
-                       Postpone(typeId, id, fd.Offset(), i->second->GetIdentifier(), fd.TypeId());
+                       Postpone(typeId, id, fd.Offset(), i->second->GetIdentifier(), fd.TypeId(), !fd.IsReferenced());
                }
        }
+       td.Load(object);
+}
+
+
+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("unknown command " + cmd);
+               }
+       }
+
+       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;
+
+                       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("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;
+}
+
+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::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("postponing values in scripts not implemented");
+       }
+}
+
+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("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, 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("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) {
-       map<string, SDL_Surface *>::const_iterator result(imageCache.find(path));
+       std::map<string, SDL_Surface *>::const_iterator result(imageCache.find(path));
        if (result != imageCache.end()) {
                return result->second;
        } else {
@@ -333,43 +846,57 @@ bool Interpreter::CanLink(const Value &v) const {
        return v.IsLiteral() || source.IsDefined(v.GetIdentifier());
 }
 
-void Interpreter::Postpone(int type, int id, std::ptrdiff_t offset, const std::string &identifier, int linkedType) {
-       char *str(new char[identifier.size() + 1]);
+void Interpreter::Postpone(int type, int id, std::ptrdiff_t offset, const std::string &identifier, int linkedType, bool inlined) {
+       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));
+       postponedDefinitions.push_back(PostponedDefinition(type, id, offset, str, linkedType, inlined));
 }
 
 
 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"
+                               "Alpha defaults to 255 if omitted.");
                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::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>));
        }
 }