X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;ds=sidebyside;f=src%2Floader%2FInterpreter.cpp;h=e8d4ec9ff5be63fae56efcde0e3eef8ead5c8867;hb=040362d489952ddc935c7130cb54d8b9166b2569;hp=550be2678f7e75f175b9a187a50080079d911a70;hpb=401785f03e9d56fb28d9e29cdb74dbbf5664c342;p=l2e.git diff --git a/src/loader/Interpreter.cpp b/src/loader/Interpreter.cpp index 550be26..e8d4ec9 100644 --- a/src/loader/Interpreter.cpp +++ b/src/loader/Interpreter.cpp @@ -15,6 +15,7 @@ #include "../common/Ikari.h" #include "../common/Item.h" #include "../common/Spell.h" +#include "../common/Stats.h" #include "../common/TargetingMode.h" #include "../graphics/ComplexAnimation.h" #include "../graphics/Font.h" @@ -31,10 +32,10 @@ using battle::Hero; using battle::Monster; using battle::PartyLayout; -using battle::Stats; using common::Ikari; using common::Item; using common::Spell; +using common::Stats; using common::TargetingMode; using graphics::Animation; using graphics::Color; @@ -46,7 +47,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 +54,19 @@ using std::vector; namespace loader { Interpreter::~Interpreter() { - for (vector::const_iterator i(postponedDefinitions.begin()), end(postponedDefinitions.end()); i != end; ++i) { - delete i->identifier; - } - for (map::const_iterator i(imageCache.begin()), end(imageCache.end()); i != end; ++i) { + for (std::map::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 >::const_iterator i(values.begin()), end(values.end()); i != end; ++i) { - for (vector::const_iterator j(i->second.begin()), end(i->second.end()); j != end; ++j) { - delete[] reinterpret_cast(*j); - } - } +} + + +const Interpreter::ParsedDefinition &Interpreter::GetDefinition(const string &identifier) const { + return parsedDefinitions.at(identifier); } void *Interpreter::GetObject(int typeId, const std::string &name) { - map::const_iterator i(parsedDefinitions.find(name)); + std::map::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,7 +111,7 @@ void Interpreter::ReadLiteral(const Definition &dfn) { (dfn.GetLiteral()->GetType() == Literal::PATH || dfn.GetLiteral()->GetType() == Literal::STRING) ? dfn.GetLiteral()->GetString().size() : td.Size()); - char *object(new char[size]); + char *object(alloc.Alloc(size)); if (dfn.GetLiteral()->GetType() == Literal::OBJECT) { ReadObject(typeId, id, object, *dfn.GetLiteral()->GetProperties()); } else { @@ -165,7 +161,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); @@ -185,7 +181,7 @@ void *Interpreter::GetObject(int typeId, const Value &v) { typeId = TypeDescription::GetTypeId("Boolean"); id = values[typeId].size(); const TypeDescription &td(TypeDescription::Get(typeId)); - char *object(new char[td.Size()]); + char *object(alloc.Alloc(td.Size())); values[typeId].push_back(new (object) bool(v.GetLiteral().GetBoolean())); } break; @@ -194,7 +190,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 +199,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,7 +207,7 @@ 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); @@ -221,7 +217,7 @@ void *Interpreter::GetObject(int typeId, const Value &v) { { 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 +228,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(v.GetLiteral().GetX(), v.GetLiteral().GetY())); } break; @@ -241,7 +237,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,7 +256,7 @@ void Interpreter::ReadObject(const Definition &dfn) { int typeId(TypeDescription::GetTypeId(dfn.TypeName())); const TypeDescription &td(TypeDescription::Get(typeId)); int id(values[typeId].size()); - char *object(new char[td.Size()]); + char *object(alloc.Alloc(td.Size())); td.Construct(object); values[typeId].push_back(object); ReadObject(typeId, id, object, *dfn.GetProperties()); @@ -277,7 +273,7 @@ void Interpreter::ReadObject(int typeId, int id, char *object, const PropertyLis char *dest(object + fd.Offset()); if (fd.IsAggregate()) { int arraySize(i->second->GetLiteral().ArraySize()); - char *aggregate(new char[fieldType.Size() * arraySize]); + char *aggregate(alloc.Alloc(fieldType.Size() * arraySize)); char *iter(aggregate); if (i->second->GetLiteral().GetType() == Literal::ARRAY_PROPS) { const vector &list(i->second->GetLiteral().GetPropertyLists()); @@ -299,8 +295,18 @@ 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(GetObject(fd.TypeId(), *i->second))); + if (fd.TypeId() == TypeDescription::GetTypeId("Image")) { + src = reinterpret_cast(GetImage(src)); + } if (fd.IsReferenced()) { std::memcpy(dest, &src, sizeof(char *)); } else { @@ -308,9 +314,22 @@ 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); +} + + +SDL_Surface *Interpreter::GetImage(const string &path) { + std::map::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; + } } @@ -318,43 +337,53 @@ 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")); + td.SetDescription("Logical value which can be either true or false."); td.SetSize(sizeof(bool)); } { TypeDescription &td(TypeDescription::CreateOrGet("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")); + td.SetDescription("Path to a PNG file with image data."); td.SetSize(sizeof(SDL_Surface)); } { TypeDescription &td(TypeDescription::CreateOrGet("Number")); + td.SetDescription("A signed integer."); td.SetSize(sizeof(int)); } { int stringId(TypeDescription::GetTypeId("String")); TypeDescription &td(TypeDescription::CreateOrGet("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); } { TypeDescription &td(TypeDescription::CreateOrGet("String")); + td.SetDescription("Some characters."); td.SetSize(1); } { TypeDescription &td(TypeDescription::CreateOrGet("Vector")); + td.SetDescription("A pair of numbers usually describing a 2D translation or offset."); td.SetSize(sizeof(Vector)); } }