X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Floader%2FParsedSource.cpp;h=c0d3a411782fea5e840b97720b2222c8d120a416;hb=ad15762dbafd23a80ac765fd5bb114640fb0264e;hp=1f7fc983053e68ab32047bdbba7abdc2f466d796;hpb=2bd2e92a227af66386af1dfca2f52df6941f0f94;p=l2e.git

diff --git a/src/loader/ParsedSource.cpp b/src/loader/ParsedSource.cpp
index 1f7fc98..c0d3a41 100644
--- a/src/loader/ParsedSource.cpp
+++ b/src/loader/ParsedSource.cpp
@@ -7,6 +7,8 @@
 
 #include "ParsedSource.h"
 
+#include "utility.h"
+
 #include <ostream>
 #include <stdexcept>
 
@@ -17,6 +19,12 @@ using std::vector;
 
 namespace loader {
 
+ParsedSource::~ParsedSource() {
+	for (map<string, Declaration *>::const_iterator i(declarations.begin()), end(declarations.end()); i != end; ++i) {
+		delete i->second;
+	}
+}
+
 void ParsedSource::AddDeclaration(Declaration *d) {
 	map<string, Declaration *>::iterator i(declarations.find(d->Identifier()));
 	if (i != declarations.end()) {
@@ -82,7 +90,14 @@ Definition &ParsedSource::GetDefinition(const std::string &name) {
 	if (i != definitions.end()) {
 		return *i->second;
 	} else {
-		throw runtime_error("undefined identifier " + name);
+		string msg("undefined identifier " + name);
+		map<string, Declaration *>::const_iterator i(declarations.find(name));
+		if (i != declarations.end()) {
+			msg += ", declared as " + i->second->TypeName();
+		} else {
+			msg += ", not declared";
+		}
+		throw runtime_error(msg);
 	}
 }
 
@@ -91,11 +106,32 @@ const Definition &ParsedSource::GetDefinition(const std::string &name) const {
 	if (i != definitions.end()) {
 		return *i->second;
 	} else {
-		throw runtime_error("undefined identifier " + name);
+		string msg("undefined identifier " + name);
+		map<string, Declaration *>::const_iterator i(declarations.find(name));
+		if (i != declarations.end()) {
+			msg += ", declared as " + i->second->TypeName();
+		} else {
+			msg += ", not declared";
+		}
+		throw runtime_error(msg);
+	}
+}
+
+void ParsedSource::WriteHeader(std::ostream &out) const {
+	for (std::set<string>::const_iterator i(exports.begin()), end(exports.end()); i != end; ++i) {
+		out << GetDeclaration(*i).TypeName() << ' ' << *i << std::endl;
 	}
 }
 
 
+Definition::~Definition() {
+	if (isLiteral) {
+		delete reinterpret_cast<Literal *>(value);
+	} else {
+		delete reinterpret_cast<PropertyList *>(value);
+	}
+}
+
 void Definition::SetValue(Literal *v) {
 	value = v;
 	isLiteral = true;
@@ -108,7 +144,7 @@ void Definition::SetValue(PropertyList *v) {
 
 Literal *Definition::GetLiteral() {
 	if (isLiteral) {
-		return (Literal *)value;
+		return reinterpret_cast<Literal *>(value);
 	} else {
 		throw runtime_error("tried to access properties as literal");
 	}
@@ -116,7 +152,7 @@ Literal *Definition::GetLiteral() {
 
 const Literal *Definition::GetLiteral() const {
 	if (isLiteral) {
-		return (Literal *)value;
+		return reinterpret_cast<Literal *>(value);
 	} else {
 		throw runtime_error("tried to access properties as literal");
 	}
@@ -124,7 +160,7 @@ const Literal *Definition::GetLiteral() const {
 
 PropertyList *Definition::GetProperties() {
 	if (!isLiteral) {
-		return (PropertyList *)value;
+		return reinterpret_cast<PropertyList *>(value);
 	} else {
 		throw runtime_error("tried to access literal value as property list");
 	}
@@ -132,7 +168,9 @@ PropertyList *Definition::GetProperties() {
 
 const PropertyList *Definition::GetProperties() const {
 	if (!isLiteral) {
-		return (PropertyList *)value;
+		return reinterpret_cast<PropertyList *>(value);
+	} else if (GetLiteral()->GetType() == Literal::OBJECT) {
+		return GetLiteral()->GetProperties();
 	} else {
 		throw runtime_error("tried to access literal value as property list");
 	}
@@ -193,6 +231,16 @@ Literal::Literal(int number)
 
 }
 
+Literal::Literal(const string &dir, const string &path)
+: props(0)
+, str(CatPath(dir, path))
+, i1(0), i2(0)
+, i3(0), i4(0)
+, b(false)
+, type(STRING) {
+
+}
+
 Literal::Literal(const string &str)
 : props(0)
 , str(str)
@@ -222,6 +270,26 @@ Literal::Literal(const string &typeName, PropertyList *properties)
 
 }
 
+Literal::~Literal() {
+	switch (type) {
+		case ARRAY_VALUES:
+			for (vector<Value *>::const_iterator i(values.begin()), end(values.end()); i != end; ++i) {
+				delete *i;
+			}
+			break;
+		case ARRAY_PROPS:
+			for (vector<PropertyList *>::const_iterator i(propertyLists.begin()), end(propertyLists.end()); i != end; ++i) {
+				delete *i;
+			}
+			break;
+		case OBJECT:
+			delete props;
+			break;
+		default:
+			break;
+	}
+}
+
 
 const vector<Value *> &Literal::GetValues() const {
 	if (type == ARRAY_VALUES) {
@@ -328,6 +396,12 @@ const PropertyList *Literal::GetProperties() const {
 }
 
 
+Value::~Value() {
+	if (isLiteral) {
+		delete literal;
+	}
+}
+
 const Literal &Value::GetLiteral() const {
 	if (isLiteral) {
 		return *literal;
@@ -386,6 +460,9 @@ ostream &operator <<(ostream &out, const loader::Literal &l) {
 		case loader::Literal::NUMBER:
 			out << "number, " << l.GetNumber();
 			break;
+		case loader::Literal::PATH:
+			out << "path, \"" << l.GetString() << '"';
+			break;
 		case loader::Literal::STRING:
 			out << "string, \"" << l.GetString() << '"';
 			break;