X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Floader%2FInterpreter.cpp;h=bd7473aebab2a8673d4f419adbdc359efaa59e8b;hb=535f472174fd386567bec7002f645183b80cb2ef;hp=c2ce0d4145abf20ee1b90c291ad7965d2e5446aa;hpb=77915e0186f4fc0788054eb34651c726b80d981c;p=l2e.git

diff --git a/src/loader/Interpreter.cpp b/src/loader/Interpreter.cpp
index c2ce0d4..bd7473a 100644
--- a/src/loader/Interpreter.cpp
+++ b/src/loader/Interpreter.cpp
@@ -62,8 +62,16 @@ Interpreter::~Interpreter() {
 }
 
 
-const Interpreter::ParsedDefinition &Interpreter::GetDefinition(const string &identifier) const {
-	return parsedDefinitions.at(identifier);
+const Interpreter::ParsedDefinition &Interpreter::GetDefinition(const string &identifier) {
+	std::map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(identifier));
+	if (i != parsedDefinitions.end()) {
+		return i->second;
+	} else if (source.IsDefined(identifier)) {
+		ReadDefinition(source.GetDefinition(identifier));
+		return parsedDefinitions.at(identifier);
+	} else {
+		throw Error("access to undefined object " + identifier);
+	}
 }
 
 
@@ -114,13 +122,13 @@ void Interpreter::ReadLiteral(const Definition &dfn) {
 					|| 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());
 	}
-	values[typeId].push_back(object);
-	parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, typeId, id)));
 }
 
 void Interpreter::ReadLiteral(int typeId, int id, char *object, const Literal &literal) {
@@ -221,8 +229,9 @@ void *Interpreter::GetObject(int typeId, const Value &v) {
 				case Literal::SCRIPT:
 					{
 						typeId = TypeDescription::GetTypeId("Script");
+						char *script(ReadScript(v.GetLiteral().GetScript()));
 						id = values[typeId].size();
-						values[typeId].push_back(ReadScript(v.GetLiteral().GetScript()));
+						values[typeId].push_back(script);
 					}
 					break;
 				case Literal::STRING:
@@ -271,8 +280,8 @@ void Interpreter::ReadObject(const Definition &dfn) {
 	char *object(alloc.Alloc(td.Size()));
 	td.Construct(object);
 	values[typeId].push_back(object);
-	ReadObject(typeId, id, object, *dfn.GetProperties());
 	parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, typeId, id)));
+	ReadObject(typeId, id, object, *dfn.GetProperties());
 }
 
 
@@ -334,9 +343,16 @@ void Interpreter::ReadObject(int typeId, int id, char *object, const PropertyLis
 
 
 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::COMMAND) {
+		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;
@@ -414,6 +430,9 @@ void Interpreter::ReadScript(const std::vector<ScriptToken *> &s, Script *script
 	unsigned char *text(reinterpret_cast<unsigned char *>(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");
 		}
@@ -535,9 +554,9 @@ void Interpreter::ReadScriptAddress(const ScriptToken &t, unsigned char *dest) {
 	if (t.GetType() != ScriptToken::IDENTIFIER) {
 		throw Error("expected identifier for address");
 	}
-	if (source.IsDefined(t.GetIdentifier())) {
-		const ParsedDefinition &def(GetDefinition(t.GetIdentifier()));
-		void *addr(GetObject(def.type, t.GetIdentifier()));
+	if (source.IsDefined(t.Identifier())) {
+		const ParsedDefinition &def(GetDefinition(t.Identifier()));
+		void *addr(GetObject(def.type, t.Identifier()));
 		*reinterpret_cast<void **>(dest) = addr;
 	} else {
 		throw Error("postponing values in scripts not implemented");
@@ -546,8 +565,8 @@ void Interpreter::ReadScriptAddress(const ScriptToken &t, unsigned char *dest) {
 
 void Interpreter::ReadScriptInteger(const ScriptToken &t, unsigned char *dest) {
 	if (t.GetType() == ScriptToken::IDENTIFIER) {
-		if (source.IsDefined(t.GetIdentifier())) {
-			void *num(GetObject(TypeDescription::GetTypeId("Number"), t.GetIdentifier()));
+		if (source.IsDefined(t.Identifier())) {
+			void *num(GetObject(TypeDescription::GetTypeId("Number"), t.Identifier()));
 			*reinterpret_cast<int *>(dest) = *reinterpret_cast<int *>(num);
 		} else {
 			throw Error("postponing values in scripts not implemented");
@@ -561,8 +580,8 @@ void Interpreter::ReadScriptInteger(const ScriptToken &t, unsigned char *dest) {
 
 void Interpreter::ReadScriptVector(const ScriptToken &t, unsigned char *dest) {
 	if (t.GetType() == ScriptToken::IDENTIFIER) {
-		if (source.IsDefined(t.GetIdentifier())) {
-			void *vec(GetObject(TypeDescription::GetTypeId("Vector"), t.GetIdentifier()));
+		if (source.IsDefined(t.Identifier())) {
+			void *vec(GetObject(TypeDescription::GetTypeId("Vector"), t.Identifier()));
 			*reinterpret_cast<Vector<int> *>(dest) = *reinterpret_cast<Vector<int> *>(vec);
 		} else {
 			throw Error("postponing values in scripts not implemented");