CYExecute() should run code in a specific context.

diff --git a/Console.cpp b/Console.cpp
index 35aa5868f1bfadb9aae1a5a3891ec7f10633c880..8a525f69b5fc976b4a64a550f0b86ef16ba1d769 100644 (file)
--- a/Console.cpp
+++ b/Console.cpp
@@ -123,7 +123,7 @@ static CYUTF8String Run(CYPool &pool, int client, CYUTF8String code) {
     if (client == -1) {
         mode_ = Running;
 #ifdef CY_EXECUTE
     if (client == -1) {
         mode_ = Running;
 #ifdef CY_EXECUTE

-        json = CYExecute(pool, code);
+        json = CYExecute(CYGetJSContext(), pool, code);

 #else
         json = NULL;
 #endif
 #else
         json = NULL;
 #endif

diff --git a/Execute.cpp b/Execute.cpp
index e1181463a1b45a5f618bbc41d7190df6dc49f2a4..4f2aa91a271178c174408297cdfa7d98be36541d 100644 (file)
--- a/Execute.cpp
+++ b/Execute.cpp
@@ -1294,8 +1294,7 @@ JSObjectRef CYGetGlobalObject(JSContextRef context) {
     return JSContextGetGlobalObject(context);
 }
 
     return JSContextGetGlobalObject(context);
 }
 

-const char *CYExecute(CYPool &pool, CYUTF8String code) {
-    JSContextRef context(CYGetJSContext());
+const char *CYExecute(JSContextRef context, CYPool &pool, CYUTF8String code) {

     JSValueRef exception(NULL);
 
     void *handle;
     JSValueRef exception(NULL);
 
     void *handle;

diff --git a/Handler.mm b/Handler.mm
index a064c7852231f1466ef9eeb3fea2ff5826866dd8..32981481b2aac0cafb1a3e46cb4ac0615289633a 100644 (file)
--- a/Handler.mm
+++ b/Handler.mm
@@ -57,7 +57,7 @@ struct CYExecute_ {
     CYExecute_ *execute(reinterpret_cast<CYExecute_ *>([value pointerValue]));
     const char *data(execute->data_);
     execute->data_ = NULL;
     CYExecute_ *execute(reinterpret_cast<CYExecute_ *>([value pointerValue]));
     const char *data(execute->data_);
     execute->data_ = NULL;

-    execute->data_ = CYExecute(execute->pool_, CYUTF8String(data));
+    execute->data_ = CYExecute(CYGetJSContext(), execute->pool_, CYUTF8String(data));

 }
 
 @end
 }
 
 @end

diff --git a/JavaScript.hpp b/JavaScript.hpp
index 944c89ea4fb981490f41c5f5cb34baeb766e4380..1ede3642d65e7b3b09446944a9b479567c74833f 100644 (file)
--- a/JavaScript.hpp
+++ b/JavaScript.hpp
@@ -56,7 +56,7 @@ JSGlobalContextRef CYGetJSContext();
 JSObjectRef CYGetGlobalObject(JSContextRef context);
 
 extern "C" void CYSetupContext(JSGlobalContextRef context);
 JSObjectRef CYGetGlobalObject(JSContextRef context);
 
 extern "C" void CYSetupContext(JSGlobalContextRef context);

-const char *CYExecute(CYPool &pool, CYUTF8String code);
+const char *CYExecute(JSContextRef context, CYPool &pool, CYUTF8String code);

 
 void CYSetArgs(int argc, const char *argv[]);
 
 
 void CYSetArgs(int argc, const char *argv[]);