Fixed up null handling after feedback. Realised I didn't need as HashSet.

Author: oliverbock

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::HashSet<System::WeakReference ^>();
+	mFunctions = gcnew System::Collections::Generic::List<System::WeakReference ^>();
 	HandleScope scope(isolate);
 	mContext = new Persistent<Context>(isolate, Context::New(isolate));
     terminateRuns = false;
@@ -205,7 +205,7 @@ void JavascriptContext::SetFatalErrorHandler(FatalErrorHandler^ handler)
 void JavascriptContext::SetFlags(System::String^ flags)
 {
     std::string convertedFlags = msclr::interop::marshal_as<std::string>(flags);
-    v8::V8::SetFlagsFromString(convertedFlags.c_str(), convertedFlags.length());
+    v8::V8::SetFlagsFromString(convertedFlags.c_str(), (int)convertedFlags.length());
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////

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::HashSet<System::WeakReference ^> ^mFunctions;
+	System::Collections::Generic::List<System::WeakReference ^> ^mFunctions;
 
 	// See comment for TerminateExecution().
 	bool terminateRuns;

Source/Noesis.Javascript/JavascriptFunction.cpp

@@ -75,14 +75,17 @@ System::Object^ JavascriptFunction::Call(... cli::array<System::Object^>^ args)
 
 bool JavascriptFunction::operator==(JavascriptFunction^ func1, JavascriptFunction^ func2)
 {
+    bool func1_null = func1 == nullptr,
+         func2_null = func2 == nullptr;
+    if (func1_null != func2_null)
+		return false;
+    if (func1_null && func2_null)
+        return true;
     if (func1->mFuncHandle == nullptr)
         throw gcnew JavascriptException(L"'func1's owning JavascriptContext has been disposed");
     if (func2->mFuncHandle == nullptr)
         throw gcnew JavascriptException(L"'func2's owning JavascriptContext has been disposed");
 
-    if(ReferenceEquals(func2, nullptr)) {
-		return false;
-	}
 	Handle<Function> jsFuncPtr1 = func1->mFuncHandle->Get(func1->mContext->GetCurrentIsolate());
 	Handle<Function> jsFuncPtr2 = func2->mFuncHandle->Get(func2->mContext->GetCurrentIsolate());
 
@@ -98,8 +101,10 @@ bool JavascriptFunction::Equals(Object^ other)
 {
     if (mFuncHandle == nullptr)
         throw gcnew JavascriptException(L"This function's owning JavascriptContext has been disposed");
-    
     JavascriptFunction^ otherFunc = dynamic_cast<JavascriptFunction^>(other);
+    if (otherFunc != nullptr && otherFunc->mFuncHandle == nullptr)
+        throw gcnew JavascriptException(L"This function's owning JavascriptContext has been disposed");
+
 	return (otherFunc && this->Equals(otherFunc));
 }