]> git.localhorst.tv Git - l2e.git/blobdiff - src/loader/Interpreter.cpp
simplified definition postponing
[l2e.git] / src / loader / Interpreter.cpp
index 7c26aaafded4ae6ad86929521e1bc5ebc9fe3e26..8b54fc177913de18a1266f885cc8e959b6eb4eef 100644 (file)
@@ -1,24 +1,22 @@
-/*
- * 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"
 
 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;
 using graphics::Font;
 using graphics::Frame;
 using graphics::Gauge;
 using graphics::ComplexAnimation;
 using graphics::SimpleAnimation;
 using graphics::Sprite;
-using geometry::Vector;
+using math::Vector;
 using std::make_pair;
-using std::map;
 using std::set;
 using std::string;
 using std::vector;
@@ -51,261 +50,41 @@ using std::vector;
 namespace loader {
 
 Interpreter::~Interpreter() {
-       for (vector<ComplexAnimation *>::const_iterator i(complexAnimations.begin()), end(complexAnimations.end()); i != end; ++i) {
-               delete *i;
-       }
-       for (vector<Font *>::const_iterator i(fonts.begin()), end(fonts.end()); i != end; ++i) {
-               delete *i;
-       }
-       for (vector<Frame *>::const_iterator i(frames.begin()), end(frames.end()); i != end; ++i) {
-               delete *i;
-       }
-       for (vector<Gauge *>::const_iterator i(gauges.begin()), end(gauges.end()); i != end; ++i) {
-               delete *i;
-       }
-       for (vector<Hero *>::const_iterator i(heroes.begin()), end(heroes.end()); i != end; ++i) {
-               delete *i;
-       }
-       for (vector<Ikari *>::const_iterator i(ikaris.begin()), end(ikaris.end()); i != end; ++i) {
-               delete *i;
-       }
-       for (vector<SDL_Surface *>::const_iterator i(images.begin()), end(images.end()); i != end; ++i) {
-               SDL_FreeSurface(*i);
-       }
-       for (vector<Item *>::const_iterator i(items.begin()), end(items.end()); i != end; ++i) {
-               delete *i;
-       }
-       for (vector<Monster *>::const_iterator i(monsters.begin()), end(monsters.end()); i != end; ++i) {
-               delete *i;
-       }
-       for (vector<PartyLayout *>::const_iterator i(partyLayouts.begin()), end(partyLayouts.end()); i != end; ++i) {
-               delete *i;
-       }
-       for (vector<SimpleAnimation *>::const_iterator i(simpleAnimations.begin()), end(simpleAnimations.end()); i != end; ++i) {
-               delete *i;
-       }
-       for (vector<Spell *>::const_iterator i(spells.begin()), end(spells.end()); i != end; ++i) {
-               delete *i;
-       }
-       for (vector<Sprite *>::const_iterator i(sprites.begin()), end(sprites.end()); i != end; ++i) {
-               delete *i;
-       }
-       for (vector<const char *>::const_iterator i(strings.begin()), end(strings.end()); i != end; ++i) {
-               delete *i;
-       }
-       for (vector<TargetingMode *>::const_iterator i(targetingModes.begin()), end(targetingModes.end()); i != end; ++i) {
-               delete *i;
-       }
-}
-
-
-Animation *Interpreter::GetAnimation(const std::string &name) {
-       map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
-       if (i != parsedDefinitions.end()) {
-               if (i->second.type == COMPLEX_ANIMATION) {
-                       return complexAnimations[i->second.index];
-               } else if (i->second.type == SIMPLE_ANIMATION) {
-                       return simpleAnimations[i->second.index];
-               } else {
-                       throw Error("cannot cast " + i->second.dfn->TypeName() + " to Animation");
-               }
-       } else {
-               throw Error("access to undefined Animation " + name);
-       }
-}
-
-bool Interpreter::GetBoolean(const std::string &name) const {
-       map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
-       if (i != parsedDefinitions.end()) {
-               if (i->second.type == BOOLEAN) {
-                       return booleans[i->second.index];
-               } else {
-                       throw Error("cannot cast " + i->second.dfn->TypeName() + " to Boolean");
-               }
-       } else {
-               throw Error("access to undefined Boolean " + name);
-       }
-}
-
-Font *Interpreter::GetFont(const std::string &name) {
-       map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
-       if (i != parsedDefinitions.end()) {
-               if (i->second.type == FONT) {
-                       return fonts[i->second.index];
-               } else {
-                       throw Error("cannot cast " + i->second.dfn->TypeName() + " to Font");
-               }
-       } else {
-               throw Error("access to undefined Font " + name);
-       }
-}
-
-Frame *Interpreter::GetFrame(const std::string &name) {
-       map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
-       if (i != parsedDefinitions.end()) {
-               if (i->second.type == FRAME) {
-                       return frames[i->second.index];
-               } else {
-                       throw Error("cannot cast " + i->second.dfn->TypeName() + " to Frame");
-               }
-       } else {
-               throw Error("access to undefined Frame " + name);
+       for (std::map<string, SDL_Surface *>::const_iterator i(imageCache.begin()), end(imageCache.end()); i != end; ++i) {
+               SDL_FreeSurface(i->second);
        }
 }
 
-Gauge *Interpreter::GetGauge(const std::string &name) {
-       map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
-       if (i != parsedDefinitions.end()) {
-               if (i->second.type == GAUGE) {
-                       return gauges[i->second.index];
-               } else {
-                       throw Error("cannot cast " + i->second.dfn->TypeName() + " to Gauge");
-               }
-       } else {
-               throw Error("access to undefined Gauge " + name);
-       }
-}
 
-Hero *Interpreter::GetHero(const std::string &name) {
-       map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
+const Interpreter::ParsedDefinition &Interpreter::GetDefinition(const string &identifier) {
+       std::map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(identifier));
        if (i != parsedDefinitions.end()) {
-               if (i->second.type == HERO) {
-                       return heroes[i->second.index];
-               } else {
-                       throw Error("cannot cast " + i->second.dfn->TypeName() + " to Hero");
-               }
+               return i->second;
+       } else if (source.IsDefined(identifier)) {
+               ReadDefinition(source.GetDefinition(identifier));
+               return parsedDefinitions.at(identifier);
        } else {
-               throw Error("access to undefined Hero " + name);
+               throw Error("access to undefined object " + identifier);
        }
 }
 
-Ikari *Interpreter::GetIkari(const std::string &name) {
-       map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
-       if (i != parsedDefinitions.end()) {
-               if (i->second.type == IKARI) {
-                       return ikaris[i->second.index];
-               } else {
-                       throw Error("cannot cast " + i->second.dfn->TypeName() + " to Ikari");
-               }
-       } else {
-               throw Error("access to undefined Ikari " + name);
-       }
-}
 
-Item *Interpreter::GetItem(const std::string &name) {
-       map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
+void *Interpreter::GetObject(int typeId, const std::string &name) {
+       std::map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
        if (i != parsedDefinitions.end()) {
-               if (i->second.type == ITEM) {
-                       return items[i->second.index];
+               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 " + i->second.dfn->TypeName() + " to Item");
+                       throw Error("cannot cast " + actual.TypeName() + " to " + requested.TypeName());
                }
        } else {
-               throw Error("access to undefined Item " + name);
-       }
-}
-
-Monster *Interpreter::GetMonster(const std::string &name) {
-       map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
-       if (i != parsedDefinitions.end()) {
-               if (i->second.type == MONSTER) {
-                       return monsters[i->second.index];
-               } else {
-                       throw Error("cannot cast " + i->second.dfn->TypeName() + " to Monster");
-               }
-       } else {
-               throw Error("access to undefined Monster " + name);
-       }
-}
-
-int Interpreter::GetNumber(const std::string &name) const {
-       map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
-       if (i != parsedDefinitions.end()) {
-               if (i->second.type == NUMBER) {
-                       return numbers[i->second.index];
-               } else {
-                       throw Error("cannot cast " + i->second.dfn->TypeName() + " to Number");
-               }
-       } else {
-               throw Error("access to undefined Number " + name);
-       }
-}
-
-PartyLayout *Interpreter::GetPartyLayout(const std::string &name) {
-       map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
-       if (i != parsedDefinitions.end()) {
-               if (i->second.type == PARTY_LAYOUT) {
-                       return partyLayouts[i->second.index];
-               } else {
-                       throw Error("cannot cast " + i->second.dfn->TypeName() + " to PartyLayout");
-               }
-       } else {
-               throw Error("access to undefined PartyLayout " + name);
-       }
-}
-
-Spell *Interpreter::GetSpell(const std::string &name) {
-       map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
-       if (i != parsedDefinitions.end()) {
-               if (i->second.type == SPELL) {
-                       return spells[i->second.index];
-               } else {
-                       throw Error("cannot cast " + i->second.dfn->TypeName() + " to Spell");
-               }
-       } else {
-               throw Error("access to undefined Spell " + name);
-       }
-}
-
-Sprite *Interpreter::GetSprite(const std::string &name) {
-       map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
-       if (i != parsedDefinitions.end()) {
-               if (i->second.type == SPRITE) {
-                       return sprites[i->second.index];
-               } else {
-                       throw Error("cannot cast " + i->second.dfn->TypeName() + " to Sprite");
-               }
-       } else {
-               throw Error("access to undefined Sprite " + name);
-       }
-}
-
-const char *Interpreter::GetString(const std::string &name) const {
-       map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
-       if (i != parsedDefinitions.end()) {
-               if (i->second.type == STRING) {
-                       return strings[i->second.index];
-               } else {
-                       throw Error("cannot cast " + i->second.dfn->TypeName() + " to String");
-               }
-       } else {
-               throw Error("access to undefined String " + name);
-       }
-}
-
-TargetingMode *Interpreter::GetTargetingMode(const std::string &name) {
-       map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
-       if (i != parsedDefinitions.end()) {
-               if (i->second.type == TARGETING_MODE) {
-                       return targetingModes[i->second.index];
-               } else {
-                       throw Error("cannot cast " + i->second.dfn->TypeName() + " to TargetingMode");
-               }
-       } else {
-               throw Error("access to undefined TargetingMode " + name);
-       }
-}
-
-Vector<int> Interpreter::GetVector(const std::string &name) const {
-       map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
-       if (i != parsedDefinitions.end()) {
-               if (i->second.type == VECTOR) {
-                       return vectors[i->second.index];
-               } else {
-                       throw Error("cannot cast " + i->second.dfn->TypeName() + " to Vector");
-               }
-       } else {
-               throw Error("access to undefined Vector " + name);
+               throw Error("access to undefined object " + name);
        }
 }
 
@@ -328,638 +107,817 @@ 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:
-                       valueArrays.push_back(dfn.GetLiteral()->GetValues());
-                       parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, VALUE_ARRAY, valueArrays.size() - 1)));
-                       break;
                case Literal::ARRAY_PROPS:
-                       propertyListArrays.push_back(dfn.GetLiteral()->GetPropertyLists());
-                       parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, PROPERTY_LIST_ARRAY, propertyListArrays.size() - 1)));
+               case Literal::ARRAY_IDENTS:
+                       throw Error("named arrays are not supported, sorry");
                        break;
                case Literal::BOOLEAN:
-                       booleans.push_back(dfn.GetLiteral()->GetBoolean());
-                       parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, BOOLEAN, booleans.size() - 1)));
+                       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.push_back(dfn.GetLiteral()->GetNumber());
-                       parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, NUMBER, numbers.size() - 1)));
+                       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:
-                       {
-                               char *str(new char[dfn.GetLiteral()->GetString().size() + 1]);
-                               std::memcpy(str, dfn.GetLiteral()->GetString().c_str(), dfn.GetLiteral()->GetString().size());
-                               str[dfn.GetLiteral()->GetString().size()] = '\0';
-                               strings.push_back(str);
-                       }
-                       parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, STRING, strings.size() - 1)));
+                       std::memcpy(object, literal.GetString().c_str(), literal.GetString().size());
+                       object[literal.GetString().size()] = '\0';
                        break;
                case Literal::VECTOR:
-                       vectors.push_back(Vector<int>(dfn.GetLiteral()->GetX(), dfn.GetLiteral()->GetY()));
-                       parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, VECTOR, vectors.size() - 1)));
+                       new (object) Vector<int>(literal.GetX(), literal.GetY());
                        break;
                case Literal::OBJECT:
-                       ReadObject(dfn);
-                       break;
+                       throw Error("illogical branch: read literal object as non-object literal");
        }
 }
 
-Animation *Interpreter::GetAnimation(const Value &v) {
-       if (v.IsLiteral()) {
-               if (v.GetLiteral().GetTypeName() == "ComplexAnimation") {
-                       ComplexAnimation *a(new ComplexAnimation);
-                       ReadComplexAnimation(*a, *v.GetLiteral().GetProperties());
-                       complexAnimations.push_back(a);
-                       return a;
-               } else {
-                       SimpleAnimation *a(new SimpleAnimation);
-                       ReadSimpleAnimation(*a, *v.GetLiteral().GetProperties());
-                       simpleAnimations.push_back(a);
-                       return a;
-               }
-       } else {
-               ReadDefinition(source.GetDefinition(v.GetIdentifier()));
-               return GetAnimation(v.GetIdentifier());
-       }
-}
 
-bool Interpreter::GetBoolean(const Value &v) {
+void *Interpreter::GetObject(int typeId, const Value &v) {
        if (v.IsLiteral()) {
-               return v.GetLiteral().GetBoolean();
-       } else {
-               ReadDefinition(source.GetDefinition(v.GetIdentifier()));
-               return GetBoolean(v.GetIdentifier());
-       }
-}
-
-Font *Interpreter::GetFont(const Value &v) {
-       if (v.IsLiteral()) {
-               Font *f(new Font);
-               ReadFont(*f, *v.GetLiteral().GetProperties());
-               return f;
-       } else {
-               ReadDefinition(source.GetDefinition(v.GetIdentifier()));
-               return GetFont(v.GetIdentifier());
-       }
-}
-
-Frame *Interpreter::GetFrame(const Value &v) {
-       if (v.IsLiteral()) {
-               Frame *f(new Frame);
-               ReadFrame(*f, *v.GetLiteral().GetProperties());
-               return f;
-       } else {
-               ReadDefinition(source.GetDefinition(v.GetIdentifier()));
-               return GetFrame(v.GetIdentifier());
-       }
-}
-
-Gauge *Interpreter::GetGauge(const Value &v) {
-       if (v.IsLiteral()) {
-               Gauge *g(new Gauge);
-               ReadGauge(*g, *v.GetLiteral().GetProperties());
-               return g;
-       } else {
-               ReadDefinition(source.GetDefinition(v.GetIdentifier()));
-               return GetGauge(v.GetIdentifier());
-       }
-}
-
-Hero *Interpreter::GetHero(const Value &v) {
-       if (v.IsLiteral()) {
-               Hero *h(new Hero);
-               ReadHero(*h, *v.GetLiteral().GetProperties());
-               return h;
-       } else {
-               ReadDefinition(source.GetDefinition(v.GetIdentifier()));
-               return GetHero(v.GetIdentifier());
-       }
-}
-
-Ikari *Interpreter::GetIkari(const Value &v) {
-       if (v.IsLiteral()) {
-               Ikari *i(new Ikari);
-               ReadIkari(*i, *v.GetLiteral().GetProperties());
-               return i;
-       } else {
-               ReadDefinition(source.GetDefinition(v.GetIdentifier()));
-               return GetIkari(v.GetIdentifier());
-       }
-}
-
-SDL_Surface *Interpreter::GetImage(const Value &v) {
-       const char *file(GetString(v));
-       SDL_Surface *image(IMG_Load(file));
-       images.push_back(image);
-       return image;
-}
-
-Item *Interpreter::GetItem(const Value &v) {
-       if (v.IsLiteral()) {
-               Item *i(new Item);
-               ReadItem(*i, *v.GetLiteral().GetProperties());
-               return i;
+               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 {
+                       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 {
                ReadDefinition(source.GetDefinition(v.GetIdentifier()));
-               return GetItem(v.GetIdentifier());
+               return GetObject(typeId, v.GetIdentifier());
        }
 }
 
-int Interpreter::GetNumber(const Value &v) {
-       if (v.IsLiteral()) {
-               return v.GetLiteral().GetNumber();
-       } else {
-               ReadDefinition(source.GetDefinition(v.GetIdentifier()));
-               return GetNumber(v.GetIdentifier());
-       }
-}
 
-PartyLayout *Interpreter::GetPartyLayout(const Value &v) {
-       if (v.IsLiteral()) {
-               PartyLayout *l(new PartyLayout);
-               ReadPartyLayout(*l, *v.GetLiteral().GetProperties());
-               return l;
-       } else {
-               ReadDefinition(source.GetDefinition(v.GetIdentifier()));
-               return GetPartyLayout(v.GetIdentifier());
-       }
+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());
 }
 
-const PropertyList *Interpreter::GetPropertyList(const Value &v) {
-       if (v.IsLiteral()) {
-               return v.GetLiteral().GetProperties();
-       } else {
-               throw Error("cannot reference property lists");
-       }
-}
 
-const vector<PropertyList *> &Interpreter::GetPropertyListArray(const Value &v) {
-       if (v.IsLiteral()) {
-               return v.GetLiteral().GetPropertyLists();
-       } else {
-               throw Error("cannot reference property list arrays");
+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();
+                               char *aggregate = alloc.Alloc(arraySize * memberSize);
+                               char *iter = aggregate;
+                               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(iter, *j, fd.TypeId(), false);
+                                               }
+                                       }
+                               }
+                               std::memcpy(dest, &aggregate, 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, i->second->GetIdentifier(), fd.TypeId(), !fd.IsReferenced(), fd.IsAggregate());
+               }
        }
+       td.Load(object);
 }
 
-Spell *Interpreter::GetSpell(const Value &v) {
-       if (v.IsLiteral()) {
-               Spell *s(new Spell);
-               ReadSpell(*s, *v.GetLiteral().GetProperties());
-               return s;
-       } else {
-               ReadDefinition(source.GetDefinition(v.GetIdentifier()));
-               return GetSpell(v.GetIdentifier());
-       }
-}
 
-Sprite *Interpreter::GetSprite(const Value &v) {
-       if (v.IsLiteral()) {
-               Sprite *s(new Sprite);
-               ReadSprite(*s, *v.GetLiteral().GetProperties());
-               return s;
-       } else {
-               ReadDefinition(source.GetDefinition(v.GetIdentifier()));
-               return GetSprite(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("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);
+               }
        }
-}
 
-const char *Interpreter::GetString(const Value &v) {
-       if (v.IsLiteral()) {
-               return v.GetLiteral().GetString().c_str();
-       } else {
-               ReadDefinition(source.GetDefinition(v.GetIdentifier()));
-               return GetString(v.GetIdentifier());
-       }
+       script->text = text;
+       script->textlen = size;
 }
 
-TargetingMode *Interpreter::GetTargetingMode(const Value &v) {
-       if (v.IsLiteral()) {
-               TargetingMode *t(new TargetingMode);
-               ReadTargetingMode(*t, *v.GetLiteral().GetProperties());
-               return t;
-       } else {
-               ReadDefinition(source.GetDefinition(v.GetIdentifier()));
-               return GetTargetingMode(v.GetIdentifier());
-       }
+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;
 }
 
-Vector<int> Interpreter::GetVector(const Value &v) {
-       if (v.IsLiteral()) {
-               return Vector<int>(v.GetLiteral().GetX(), v.GetLiteral().GetY());
-       } else {
-               ReadDefinition(source.GetDefinition(v.GetIdentifier()));
-               return GetVector(v.GetIdentifier());
-       }
+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;
 }
 
-const vector<Value *> &Interpreter::GetValueArray(const Value &v) {
-       if (v.IsLiteral()) {
-               return v.GetLiteral().GetValues();
-       } else {
-               throw Error("cannot reference value arrays");
+void Interpreter::ReadScriptAddress(const ScriptToken &t, char *dest) {
+       if (t.GetType() != ScriptToken::IDENTIFIER) {
+               throw Error("expected identifier for address");
        }
-}
-
-
-void Interpreter::ReadObject(const Definition &dfn) {
-       if (dfn.TypeName() == "ComplexAnimation") {
-               ComplexAnimation *animation(new ComplexAnimation);
-               int index(complexAnimations.size());
-               complexAnimations.push_back(animation);
-               ReadComplexAnimation(*animation, *dfn.GetProperties());
-               parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, COMPLEX_ANIMATION, index)));
-       } else if (dfn.TypeName() == "Font") {
-               Font *font(new Font);
-               int index(fonts.size());
-               fonts.push_back(font);
-               ReadFont(*font, *dfn.GetProperties());
-               parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, FONT, index)));
-       } else if (dfn.TypeName() == "Frame") {
-               Frame *frame(new Frame);
-               int index(frames.size());
-               frames.push_back(frame);
-               ReadFrame(*frame, *dfn.GetProperties());
-               parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, FRAME, index)));
-       } else if (dfn.TypeName() == "Gauge") {
-               Gauge *gauge(new Gauge);
-               int index(gauges.size());
-               gauges.push_back(gauge);
-               ReadGauge(*gauge, *dfn.GetProperties());
-               parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, GAUGE, index)));
-       } else if (dfn.TypeName() == "Hero") {
-               Hero *hero(new Hero);
-               int index(heroes.size());
-               heroes.push_back(hero);
-               ReadHero(*hero, *dfn.GetProperties());
-               parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, HERO, index)));
-       } else if (dfn.TypeName() == "Ikari") {
-               Ikari *ikari(new Ikari);
-               int index(ikaris.size());
-               ikaris.push_back(ikari);
-               ReadIkari(*ikari, *dfn.GetProperties());
-               parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, IKARI, index)));
-       } else if (dfn.TypeName() == "Item") {
-               Item *item(new Item);
-               int index(items.size());
-               items.push_back(item);
-               ReadItem(*item, *dfn.GetProperties());
-               parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, ITEM, index)));
-       } else if (dfn.TypeName() == "Monster") {
-               Monster *monster(new Monster);
-               int index(monsters.size());
-               monsters.push_back(monster);
-               ReadMonster(*monster, *dfn.GetProperties());
-               parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, MONSTER, index)));
-       } else if (dfn.TypeName() == "PartyLayout") {
-               PartyLayout *layout(new PartyLayout);
-               int index(partyLayouts.size());
-               partyLayouts.push_back(layout);
-               ReadPartyLayout(*layout, *dfn.GetProperties());
-               parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, PARTY_LAYOUT, index)));
-       } else if (dfn.TypeName() == "SimpleAnimation") {
-               SimpleAnimation *animation(new SimpleAnimation);
-               int index(simpleAnimations.size());
-               simpleAnimations.push_back(animation);
-               ReadSimpleAnimation(*animation, *dfn.GetProperties());
-               parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, SIMPLE_ANIMATION, index)));
-       } else if (dfn.TypeName() == "Spell") {
-               Spell *spell(new Spell);
-               int index(spells.size());
-               spells.push_back(spell);
-               ReadSpell(*spell, *dfn.GetProperties());
-               parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, SPELL, index)));
-       } else if (dfn.TypeName() == "Sprite") {
-               Sprite *sprite(new Sprite);
-               int index(sprites.size());
-               sprites.push_back(sprite);
-               ReadSprite(*sprite, *dfn.GetProperties());
-               parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, SPRITE, index)));
-       } else if (dfn.TypeName() == "TargetingMode") {
-               TargetingMode *mode(new TargetingMode);
-               int index(targetingModes.size());
-               targetingModes.push_back(mode);
-               ReadTargetingMode(*mode, *dfn.GetProperties());
-               parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, TARGETING_MODE, index)));
+       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 type: " + 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::ReadFont(Font &f, const PropertyList &props) {
-       for (PropertyList::ConstIterator i(props.Begin()), end(props.End()); i != end; ++i) {
-               if (i->first == "sprite") {
-                       f.SetSprite(GetSprite(*i->second));
-               } else if (i->first == "columnoffset") {
-                       f.SetColOffset(GetNumber(*i->second));
-               } else if (i->first == "rowoffset") {
-                       f.SetRowOffset(GetNumber(*i->second));
-               } else {
-                       throw Error("unknown Font property: " + i->first);
-               }
-       }
-}
 
-void Interpreter::ReadFrame(Frame &f, const PropertyList &props) {
-       for (PropertyList::ConstIterator i(props.Begin()), end(props.End()); i != end; ++i) {
-               if (i->first == "image") {
-                       f.SetSurface(GetImage(*i->second));
-               } else if (i->first == "border") {
-                       f.SetBorderSize(GetVector(*i->second));
-               } else if (i->first == "repeat") {
-                       f.SetRepeatSize(GetVector(*i->second));
-               } else if (i->first == "offset") {
-                       f.SetOffset(GetVector(*i->second));
-               } else {
-                       throw Error("unknown Frame 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::ReadGauge(Gauge &g, const PropertyList &props) {
-       for (PropertyList::ConstIterator i(props.Begin()), end(props.End()); i != end; ++i) {
-               if (i->first == "image") {
-                       g.SetSurface(GetImage(*i->second));
-               } else if (i->first == "full") {
-                       g.SetFullOffset(GetVector(*i->second));
-               } else if (i->first == "empty") {
-                       g.SetEmptyOffset(GetVector(*i->second));
-               } else if (i->first == "height") {
-                       g.SetHeight(GetNumber(*i->second));
-               } else if (i->first == "start") {
-                       g.SetStartWidth(GetNumber(*i->second));
-               } else if (i->first == "repeat") {
-                       g.SetRepeatWidth(GetNumber(*i->second));
-               } else if (i->first == "end") {
-                       g.SetEndWidth(GetNumber(*i->second));
-               } else {
-                       throw Error("unknown Gauge property: " + i->first);
-               }
-       }
-}
 
-void Interpreter::ReadIkari(Ikari &ikari, const PropertyList &props) {
-       for (PropertyList::ConstIterator i(props.Begin()), end(props.End()); i != end; ++i) {
-               if (i->first == "name") {
-                       ikari.SetName(GetString(*i->second));
-               } else if (i->first == "cost") {
-                       ikari.SetCost(GetNumber(*i->second));
-               } else if (i->first == "targets") {
-                       ikari.GetTargetingMode() = *GetTargetingMode(*i->second);
-               } else if (i->first == "magical") {
-                       if (GetBoolean(*i->second)) {
-                               ikari.SetMagical();
-                       }
-               } else if (i->first == "physical") {
-                       if (GetBoolean(*i->second)) {
-                               ikari.SetPhysical();
-                       }
-               } else {
-                       throw Error("unknown Ikari property: " + i->first);
-               }
-       }
+bool Interpreter::CanLink(const Value &v) const {
+       return v.IsLiteral() || source.IsDefined(v.GetIdentifier());
 }
 
-void Interpreter::ReadItem(Item &item, const PropertyList &props) {
-       for (PropertyList::ConstIterator i(props.Begin()), end(props.End()); i != end; ++i) {
-               if (i->first == "name") {
-                       item.SetName(GetString(*i->second));
-               } else if (i->first == "menuicon") {
-                       item.SetMenuIcon(GetSprite(*i->second));
-               } else if (i->first == "battle") {
-                       if (GetBoolean(*i->second)) {
-                               item.SetUsableInBattle();
-                       }
-               } else if (i->first == "targets") {
-                       item.GetTargetingMode() = *GetTargetingMode(*i->second);
-               } else if (i->first == "ikari") {
-                       item.SetIkari(GetIkari(*i->second));
-               } else if (i->first == "attackanimation") {
-                       item.SetAttackAnimation(GetAnimation(*i->second));
-               } else {
-                       throw Error("unknown Item property: " + i->first);
-               }
-       }
+void Interpreter::Postpone(
+               char *dest,
+               const std::string &identifier,
+               int type,
+               bool inlined,
+               bool aggregate) {
+       char *str(alloc.Alloc(identifier.size() + 1));
+       std::memcpy(str, identifier.c_str(), identifier.size());
+       str[identifier.size()] = '\0';
+       postponedDefinitions.push_back(
+                       PostponedDefinition(dest, str, type, inlined, aggregate));
 }
 
-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);
-               }
-       }
-}
 
-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 if (i->first == "meleeAnimation") {
-                       m.SetMeleeAnimation(GetAnimation(*i->second));
-               } else {
-                       throw Error("unknown Monster 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));
        }
-}
-
-void Interpreter::ReadPartyLayout(PartyLayout &p, const PropertyList &props) {
-       for (PropertyList::ConstIterator i(props.Begin()), end(props.End()); i != end; ++i) {
-               if (i->first == "positions") {
-                       const vector<Value *> &positions(GetValueArray(*i->second));
-                       for (vector<Value *>::const_iterator j(positions.begin()), end(positions.end()); j != end; ++j) {
-                               p.AddPosition(GetVector(**j));
-                       }
-               } else {
-                       throw Error("unknown PartyLayout property: " + i->first);
-               }
+       {
+               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));
        }
-}
-
-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);
-               }
+       {
+               TypeDescription &td(TypeDescription::Create(IMAGE_ID, "Image"));
+               td.SetDescription("Path to a PNG file with image data.");
+               td.SetSize(sizeof(SDL_Surface));
        }
-}
-
-void Interpreter::ReadSpell(Spell &s, const PropertyList &props) {
-       for (PropertyList::ConstIterator i(props.Begin()), end(props.End()); i != end; ++i) {
-               if (i->first == "name") {
-                       s.SetName(GetString(*i->second));
-               } else if (i->first == "cost") {
-                       s.SetCost(GetNumber(*i->second));
-               } else if (i->first == "battle") {
-                       if (GetBoolean(*i->second)) {
-                               s.SetUsableInBattle();
-                       }
-               } else if (i->first == "targets") {
-                       s.GetTargetingMode() = *GetTargetingMode(*i->second);
-               } else {
-                       throw Error("unknown Spell property: " + i->first);
-               }
+       {
+               TypeDescription &td(TypeDescription::Create(NUMBER_ID, "Number"));
+               td.SetDescription("A signed integer.");
+               td.SetSize(sizeof(int));
        }
-}
-
-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);
-               }
+       {;
+               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);
        }
-}
-
-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);
-               }
+       {
+               TypeDescription &td(TypeDescription::Create(SCRIPT_ID, "Script"));
+               td.SetDescription("Collection of commands that define a behaviour.");
+               td.SetSize(sizeof(Script));
        }
-}
-
-void Interpreter::ReadTargetingMode(TargetingMode &t, const PropertyList &props) {
-       for (PropertyList::ConstIterator i(props.Begin()), end(props.End()); i != end; ++i) {
-               if (i->first == "ally") {
-                       if (GetBoolean(*i->second)) {
-                               t.TargetAlly();
-                       } else {
-                               t.TargetEnemy();
-                       }
-               } else if (i->first == "enemy") {
-                       if (GetBoolean(*i->second)) {
-                               t.TargetEnemy();
-                       } else {
-                               t.TargetAlly();
-                       }
-               } else if (i->first == "all") {
-                       if (GetBoolean(*i->second)) {
-                               t.TargetAll();
-                       }
-               } else if (i->first == "multiple") {
-                       if (GetBoolean(*i->second)) {
-                               t.TargetMultiple();
-                       }
-               } else if (i->first == "single") {
-                       if (GetBoolean(*i->second)) {
-                               t.TargetSingle();
-                       }
-               } else {
-                       throw Error("unknown TargetingMode property: " + i->first);
-               }
+       {
+               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>));
        }
 }