Started the refactoring required for multi-context.

diff --git a/JavaScript.hpp b/JavaScript.hpp
index b1bd8087016e04d9187ccdaacad09a2b044d7813..b45e3bf0f86b74857a5272f72dfc7fec1dd43228 100644 (file)
--- a/JavaScript.hpp
+++ b/JavaScript.hpp
@@ -45,19 +45,18 @@ extern JSObjectRef Error_;
 extern JSObjectRef Function_;
 extern JSObjectRef String_;
 
 extern JSObjectRef Function_;
 extern JSObjectRef String_;
 

-extern JSStringRef length_;
-extern JSStringRef message_;
-extern JSStringRef name_;
-extern JSStringRef prototype_;
-extern JSStringRef toCYON_;
-extern JSStringRef toJSON_;
-
-extern JSObjectRef Object_prototype_;
-extern JSObjectRef Function_prototype_;
+extern JSStringRef length_s;
+extern JSStringRef message_s;
+extern JSStringRef name_s;
+extern JSStringRef pop_s;
+extern JSStringRef prototype_s;
+extern JSStringRef push_s;
+extern JSStringRef splice_s;
+extern JSStringRef toCYON_s;
+extern JSStringRef toJSON_s;

 
 extern JSObjectRef Array_prototype_;
 
 extern JSObjectRef Array_prototype_;

-extern JSObjectRef Array_pop_;
-extern JSObjectRef Array_push_;
-extern JSObjectRef Array_splice_;
+extern JSObjectRef Function_prototype_;
+extern JSObjectRef Object_prototype_;

 
 #endif/*CYCRIPT_JAVASCRIPT_HPP*/
 
 #endif/*CYCRIPT_JAVASCRIPT_HPP*/

diff --git a/Library.cpp b/Library.cpp
index f44c8ec68435b5a3b4dbe818e9091542b6e609c5..ca7b1af82621cbba0e8fe791ec0a0997e1c67397 100644 (file)
--- a/Library.cpp
+++ b/Library.cpp
@@ -112,6 +112,10 @@ void CYSetProperty(JSContextRef context, JSObjectRef object, JSStringRef name, J
     JSObjectSetProperty(context, object, name, value, attributes, &exception);
     CYThrow(context, exception);
 }
     JSObjectSetProperty(context, object, name, value, attributes, &exception);
     CYThrow(context, exception);
 }

+
+void CYSetProperty(JSContextRef context, JSObjectRef object, JSStringRef name, JSValueRef (*callback)(JSContextRef, JSObjectRef, JSObjectRef, size_t, const JSValueRef[], JSValueRef *), JSPropertyAttributes attributes = kJSPropertyAttributeNone) {
+    CYSetProperty(context, object, name, JSObjectMakeFunctionWithCallback(context, name, callback), attributes);
+}

 /* }}} */
 /* JavaScript Strings {{{ */
 JSStringRef CYCopyJSString(const char *value) {
 /* }}} */
 /* JavaScript Strings {{{ */
 JSStringRef CYCopyJSString(const char *value) {


@@ -305,27 +309,26 @@ static JSClassRef Pointer_;
 static JSClassRef Runtime_;
 static JSClassRef Struct_;
 
 static JSClassRef Runtime_;
 static JSClassRef Struct_;
 

-static JSStringRef Result_;
-

 JSObjectRef Array_;
 JSObjectRef Error_;
 JSObjectRef Function_;
 JSObjectRef String_;
 
 JSObjectRef Array_;
 JSObjectRef Error_;
 JSObjectRef Function_;
 JSObjectRef String_;
 

-JSStringRef length_;
-JSStringRef message_;
-JSStringRef name_;
-JSStringRef prototype_;
-JSStringRef toCYON_;
-JSStringRef toJSON_;
-
-JSObjectRef Object_prototype_;
+JSObjectRef Array_prototype_;

 JSObjectRef Function_prototype_;
 JSObjectRef Function_prototype_;

+JSObjectRef Object_prototype_;

 
 

-JSObjectRef Array_prototype_;
-JSObjectRef Array_pop_;
-JSObjectRef Array_push_;
-JSObjectRef Array_splice_;
+JSStringRef length_s;
+JSStringRef message_s;
+JSStringRef name_s;
+JSStringRef pop_s;
+JSStringRef prototype_s;
+JSStringRef push_s;
+JSStringRef splice_s;
+JSStringRef toCYON_s;
+JSStringRef toJSON_s;
+
+static JSStringRef Result_;

 
 sqlite3 *Bridge_;
 
 
 sqlite3 *Bridge_;
 


@@ -590,13 +593,13 @@ const char *CYPoolCCYON(apr_pool_t *pool, JSContextRef context, JSValueRef value
 }
 
 const char *CYPoolCCYON(apr_pool_t *pool, JSContextRef context, JSObjectRef object) {
 }
 
 const char *CYPoolCCYON(apr_pool_t *pool, JSContextRef context, JSObjectRef object) {

-    JSValueRef toCYON(CYGetProperty(context, object, toCYON_));
+    JSValueRef toCYON(CYGetProperty(context, object, toCYON_s));

     if (CYIsCallable(context, toCYON)) {
         JSValueRef value(CYCallAsFunction(context, (JSObjectRef) toCYON, object, 0, NULL));
         return CYPoolCString(pool, context, value);
     }
 
     if (CYIsCallable(context, toCYON)) {
         JSValueRef value(CYCallAsFunction(context, (JSObjectRef) toCYON, object, 0, NULL));
         return CYPoolCString(pool, context, value);
     }
 

-    JSValueRef toJSON(CYGetProperty(context, object, toJSON_));
+    JSValueRef toJSON(CYGetProperty(context, object, toJSON_s));

     if (CYIsCallable(context, toJSON)) {
         JSValueRef arguments[1] = {CYCastJSValue(context, CYJSString(""))};
         JSValueRef exception(NULL);
     if (CYIsCallable(context, toJSON)) {
         JSValueRef arguments[1] = {CYCastJSValue(context, CYJSString(""))};
         JSValueRef exception(NULL);


@@ -646,7 +649,7 @@ static JSValueRef Array_callAsFunction_toCYON(JSContextRef context, JSObjectRef
 
     str << '[';
 
 
     str << '[';
 

-    JSValueRef length(CYGetProperty(context, _this, length_));
+    JSValueRef length(CYGetProperty(context, _this, length_s));

     bool comma(false);
 
     for (size_t index(0), count(CYCastDouble(context, length)); index != count; ++index) {
     bool comma(false);
 
     for (size_t index(0), count(CYCastDouble(context, length)); index != count; ++index) {


@@ -950,7 +953,7 @@ static JSValueRef Pointer_getProperty(JSContextRef context, JSObjectRef object,
     CYPool pool;
     Pointer *internal(reinterpret_cast<Pointer *>(JSObjectGetPrivate(object)));
 
     CYPool pool;
     Pointer *internal(reinterpret_cast<Pointer *>(JSObjectGetPrivate(object)));
 

-    if (JSStringIsEqual(property, length_))
+    if (JSStringIsEqual(property, length_s))

         return internal->length_ == _not(size_t) ? CYJSUndefined(context) : CYCastJSValue(context, internal->length_);
 
     Type_privateData *typical(internal->type_);
         return internal->length_ == _not(size_t) ? CYJSUndefined(context) : CYCastJSValue(context, internal->length_);
 
     Type_privateData *typical(internal->type_);


@@ -1468,12 +1471,15 @@ void CYInitialize() {
     //definition.getProperty = &Global_getProperty;
     Global_ = JSClassCreate(&definition);
 
     //definition.getProperty = &Global_getProperty;
     Global_ = JSClassCreate(&definition);
 

-    length_ = JSStringCreateWithUTF8CString("length");
-    message_ = JSStringCreateWithUTF8CString("message");
-    name_ = JSStringCreateWithUTF8CString("name");
-    prototype_ = JSStringCreateWithUTF8CString("prototype");
-    toCYON_ = JSStringCreateWithUTF8CString("toCYON");
-    toJSON_ = JSStringCreateWithUTF8CString("toJSON");
+    length_s = JSStringCreateWithUTF8CString("length");
+    message_s = JSStringCreateWithUTF8CString("message");
+    name_s = JSStringCreateWithUTF8CString("name");
+    pop_s = JSStringCreateWithUTF8CString("pop");
+    prototype_s = JSStringCreateWithUTF8CString("prototype");
+    push_s = JSStringCreateWithUTF8CString("push");
+    splice_s = JSStringCreateWithUTF8CString("splice");
+    toCYON_s = JSStringCreateWithUTF8CString("toCYON");
+    toJSON_s = JSStringCreateWithUTF8CString("toJSON");

 
     Result_ = JSStringCreateWithUTF8CString("_");
 
 
     Result_ = JSStringCreateWithUTF8CString("_");
 


@@ -1558,42 +1564,33 @@ JSGlobalContextRef CYGetJSContext(JSContextRef context) {
 void CYSetupContext(JSGlobalContextRef context) {
     JSObjectRef global(CYGetGlobalObject(context));
 
 void CYSetupContext(JSGlobalContextRef context) {
     JSObjectRef global(CYGetGlobalObject(context));
 

-    JSObjectSetPrototype(context, global, JSObjectMake(context, Runtime_, NULL));
-

     Array_ = CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Array")));
     JSValueProtect(context, Array_);
     Array_ = CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Array")));
     JSValueProtect(context, Array_);

+    Array_prototype_ = CYCastJSObject(context, CYGetProperty(context, Array_, prototype_s));
+    JSValueProtect(context, Array_prototype_);

 
     Error_ = CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Error")));
     JSValueProtect(context, Error_);
 
     Function_ = CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Function")));
     JSValueProtect(context, Function_);
 
     Error_ = CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Error")));
     JSValueProtect(context, Error_);
 
     Function_ = CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Function")));
     JSValueProtect(context, Function_);

-
-    String_ = CYCastJSObject(context, CYGetProperty(context, global, CYJSString("String")));
-    JSValueProtect(context, String_);
+    Function_prototype_ = (JSObjectRef) CYGetProperty(context, Function_, prototype_s);
+    JSValueProtect(context, Function_prototype_);

 
     JSObjectRef Object(CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Object"))));
 
     JSObjectRef Object(CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Object"))));

-    Object_prototype_ = CYCastJSObject(context, CYGetProperty(context, Object, prototype_));
+    Object_prototype_ = CYCastJSObject(context, CYGetProperty(context, Object, prototype_s));

     JSValueProtect(context, Object_prototype_);
 
     JSValueProtect(context, Object_prototype_);
 

-    Array_prototype_ = CYCastJSObject(context, CYGetProperty(context, Array_, prototype_));
-    Array_pop_ = CYCastJSObject(context, CYGetProperty(context, Array_prototype_, CYJSString("pop")));
-    Array_push_ = CYCastJSObject(context, CYGetProperty(context, Array_prototype_, CYJSString("push")));
-    Array_splice_ = CYCastJSObject(context, CYGetProperty(context, Array_prototype_, CYJSString("splice")));
+    String_ = CYCastJSObject(context, CYGetProperty(context, global, CYJSString("String")));
+    JSValueProtect(context, String_);

 
 

-    CYSetProperty(context, Array_prototype_, toCYON_, JSObjectMakeFunctionWithCallback(context, toCYON_, &Array_callAsFunction_toCYON), kJSPropertyAttributeDontEnum);
+    JSObjectSetPrototype(context, global, JSObjectMake(context, Runtime_, NULL));

 
 

-    JSValueProtect(context, Array_prototype_);
-    JSValueProtect(context, Array_pop_);
-    JSValueProtect(context, Array_push_);
-    JSValueProtect(context, Array_splice_);
+    CYSetProperty(context, Array_prototype_, toCYON_s, &Array_callAsFunction_toCYON, kJSPropertyAttributeDontEnum);

 
     JSObjectRef Functor(JSObjectMakeConstructor(context, Functor_, &Functor_new));
 
 
     JSObjectRef Functor(JSObjectMakeConstructor(context, Functor_, &Functor_new));
 

-    Function_prototype_ = (JSObjectRef) CYGetProperty(context, Function_, prototype_);
-    JSValueProtect(context, Function_prototype_);
-
-    JSObjectSetPrototype(context, (JSObjectRef) CYGetProperty(context, Functor, prototype_), Function_prototype_);
+    JSObjectSetPrototype(context, (JSObjectRef) CYGetProperty(context, Functor, prototype_s), Function_prototype_);

 
     CYSetProperty(context, global, CYJSString("Functor"), Functor);
     CYSetProperty(context, global, CYJSString("Pointer"), JSObjectMakeConstructor(context, Pointer_, &Pointer_new));
 
     CYSetProperty(context, global, CYJSString("Functor"), Functor);
     CYSetProperty(context, global, CYJSString("Pointer"), JSObjectMakeConstructor(context, Pointer_, &Pointer_new));


@@ -1601,9 +1598,9 @@ void CYSetupContext(JSGlobalContextRef context) {
 
     JSObjectRef cycript(JSObjectMake(context, NULL, NULL));
     CYSetProperty(context, global, CYJSString("Cycript"), cycript);
 
     JSObjectRef cycript(JSObjectMake(context, NULL, NULL));
     CYSetProperty(context, global, CYJSString("Cycript"), cycript);

-    CYSetProperty(context, cycript, CYJSString("gc"), JSObjectMakeFunctionWithCallback(context, CYJSString("gc"), &Cycript_gc_callAsFunction));
+    CYSetProperty(context, cycript, CYJSString("gc"), &Cycript_gc_callAsFunction);

 
 

-    CYSetProperty(context, global, CYJSString("$cyq"), JSObjectMakeFunctionWithCallback(context, CYJSString("$cyq"), &$cyq));
+    CYSetProperty(context, global, CYJSString("$cyq"), &$cyq);

 
     System_ = JSObjectMake(context, NULL, NULL);
     JSValueProtect(context, System_);
 
     System_ = JSObjectMake(context, NULL, NULL);
     JSValueProtect(context, System_);


@@ -1611,8 +1608,7 @@ void CYSetupContext(JSGlobalContextRef context) {
     CYSetProperty(context, global, CYJSString("system"), System_);
     CYSetProperty(context, System_, CYJSString("args"), CYJSNull(context));
     //CYSetProperty(context, System_, CYJSString("global"), global);
     CYSetProperty(context, global, CYJSString("system"), System_);
     CYSetProperty(context, System_, CYJSString("args"), CYJSNull(context));
     //CYSetProperty(context, System_, CYJSString("global"), global);

-
-    CYSetProperty(context, System_, CYJSString("print"), JSObjectMakeFunctionWithCallback(context, CYJSString("print"), &System_print));
+    CYSetProperty(context, System_, CYJSString("print"), &System_print);

 
     if (hooks_ != NULL && hooks_->SetupContext != NULL)
         (*hooks_->SetupContext)(context);
 
     if (hooks_ != NULL && hooks_->SetupContext != NULL)
         (*hooks_->SetupContext)(context);

diff --git a/ObjectiveC/Library.mm b/ObjectiveC/Library.mm
index 8182375e7c36572f73ce5fa1458f308f0c07637b..c5e1772b7c3f649df074178be2fddc9f25eaec60 100644 (file)
--- a/ObjectiveC/Library.mm
+++ b/ObjectiveC/Library.mm
@@ -1066,7 +1066,7 @@ JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { CYPoolTry {
 } CYObjectiveCatch }
 
 - (NSObject *) cy$toJSON:(NSString *)key { CYObjectiveTry {
 } CYObjectiveCatch }
 
 - (NSObject *) cy$toJSON:(NSString *)key { CYObjectiveTry {

-    JSValueRef toJSON(CYGetProperty(context_, object_, toJSON_));
+    JSValueRef toJSON(CYGetProperty(context_, object_, toJSON_s));

     if (!CYIsCallable(context_, toJSON))
         return [super cy$toJSON:key];
     else {
     if (!CYIsCallable(context_, toJSON))
         return [super cy$toJSON:key];
     else {


@@ -1139,7 +1139,7 @@ JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { CYPoolTry {
 } CYObjectiveCatch }
 
 - (NSUInteger) count { CYObjectiveTry {
 } CYObjectiveCatch }
 
 - (NSUInteger) count { CYObjectiveTry {

-    return CYCastDouble(context_, CYGetProperty(context_, object_, length_));
+    return CYCastDouble(context_, CYGetProperty(context_, object_, length_s));

 } CYObjectiveCatch }
 
 - (id) objectAtIndex:(NSUInteger)index { CYObjectiveTry {
 } CYObjectiveCatch }
 
 - (id) objectAtIndex:(NSUInteger)index { CYObjectiveTry {


@@ -1156,7 +1156,7 @@ JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { CYPoolTry {
     JSValueRef exception(NULL);
     JSValueRef arguments[1];
     arguments[0] = CYCastJSValue(context_, (NSObject *) object);
     JSValueRef exception(NULL);
     JSValueRef arguments[1];
     arguments[0] = CYCastJSValue(context_, (NSObject *) object);

-    JSObjectCallAsFunction(context_, Array_push_, object_, 1, arguments, &exception);
+    JSObjectCallAsFunction(context_, CYCastJSObject(context_, CYGetProperty(context_, Array_, push_s)), object_, 1, arguments, &exception);

     CYThrow(context_, exception);
 } CYObjectiveCatch }
 
     CYThrow(context_, exception);
 } CYObjectiveCatch }
 


@@ -1169,13 +1169,13 @@ JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { CYPoolTry {
     arguments[0] = CYCastJSValue(context_, index);
     arguments[1] = CYCastJSValue(context_, 0);
     arguments[2] = CYCastJSValue(context_, (NSObject *) object);
     arguments[0] = CYCastJSValue(context_, index);
     arguments[1] = CYCastJSValue(context_, 0);
     arguments[2] = CYCastJSValue(context_, (NSObject *) object);

-    JSObjectCallAsFunction(context_, Array_splice_, object_, 3, arguments, &exception);
+    JSObjectCallAsFunction(context_, CYCastJSObject(context_, CYGetProperty(context_, Array_, splice_s)), object_, 3, arguments, &exception);

     CYThrow(context_, exception);
 } CYObjectiveCatch }
 
 - (void) removeLastObject { CYObjectiveTry {
     JSValueRef exception(NULL);
     CYThrow(context_, exception);
 } CYObjectiveCatch }
 
 - (void) removeLastObject { CYObjectiveTry {
     JSValueRef exception(NULL);

-    JSObjectCallAsFunction(context_, Array_pop_, object_, 0, NULL, &exception);
+    JSObjectCallAsFunction(context_, CYCastJSObject(context_, CYGetProperty(context_, Array_, pop_s)), object_, 0, NULL, &exception);

     CYThrow(context_, exception);
 } CYObjectiveCatch }
 
     CYThrow(context_, exception);
 } CYObjectiveCatch }
 


@@ -1187,7 +1187,7 @@ JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { CYPoolTry {
     JSValueRef arguments[2];
     arguments[0] = CYCastJSValue(context_, index);
     arguments[1] = CYCastJSValue(context_, 1);
     JSValueRef arguments[2];
     arguments[0] = CYCastJSValue(context_, index);
     arguments[1] = CYCastJSValue(context_, 1);

-    JSObjectCallAsFunction(context_, Array_splice_, object_, 2, arguments, &exception);
+    JSObjectCallAsFunction(context_, CYCastJSObject(context_, CYGetProperty(context_, Array_, splice_s)), object_, 2, arguments, &exception);

     CYThrow(context_, exception);
 } CYObjectiveCatch }
 
     CYThrow(context_, exception);
 } CYObjectiveCatch }
 


@@ -2367,7 +2367,7 @@ void CYObjectiveC_SetupContext(JSContextRef context) { CYPoolTry {
     JSObjectRef Selector(JSObjectMakeConstructor(context, Selector_, &Selector_new));
     JSObjectRef Super(JSObjectMakeConstructor(context, Super_, &Super_new));
 
     JSObjectRef Selector(JSObjectMakeConstructor(context, Selector_, &Selector_new));
     JSObjectRef Super(JSObjectMakeConstructor(context, Super_, &Super_new));
 

-    Instance_prototype_ = (JSObjectRef) CYGetProperty(context, Instance, prototype_);
+    Instance_prototype_ = (JSObjectRef) CYGetProperty(context, Instance, prototype_s);

     JSValueProtect(context, Instance_prototype_);
 
     CYSetProperty(context, global, CYJSString("Instance"), Instance);
     JSValueProtect(context, Instance_prototype_);
 
     CYSetProperty(context, global, CYJSString("Instance"), Instance);


@@ -2380,8 +2380,8 @@ void CYObjectiveC_SetupContext(JSContextRef context) { CYPoolTry {
 
     CYSetProperty(context, global, CYJSString("objc_msgSend"), JSObjectMakeFunctionWithCallback(context, CYJSString("objc_msgSend"), &$objc_msgSend));
 
 
     CYSetProperty(context, global, CYJSString("objc_msgSend"), JSObjectMakeFunctionWithCallback(context, CYJSString("objc_msgSend"), &$objc_msgSend));
 

-    JSObjectSetPrototype(context, (JSObjectRef) CYGetProperty(context, Message, prototype_), Function_prototype_);
-    JSObjectSetPrototype(context, (JSObjectRef) CYGetProperty(context, Selector, prototype_), Function_prototype_);
+    JSObjectSetPrototype(context, (JSObjectRef) CYGetProperty(context, Message, prototype_s), Function_prototype_);
+    JSObjectSetPrototype(context, (JSObjectRef) CYGetProperty(context, Selector, prototype_s), Function_prototype_);

 } CYPoolCatch() }
 
 static CYHooks CYObjectiveCHooks = {
 } CYPoolCatch() }
 
 static CYHooks CYObjectiveCHooks = {