Fix USL memory leak.

libusl/src/types.cpp

@@ -25,6 +25,15 @@ Prototype::Prototype(Heap* heap):
 	Value(heap, 0)
 {}
 
+Prototype::~Prototype()
+{
+	for (auto const& pair : members) {
+		delete pair.second;
+	}
+	std::for_each(scopes.begin(), scopes.end(), [](ScopePrototype* p) { delete p; });
+}
+
+
 void Prototype::addMethod(NativeCode* native)
 {
 	ScopePrototype* scope = new ScopePrototype(static_cast<Heap*>(0), this); // TODO: GC
@@ -33,6 +42,7 @@ void Prototype::addMethod(NativeCode* native)
 	native->epilogue(scope);
 
 	members[native->name] = methodMember(scope);
+	scopes.push_back(scope);
 }
 
 
@@ -41,6 +51,12 @@ ThunkPrototype::ThunkPrototype(Heap* heap, Prototype* outer):
 	outer(outer)
 {}
 
+ThunkPrototype::~ThunkPrototype()
+{
+	for (Body::iterator it = body.begin(); it != body.end(); ++it)
+		delete *it;
+}
+
 /*
 struct ScopeSize: NativeThunk
 {
@@ -101,17 +117,17 @@ ScopePrototype::ScopePrototype(Heap* heap, Prototype* outer):
 //	members["prototype"] = &scopeMetaPrototype;	
 }
 
-ScopePrototype::~ScopePrototype()
-{
-	for (Body::iterator it = body.begin(); it != body.end(); ++it)
-		delete *it;
-}
-
-
 Scope::Scope(Heap* heap, ScopePrototype* prototype, Value* outer):
 	Thunk(heap, prototype, outer),
 	locals(prototype->locals.size(), 0)
 {}
+
+Scope::~Scope()
+{
+	for (auto& local : locals) {
+		delete local;
+	}
+}
 
 /*
 NativeThunk::NativeThunk(Prototype* outer, const std::string& name):

libusl/src/types.h

@@ -52,13 +52,17 @@ extern Value nil;
 
 struct ThunkPrototype;
 struct NativeCode;
+struct ScopePrototype;
 struct Prototype: Value
 {
 	typedef std::map<std::string, ThunkPrototype*> Members;
+	typedef std::vector<ScopePrototype*> Scopes;
 
 	Members members;
+	Scopes scopes;
 
 	Prototype(Heap* heap);
+	~Prototype();
 
 	void addMethod(NativeCode* native);
 
@@ -96,6 +100,7 @@ struct ThunkPrototype: Prototype
 	Body body;
 
 	ThunkPrototype(Heap* heap, Prototype* outer);
+	~ThunkPrototype();
 
 	virtual void dumpSpecific(std::ostream& stream) const
 	{
@@ -133,7 +138,6 @@ struct ScopePrototype: ThunkPrototype
 	Locals locals;
 
 	ScopePrototype(Heap* heap, Prototype* outer);
-	virtual ~ScopePrototype();
 };
 
 struct Scope: Thunk
@@ -144,6 +148,7 @@ struct Scope: Thunk
 	Locals locals;
 
 	Scope(Heap* heap, ScopePrototype* prototype, Value* outer);
+	~Scope();
 
 	virtual void dumpSpecific(std::ostream& stream) const
 	{

libusl/src/usl.cpp

@@ -113,6 +113,12 @@ Usl::Usl()
 	root = new Scope(&heap, prototype, 0);
 }
 
+Usl::~Usl()
+{
+	delete root->prototype;
+	delete root;
+}
+
 void Usl::markGarbage() const
 {
 	root->markForGC();

libusl/src/usl.h

@@ -12,7 +12,7 @@ struct Scope;
 struct Usl
 {
 	Usl();
-	virtual ~Usl() {}
+	virtual ~Usl();
 
 	void markGarbage() const;
 	void collectGarbage();