Now store references to extand JavascriptFunctions in weak references, so they won't take so much space when not needed anymore.

Author: oliverbock

Source/Noesis.Javascript/JavaScript.Net.vcxproj

@@ -153,6 +153,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <Reference Include="System" />
+    <Reference Include="System.Core" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
   </ItemGroup>

Source/Noesis.Javascript/JavascriptContext.cpp

@@ -163,7 +163,7 @@ JavascriptContext::JavascriptContext()
     isolate->SetFatalErrorHandler(FatalErrorCallback);
 
 	mExternals = gcnew System::Collections::Generic::Dictionary<System::Object ^, WrappedJavascriptExternal>();
-	mFunctions = gcnew System::Collections::Generic::List<System::Object ^>();
+	mFunctions = gcnew System::Collections::Generic::HashSet<System::WeakReference ^>();
 	HandleScope scope(isolate);
 	mContext = new Persistent<Context>(isolate, Context::New(isolate));
     terminateRuns = false;
@@ -178,8 +178,11 @@ JavascriptContext::~JavascriptContext()
 		v8::Isolate::Scope isolate_scope(isolate);
 		for each (WrappedJavascriptExternal wrapped in mExternals->Values)
 			delete wrapped.Pointer;
-		for each (JavascriptFunction^ f in mFunctions)
-			delete f;
+        for each (System::WeakReference^ f in mFunctions) {
+            JavascriptFunction ^function = safe_cast<JavascriptFunction ^>(f->Target);
+            if (function != nullptr)
+                delete function;
+        }
 		delete mContext;
 		delete mExternals;
 		delete mFunctions;
@@ -499,7 +502,9 @@ JavascriptContext::GetObjectWrapperTemplate()
 void
 JavascriptContext::RegisterFunction(System::Object^ f)
 {
-	mFunctions->Add(f);
+    // Note that while we do store WeakReferences, we never clean up this hashtable,
+    // so it will just grow and grow.
+	mFunctions->Add(gcnew System::WeakReference(f));
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////

Source/Noesis.Javascript/JavascriptContext.h

@@ -220,7 +220,7 @@ public ref class JavascriptContext: public System::IDisposable
 
 	// Stores every JavascriptFunction we create.  Ensures we dispose of them
 	// all.
-	System::Collections::Generic::List<System::Object ^> ^mFunctions;
+	System::Collections::Generic::HashSet<System::WeakReference ^> ^mFunctions;
 
 	// See comment for TerminateExecution().
 	bool terminateRuns;

Source/Noesis.Javascript/JavascriptFunction.cpp

@@ -31,14 +31,19 @@ JavascriptFunction::~JavascriptFunction()
 	{
 		if (mContext)
 		{
-			JavascriptScope scope(mContext);
+            JavascriptScope scope(mContext);
 			mFuncHandle->Reset();
 		}
 		delete mFuncHandle;
 		mFuncHandle = nullptr;
 	}
 }
 
+JavascriptFunction::!JavascriptFunction()
+{
+    delete this;
+}
+
 System::Object^ JavascriptFunction::Call(... cli::array<System::Object^>^ args)
 {
     if (mFuncHandle == nullptr)

Source/Noesis.Javascript/JavascriptFunction.h

@@ -26,6 +26,7 @@ public ref class JavascriptFunction
 public:
 	JavascriptFunction(v8::Handle<v8::Object> iFunction, JavascriptContext^ context);
 	~JavascriptFunction();
+    !JavascriptFunction();
 
 	System::Object^ Call(... cli::array<System::Object^>^ args);
 

Tests/Noesis.Javascript.Tests/JavascriptFunctionTests.cs

@@ -86,6 +86,15 @@ public void CannotUseAFunctionWhenItsContextIsDisposed()
             Action action = () => function.Call();
             action.ShouldThrowExactly<JavascriptException>().WithMessage("This function's owning JavascriptContext has been disposed");
         }
+
+        [TestMethod]
+        public void DisposingAFunction()
+        {
+            using (var context = new JavascriptContext()) {
+                var function = context.Run("() => { throw new Error('test'); }") as JavascriptFunction;
+                function.Dispose();
+            }
+        }
     }
 
     class CollectionWrapper