Make JsEngine::Evaluate() return a wrapper for v8::Value to accessdifferent variable types easily

src/JsEngine.cpp

Index: src/JsEngine.cpp
===================================================================
--- a/src/JsEngine.cpp
+++ b/src/JsEngine.cpp
@@ -1,20 +1,21 @@
 #include <AdblockPlus.h>
 #include <sstream>
 
 #include "GlobalJsObject.h"
 
 namespace
 {
   v8::Handle<v8::Context> CreateContext(
+    v8::Isolate* isolate,
     AdblockPlus::ErrorCallback& errorCallback,
     AdblockPlus::WebRequest& webRequest)
   {
-    const v8::Locker locker(v8::Isolate::GetCurrent());
+    const v8::Locker locker(isolate);
     const v8::HandleScope handleScope;
     const v8::Handle<v8::ObjectTemplate> global =
       AdblockPlus::GlobalJsObject::Create(errorCallback, webRequest);
     return v8::Context::New(0, global);
   }
 
   v8::Handle<v8::Script> CompileScript(const std::string& source, const std::string& filename)
   {
@@ -61,39 +62,61 @@ AdblockPlus::JsError::JsError(const v8::
     const v8::Handle<v8::Message> message)
   : std::runtime_error(ExceptionToString(exception, message))
 {
 }
 
 AdblockPlus::JsEngine::JsEngine(const FileReader* const fileReader,
                                 WebRequest* const webRequest,
                                 ErrorCallback* const errorCallback)
-  : fileReader(fileReader), context(CreateContext(*errorCallback, *webRequest))
+  : fileReader(fileReader), isolate(v8::Isolate::GetCurrent()),
+    context(CreateContext(isolate, *errorCallback, *webRequest))
 {
 }
 
-std::string AdblockPlus::JsEngine::Evaluate(const std::string& source,
+AdblockPlus::JsValuePtr AdblockPlus::JsEngine::Evaluate(const std::string& source,
     const std::string& filename)
 {
-  const v8::Locker locker(v8::Isolate::GetCurrent());
-  const v8::HandleScope handleScope;
-  const v8::Context::Scope contextScope(context);
+  const Context context(*this);
   const v8::TryCatch tryCatch;
   const v8::Handle<v8::Script> script = CompileScript(source, filename);
   CheckTryCatch(tryCatch);
   v8::Local<v8::Value> result = script->Run();
   CheckTryCatch(tryCatch);
-  v8::String::Utf8Value resultString(result);
-  return std::string(*resultString);
+  return JsValuePtr(new JsValue(*this, result));
 }
 
 void AdblockPlus::JsEngine::Load(const std::string& scriptPath)
 {
   const std::auto_ptr<std::istream> file = fileReader->Read(scriptPath);
   if (!*file)
     throw std::runtime_error("Unable to load script " + scriptPath);
   Evaluate(Slurp(*file));
 }
 
 void AdblockPlus::JsEngine::Gc()
 {
   while (!v8::V8::IdleNotification());
 }
+
+AdblockPlus::JsValuePtr AdblockPlus::JsEngine::NewValue(const std::string& val)
+{
+  const Context context(*this);
+  return JsValuePtr(new JsValue(*this, v8::String::New(val.c_str(), val.length())));
+}
+
+AdblockPlus::JsValuePtr AdblockPlus::JsEngine::NewValue(int64_t val)
+{
+  const Context context(*this);
+  return JsValuePtr(new JsValue(*this, v8::Integer::New(val)));
+}
+
+AdblockPlus::JsValuePtr AdblockPlus::JsEngine::NewValue(bool val)
+{
+  const Context context(*this);
+  return JsValuePtr(new JsValue(*this, v8::Boolean::New(val)));
+}
+
+AdblockPlus::JsEngine::Context::Context(const JsEngine& jsEngine)
+    : locker(jsEngine.isolate), handleScope(),
+      contextScope(jsEngine.context)
+{
+}