-/*
- * 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"
using graphics::ComplexAnimation;
using graphics::SimpleAnimation;
using graphics::Sprite;
-using geometry::Vector;
+using math::Vector;
using std::make_pair;
using std::set;
using std::string;
void Interpreter::ReadLiteral(int typeId, int id, char *object, const Literal &literal) {
switch (literal.GetType()) {
case Literal::ARRAY_VALUES:
- throw Error("named value arrays are not supported, sorry");
- break;
case Literal::ARRAY_PROPS:
- throw Error("named property list arrays are not supported, sorry");
+ case Literal::ARRAY_IDENTS:
+ throw Error("named arrays are not supported, sorry");
break;
case Literal::BOOLEAN:
new (object) bool(literal.GetBoolean());
int typeId(0), id(0);
switch (v.GetLiteral().GetType()) {
case Literal::ARRAY_VALUES:
- throw Error("cannot copy value arrays, sorry");
- break;
case Literal::ARRAY_PROPS:
- throw Error("cannot copy property list arrays, sorry");
+ case Literal::ARRAY_IDENTS:
+ throw Error("cannot copy arrays, sorry");
break;
case Literal::BOOLEAN:
{
char *dest(object + fd.Offset());
if (fd.IsAggregate()) {
int arraySize(i->second->GetLiteral().ArraySize());
- char *aggregate(alloc.Alloc(fieldType.Size() * arraySize));
- char *iter(aggregate);
+ 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 += fieldType.Size()) {
- fieldType.Construct(iter);
- ReadObject(fieldType.TypeId(), -1, iter, **j);
+ 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 {
+ } 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 += fieldType.Size()) {
- fieldType.Construct(iter);
- ReadLiteral(fieldType.TypeId(), -1, iter, (*j)->GetLiteral());
+ 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());
}
- }
- if (fd.IsReferenced()) {
- std::memcpy(dest, &aggregate, sizeof(char *));
- dest += sizeof(char *);
- std::memcpy(dest, &arraySize, sizeof(int));
} else {
- throw Error("aggregate type fields must be referenced");
+ 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()) {
}
}
} else {
- Postpone(typeId, id, fd.Offset(), i->second->GetIdentifier(), fd.TypeId(), !fd.IsReferenced());
+ Postpone(object, i->second->GetIdentifier(), fd.TypeId(), !fd.IsReferenced(), fd.IsAggregate());
}
}
td.Load(object);
} else if ((*i)->GetType() != ScriptToken::COMMAND) {
throw Error("unexpected script token");
}
- ++size;
+ size += sizeof(Script::Code);
const string &cmd((*i)->CommandName());
if (cmd == "move") {
++i;
throw Error("unexpected script end after move");
}
const string ®((*i)->RegisterName());
- switch (reg[0]) {
- case 'a':
- size += sizeof(void *);
- break;
- case 'i':
- size += sizeof(int);
- break;
- case 'v':
- size += sizeof(Vector<int>);
- break;
- default:
- throw Error("unknown register " + reg);
+ 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 ®((*i)->RegisterName());
- switch (reg[0]) {
- case 'i':
- size += sizeof(int);
- break;
- case 'v':
- size += sizeof(Vector<int>);
- break;
- default:
- throw Error("expected register after add " + reg);
+ 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");
}
- size += sizeof(int);
++i;
if (i == end) {
throw Error("unexpected script end after mod");
}
- } else if (cmd == "rand") {
- ++i;
- if (i == end) {
- throw Error("unexpected script end after rand");
+ if ((*i)->GetType() != ScriptToken::REGISTER) {
+ size += sizeof(int);
}
- size += sizeof(int);
+ } else if (cmd == "rand") {
++i;
if (i == end) {
throw Error("unexpected script end after rand");
if (i == end) {
throw Error("unexpected script end after cmp");
}
- size += sizeof(int);
+ 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;
}
}
- unsigned char *text(reinterpret_cast<unsigned char *>(alloc.Alloc(size)));
+ 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) {
}
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 ®((*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 (reg == "a0") {
- text[cursor] = Script::CODE_MOVE_A0;
- ++cursor;
- ReadScriptAddress(**i, text + cursor);
- cursor += sizeof(void *);
- } else if (reg == "a1") {
- text[cursor] = Script::CODE_MOVE_A1;
- ++cursor;
- ReadScriptAddress(**i, text + cursor);
- cursor += sizeof(void *);
- } else if (reg == "i0") {
- text[cursor] = Script::CODE_MOVE_I0;
- ++cursor;
- ReadScriptInteger(**i, text + cursor);
- cursor += sizeof(int);
- } else if (reg == "i1") {
- text[cursor] = Script::CODE_MOVE_I1;
- ++cursor;
- ReadScriptInteger(**i, text + cursor);
- cursor += sizeof(int);
- } else if (reg == "v0") {
- text[cursor] = Script::CODE_MOVE_V0;
- ++cursor;
- ReadScriptVector(**i, text + cursor);
- cursor += sizeof(Vector<int>);
- } else if (reg == "v1") {
- text[cursor] = Script::CODE_MOVE_V1;
- ++cursor;
- ReadScriptVector(**i, text + cursor);
- cursor += sizeof(Vector<int>);
+
+ 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 {
- throw Error("unknown register " + reg);
+ 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 ®((*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 (reg == "i0") {
- text[cursor] = Script::CODE_ADD_I0;
- ++cursor;
- ReadScriptInteger(**i, text + cursor);
- cursor += sizeof(int);
- } else if (reg == "i1") {
- text[cursor] = Script::CODE_ADD_I1;
- ++cursor;
- ReadScriptInteger(**i, text + cursor);
- cursor += sizeof(int);
- } else if (reg == "v0") {
- text[cursor] = Script::CODE_ADD_V0;
- ++cursor;
- ReadScriptVector(**i, text + cursor);
- cursor += sizeof(Vector<int>);
- } else if (reg == "v1") {
- text[cursor] = Script::CODE_ADD_V1;
- ++cursor;
- ReadScriptVector(**i, text + cursor);
- cursor += sizeof(Vector<int>);
+
+ 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 {
- throw Error("unexpected register " + reg);
+ 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 ®((*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 (reg == "i0") {
- text[cursor] = Script::CODE_MOD_I0;
- ++cursor;
- ReadScriptInteger(**i, text + cursor);
- cursor += sizeof(int);
- } else if (reg == "i1") {
- text[cursor] = Script::CODE_MOD_I1;
- ++cursor;
+
+ 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 {
- throw Error("unexpected register " + reg);
}
} else if (cmd == "rand") {
+ Script::Code &code(CreateScriptCode(Script::COMMAND_RAND, text + cursor));
+ cursor += sizeof(Script::Code);
+ code.numParams = 1;
++i;
const string ®((*i)->RegisterName());
- if (reg == "i0") {
- text[cursor] = Script::CODE_RAND_I0;
- ++cursor;
- } else if (reg == "i1") {
- text[cursor] = Script::CODE_RAND_I1;
- ++cursor;
- } else {
- throw Error("unexpected register " + reg);
+ 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 ®((*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 (reg == "i0") {
- if ((*i)->GetType() == ScriptToken::REGISTER && (*i)->RegisterName() == "i1") {
- text[cursor] = Script::CODE_CMP_I0_I1;
- ++cursor;
- } else {
- text[cursor] = Script::CODE_CMP_I0;
- ++cursor;
- ReadScriptInteger(**i, text + cursor);
- cursor += sizeof(int);
+
+ 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);
}
- } else if (reg == "i1") {
- text[cursor] = Script::CODE_CMP_I1;
- ++cursor;
+ code.reg2 = reg2num;
+ } else {
+ code.reg2 = 7;
ReadScriptInteger(**i, text + cursor);
cursor += sizeof(int);
- } else {
- throw Error("cannot use " + reg + " as lhs for comparison");
}
} else if (cmd == "jmp") {
- text[cursor] = Script::CODE_JUMP;
- ++cursor;
+ 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") {
- text[cursor] = Script::CODE_JUMP_EQUAL;
- ++cursor;
+ 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") {
- text[cursor] = Script::CODE_JUMP_NOT_EQUAL;
- ++cursor;
+ 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") {
- text[cursor] = Script::CODE_JUMP_LESS;
- ++cursor;
+ 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") {
- text[cursor] = Script::CODE_JUMP_LESS_EQUAL;
- ++cursor;
+ 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") {
- text[cursor] = Script::CODE_JUMP_GREATER;
- ++cursor;
+ 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") {
- text[cursor] = Script::CODE_JUMP_GREATER_EQUAL;
- ++cursor;
+ 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") {
- text[cursor] = Script::CODE_SYSCALL;
- ++cursor;
+ Script::Code &code(CreateScriptCode(Script::COMMAND_SYSC, text + cursor));
+ cursor += sizeof(Script::Code);
+ code.numParams = 0;
} else {
throw Error("unknown command " + cmd);
}
return mem;
}
-void Interpreter::ReadScriptAddress(const ScriptToken &t, unsigned char *dest) {
+Script::Code &Interpreter::CreateScriptCode(Script::Command c, char *dest) {
+ Script::Code &code(*reinterpret_cast<Script::Code *>(dest));
+ code.command = c;
+ code.numParams = 0;
+ code.type = Script::TYPE_NONE;
+ code.reg1 = 7;
+ code.reg2 = 7;
+ return code;
+}
+
+void Interpreter::ReadScriptAddress(const ScriptToken &t, char *dest) {
if (t.GetType() != ScriptToken::IDENTIFIER) {
throw Error("expected identifier for address");
}
}
}
-void Interpreter::ReadScriptInteger(const ScriptToken &t, unsigned char *dest) {
+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()));
}
}
-void Interpreter::ReadScriptVector(const ScriptToken &t, unsigned char *dest) {
+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()));
return v.IsLiteral() || source.IsDefined(v.GetIdentifier());
}
-void Interpreter::Postpone(int type, int id, std::ptrdiff_t offset, const std::string &identifier, int linkedType, bool inlined) {
+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(type, id, offset, str, linkedType, inlined));
+ postponedDefinitions.push_back(
+ PostponedDefinition(dest, str, type, inlined, aggregate));
}
void Interpreter::CreateTypeDescriptions() {
{
- TypeDescription &td(TypeDescription::CreateOrGet("Boolean"));
+ TypeDescription &td(TypeDescription::Create(BOOLEAN_ID, "Boolean"));
td.SetDescription("Logical value which can be either true or false.");
td.SetSize(sizeof(bool));
}
{
- TypeDescription &td(TypeDescription::CreateOrGet("Color"));
+ TypeDescription &td(TypeDescription::Create(COLOR_ID, "Color"));
td.SetDescription(
"A color in RGB format with an optional alpha channel.\n"
"Components range from 0 to 255.\n"
td.SetSize(sizeof(Color));
}
{
- TypeDescription &td(TypeDescription::CreateOrGet("Image"));
+ TypeDescription &td(TypeDescription::Create(IMAGE_ID, "Image"));
td.SetDescription("Path to a PNG file with image data.");
td.SetSize(sizeof(SDL_Surface));
}
{
- TypeDescription &td(TypeDescription::CreateOrGet("Number"));
+ TypeDescription &td(TypeDescription::Create(NUMBER_ID, "Number"));
td.SetDescription("A signed integer.");
td.SetSize(sizeof(int));
}
- {
- int stringId(TypeDescription::GetTypeId("String"));
- TypeDescription &td(TypeDescription::CreateOrGet("Path"));
+ {;
+ TypeDescription &td(TypeDescription::Create(PATH_ID, "Path"));
td.SetDescription("A path in the filesystem which is interpreted relative to the source file's location.");
td.SetSize(1);
- td.AddSupertype(stringId, 0);
+ td.AddSupertype(STRING_ID, 0);
}
{
- TypeDescription &td(TypeDescription::CreateOrGet("Script"));
+ TypeDescription &td(TypeDescription::Create(SCRIPT_ID, "Script"));
td.SetDescription("Collection of commands that define a behaviour.");
td.SetSize(sizeof(Script));
}
{
- TypeDescription &td(TypeDescription::CreateOrGet("String"));
+ TypeDescription &td(TypeDescription::Create(STRING_ID, "String"));
td.SetDescription("Some characters.");
td.SetSize(1);
}
{
- TypeDescription &td(TypeDescription::CreateOrGet("Vector"));
+ TypeDescription &td(TypeDescription::Create(VECTOR_ID, "Vector"));
td.SetDescription("A pair of numbers usually describing a 2D translation or offset.");
td.SetSize(sizeof(Vector<int>));
}
projects / l2e.git / blobdiff