lib/johnson/runtime.rb test/johnson/runtime_test.rb todo/.keep @@ -6,94 +6,6 @@ #include "idhash.h" #include "jsdbgapi.h" -/* - * call-seq: - * global - * - * Returns the global object used for this context. - */ -static VALUE global(VALUE self) -{ - OurContext* context; - Data_Get_Struct(self, OurContext, context); - return convert_to_ruby(context, OBJECT_TO_JSVAL(context->global)); -} - -/* - * call-seq: - * evaluate(script, filename=nil, linenum=nil) - * - * Evaluate +script+ with +filename+ using +linenum+ - */ -static VALUE evaluate(int argc, VALUE* argv, VALUE self) -{ - VALUE script, filename, linenum; - - OurContext* context; - Data_Get_Struct(self, OurContext, context); - - rb_scan_args( argc, argv, "12", &script, &filename, &linenum ); - - // clean things up first - context->ex = 0; - memset(context->msg, 0, MAX_EXCEPTION_MESSAGE_SIZE); - - const char* filenamez = RTEST(filename) ? StringValueCStr(filename) : "none"; - int linenumi = RTEST(linenum) ? NUM2INT(linenum) : 1; - - jsval js; - - // FIXME: should be able to pass in the 'file' name - JSBool ok = JS_EvaluateScript(context->js, context->global, - StringValuePtr(script), (unsigned)StringValueLen(script), filenamez, (unsigned)linenumi, &js); - - if (!ok) - { - if (JS_IsExceptionPending(context->js)) - { - // If there's an exception pending here, it's a syntax error. - JS_GetPendingException(context->js, &context->ex); - JS_ClearPendingException(context->js); - } - - if (context->ex) - { - return rb_funcall(self, rb_intern("handle_js_exception"), - 1, convert_to_ruby(context, context->ex)); - - // VALUE message, file, line, stack; - // - // jsval js_message; - // assert(JS_GetProperty(context->js, JSVAL_TO_OBJECT(context->ex), "message", &js_message)); - // message = convert_to_ruby(context, js_message); - // - // jsval js_file; - // assert(JS_GetProperty(context->js, JSVAL_TO_OBJECT(context->ex), "fileName", &js_file)); - // file = convert_to_ruby(context, js_file); - // - // jsval js_line; - // assert(JS_GetProperty(context->js, JSVAL_TO_OBJECT(context->ex), "lineNumber", &js_line)); - // line = convert_to_ruby(context, js_line); - // - // jsval js_stack; - // assert(JS_GetProperty(context->js, JSVAL_TO_OBJECT(context->ex), "stack", &js_stack)); - // stack = convert_to_ruby(context, js_stack); - // - // return rb_funcall(self, rb_intern("handle_js_exception"), - // 4, message, file, line, stack); - } - - char* msg = context->msg; - - // toString() whatever the exception object is (if we have one) - if (context->ex) msg = JS_GetStringBytes(JS_ValueToString(context->js, context->ex)); - - return Johnson_Error_raise(msg); - } - - return convert_to_ruby(context, js); -} - // callback for JS_SetErrorReporter static void report_js_error(JSContext* js, const char* message, JSErrorReport* UNUSED(report)) { @@ -101,8 +13,8 @@ static void report_js_error(JSContext* js, const char* message, JSErrorReport* U VALUE self = (VALUE)JS_GetContextPrivate(js); // then we find our bridge - OurContext* context; - Data_Get_Struct(self, OurContext, context); + JohnsonContext* context; + Data_Get_Struct(self, JohnsonContext, context); // NOTE: SpiderMonkey REALLY doesn't like being interrupted. If we // jump over to Ruby and raise here, segfaults and such ensue. @@ -124,80 +36,52 @@ static JSBool branch_callback(JSContext* js, JSScript* UNUSED(script)) /* * call-seq: - * debugger=(debugger) + * native_initialize(options={}) * - * Sets a debugger object + * Initializes the native spidermonkey values. */ static VALUE -set_debugger(VALUE self, VALUE debugger) +initialize_native(VALUE self, VALUE rb_runtime, VALUE UNUSED(options)) { - OurContext* context; - JSDebugHooks* debug_hooks; + JohnsonContext* context; + JohnsonRuntime* runtime; - Data_Get_Struct(self, OurContext, context); - Data_Get_Struct(debugger, JSDebugHooks, debug_hooks); + Data_Get_Struct(self, JohnsonContext, context); + Data_Get_Struct(rb_runtime, JohnsonRuntime, runtime); - JS_SetContextDebugHooks(context->js, debug_hooks); + if ((context->js = JS_NewContext(runtime->js, 8192))) + { + // See if the runtime already has a shared global object. + JSObject* global = runtime->global; - return debugger; -} + // If it does, use it. If not, + if (!global) + // create one of our global objects. + global = johnson_create_global_object(context->js); -/* - * call-seq: - * native_initialize(options={}) - * - * Initializes the native spidermonkey values. - */ -static VALUE -initialize_native(VALUE self, VALUE UNUSED(options)) -{ - OurContext* context; - bool gthings_rooted_p = false; - - Data_Get_Struct(self, OurContext, context); - - if ((context->runtime = JS_NewRuntime(0x100000)) - && (context->js = JS_NewContext(context->runtime, 8192)) - && (context->jsids = create_id_hash()) - && (context->rbids = create_id_hash()) - && (context->gcthings = JS_NewObject(context->js, NULL, 0, 0)) - && (gthings_rooted_p = JS_AddNamedRoot(context->js, &(context->gcthings), "context->gcthings")) - && (context->global = create_global_object(context)) - && (JS_AddNamedRoot(context->js, &(context->global), "context->global"))) - { + // Manually set the context's global object. + JS_SetGlobalObject(context->js, global); JS_SetErrorReporter(context->js, report_js_error); JS_SetBranchCallback(context->js, branch_callback); JS_SetContextPrivate(context->js, (void *)self); JS_SetOptions(context->js, JS_GetOptions(context->js) #ifdef JSOPTION_DONT_REPORT_UNCAUGHT - | JSOPTION_DONT_REPORT_UNCAUGHT + | JSOPTION_DONT_REPORT_UNCAUGHT #endif #ifdef JSOPTION_VAROBJFIX - | JSOPTION_VAROBJFIX + | JSOPTION_VAROBJFIX #endif #ifdef JSOPTION_XML - | JSOPTION_XML + | JSOPTION_XML #endif - ); + ); + // Success. return init_spidermonkey_extensions(context, self); } - if (gthings_rooted_p) - JS_RemoveRoot(context->js, &(context->gcthings)); - - if (context->rbids) - JS_HashTableDestroy(context->rbids); - - if (context->jsids) - JS_HashTableDestroy(context->jsids); - - if (context->js) - JS_DestroyContext(context->js); - - if (context->runtime) - JS_DestroyRuntime(context->runtime); + if (context->js) JS_DestroyContext(context->js); rb_raise(rb_eRuntimeError, "Failed to initialize SpiderMonkey context"); } @@ -206,27 +90,16 @@ initialize_native(VALUE self, VALUE UNUSED(options)) //// INFRASTRUCTURE BELOW HERE //////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////// -static void deallocate(OurContext* context) +static void deallocate(JohnsonContext* context) { JS_SetContextPrivate(context->js, 0); - - JS_RemoveRoot(context->js, &(context->global)); - JS_RemoveRoot(context->js, &(context->gcthings)); - JS_HashTableDestroy(context->rbids); - JS_HashTableDestroy(context->jsids); - - context->jsids = 0; - context->rbids = 0; - JS_DestroyContext(context->js); - JS_DestroyRuntime(context->runtime); - free(context); } static VALUE allocate(VALUE klass) { - OurContext* context = calloc(1, sizeof(OurContext)); + JohnsonContext* context = calloc(1, sizeof(JohnsonContext)); return Data_Wrap_Struct(klass, 0, deallocate, context); } @@ -241,11 +114,7 @@ void init_Johnson_SpiderMonkey_Context(VALUE spidermonkey) VALUE context = rb_define_class_under(spidermonkey, "Context", rb_cObject); rb_define_alloc_func(context, allocate); - rb_define_private_method(context, "initialize_native", initialize_native, 1); - - rb_define_method(context, "global", global, 0); - rb_define_method(context, "evaluate", evaluate, -1); - rb_define_method(context, "debugger=", set_debugger, 1); + rb_define_private_method(context, "initialize_native", initialize_native, 2); } VALUE Johnson_SpiderMonkey_JSLandProxy() ext/spidermonkey/context.c @@ -7,17 +7,11 @@ typedef struct { JSContext *js; - JSObject *global; - JSRuntime *runtime; - - JSHashTable *jsids; // jsid -> rbid - JSHashTable *rbids; // rbid -> jsid - JSObject *gcthings; jsval ex; // an exception value char msg[MAX_EXCEPTION_MESSAGE_SIZE]; // the 'backup' message -} OurContext; +} JohnsonContext; void init_Johnson_SpiderMonkey_Context(VALUE spidermonkey); VALUE Johnson_SpiderMonkey_JSLandProxy(); ext/spidermonkey/context.h @@ -3,7 +3,7 @@ #include "ruby_land_proxy.h" #include "error.h" -DEFINE_RUBY_WRAPPER(convert_to_ruby, convert_to_ruby, ARGLIST2(context, js_value)) +DEFINE_RUBY_WRAPPER(convert_to_ruby, convert_to_ruby, ARGLIST2(runtime, js_value)) DECLARE_RUBY_WRAPPER(rb_funcall_0, VALUE obj; ID sym; int argc) DEFINE_RUBY_WRAPPER(rb_funcall_0, rb_funcall, ARGLIST3(obj, sym, argc)) @@ -11,37 +11,40 @@ DEFINE_RUBY_WRAPPER(rb_funcall_0, rb_funcall, ARGLIST3(obj, sym, argc)) DECLARE_RUBY_WRAPPER(rb_funcall_2, VALUE obj; ID sym; int argc; VALUE a; VALUE b) DEFINE_RUBY_WRAPPER(rb_funcall_2, rb_funcall, ARGLIST5(obj, sym, argc, a, b)) -static JSBool convert_float_or_bignum_to_js(OurContext* context, VALUE float_or_bignum, jsval* retval) +static JSBool convert_float_or_bignum_to_js(JohnsonRuntime* runtime, VALUE float_or_bignum, jsval* retval) { - return JS_NewDoubleValue(context->js, NUM2DBL(float_or_bignum), retval); + JSContext * context = johnson_get_current_context(runtime); + return JS_NewDoubleValue(context, NUM2DBL(float_or_bignum), retval); } -static JSBool convert_symbol_to_js(OurContext* context, VALUE symbol, jsval* retval) +static JSBool convert_symbol_to_js(JohnsonRuntime* runtime, VALUE symbol, jsval* retval) { + JSContext * context = johnson_get_current_context(runtime); PREPARE_JROOTS(context, 2); VALUE to_s = CALL_RUBY_WRAPPER(rb_funcall_0, symbol, rb_intern("to_s"), 0); - jsval name = STRING_TO_JSVAL(JS_NewStringCopyN(context->js, StringValuePtr(to_s), (unsigned) StringValueLen(to_s))); + jsval name = STRING_TO_JSVAL(JS_NewStringCopyN(context, StringValuePtr(to_s), (unsigned) StringValueLen(to_s))); JROOT(name); // calls Johnson.symbolize(name) in JS-land. See lib/prelude.js jsval nsJohnson; - JCHECK(JS_GetProperty(context->js, context->global, "Johnson", &nsJohnson)); + JCHECK(JS_GetProperty(context, runtime->global, "Johnson", &nsJohnson)); JROOT(nsJohnson); - JCHECK(JS_CallFunctionName(context->js, JSVAL_TO_OBJECT(nsJohnson), "symbolize", 1, &name, retval)); + JCHECK(JS_CallFunctionName(context, JSVAL_TO_OBJECT(nsJohnson), "symbolize", 1, &name, retval)); JRETURN; } -static JSBool convert_regexp_to_js(OurContext* context, VALUE regexp, jsval* retval) +static JSBool convert_regexp_to_js(JohnsonRuntime* runtime, VALUE regexp, jsval* retval) { + JSContext * context = johnson_get_current_context(runtime); VALUE source = rb_funcall(regexp, rb_intern("source"), 0); int options = NUM2INT(rb_funcall(regexp, rb_intern("options"), 0)); - JSObject* obj = JS_NewRegExpObject(context->js, + JSObject* obj = JS_NewRegExpObject(context, StringValuePtr(source), (unsigned) StringValueLen(source), (unsigned) options); @@ -54,8 +57,9 @@ static JSBool convert_regexp_to_js(OurContext* context, VALUE regexp, jsval* ret } } -JSBool convert_to_js(OurContext* context, VALUE ruby, jsval* retval) +JSBool convert_to_js(JohnsonRuntime* runtime, VALUE ruby, jsval* retval) { + JSContext * context = johnson_get_current_context(runtime); switch(TYPE(ruby)) { case T_NIL: @@ -72,7 +76,7 @@ JSBool convert_to_js(OurContext* context, VALUE ruby, jsval* retval) case T_STRING: { - JSString* str = JS_NewStringCopyN(context->js, StringValuePtr(ruby), (unsigned) StringValueLen(ruby)); + JSString* str = JS_NewStringCopyN(context, StringValuePtr(ruby), (unsigned) StringValueLen(ruby)); if (str) { *retval = STRING_TO_JSVAL(str); return JS_TRUE; @@ -87,10 +91,10 @@ JSBool convert_to_js(OurContext* context, VALUE ruby, jsval* retval) case T_FLOAT: case T_BIGNUM: - return convert_float_or_bignum_to_js(context, ruby, retval); + return convert_float_or_bignum_to_js(runtime, ruby, retval); case T_SYMBOL: - return convert_symbol_to_js(context, ruby, retval); + return convert_symbol_to_js(runtime, ruby, retval); case T_CLASS: case T_ARRAY: @@ -99,17 +103,17 @@ JSBool convert_to_js(OurContext* context, VALUE ruby, jsval* retval) case T_FILE: case T_STRUCT: case T_OBJECT: - return make_js_land_proxy(context, ruby, retval); + return make_js_land_proxy(runtime, ruby, retval); case T_REGEXP: - return convert_regexp_to_js(context, ruby, retval); + return convert_regexp_to_js(runtime, ruby, retval); case T_DATA: // HEY! keep T_DATA last for fall-through if (ruby_value_is_proxy(ruby)) - return unwrap_ruby_land_proxy(context, ruby, retval); + return unwrap_ruby_land_proxy(runtime, ruby, retval); // If we can't identify the object, just wrap it - return make_js_land_proxy(context, ruby, retval); + return make_js_land_proxy(runtime, ruby, retval); default: Johnson_Error_raise("unknown ruby type in switch"); @@ -119,8 +123,9 @@ JSBool convert_to_js(OurContext* context, VALUE ruby, jsval* retval) return JS_TRUE; } -VALUE convert_jsstring_to_ruby(OurContext* context, JSString* str) +VALUE convert_js_string_to_ruby(JohnsonRuntime* runtime, JSString* str) { + JSContext * context = johnson_get_current_context(runtime); PREPARE_RUBY_JROOTS(context, 1); JROOT(str); char* bytes = JS_GetStringBytes(str); @@ -128,55 +133,60 @@ VALUE convert_jsstring_to_ruby(OurContext* context, JSString* str) JRETURN_RUBY(rb_str_new(bytes, (signed)JS_GetStringLength(str))); } -static VALUE convert_regexp_to_ruby(OurContext* context, jsval regexp) +static VALUE convert_regexp_to_ruby(JohnsonRuntime* runtime, jsval regexp) { + JSContext * context = johnson_get_current_context(runtime); PREPARE_RUBY_JROOTS(context, 1); JROOT(regexp); - JSRegExp* re = (JSRegExp*)JS_GetPrivate(context->js, JSVAL_TO_OBJECT(regexp)); + JSRegExp* re = (JSRegExp*)JS_GetPrivate(context, JSVAL_TO_OBJECT(regexp)); JRETURN_RUBY(CALL_RUBY_WRAPPER(rb_funcall_2, rb_cRegexp, rb_intern("new"), 2, - convert_jsstring_to_ruby(context, re->source), + convert_js_string_to_ruby(runtime, re->source), INT2NUM(re->flags))); } -static bool js_value_is_regexp(OurContext* context, jsval maybe_regexp) +static bool js_value_is_regexp(JohnsonRuntime* runtime, jsval maybe_regexp) { + JSContext * context = johnson_get_current_context(runtime); PREPARE_RUBY_JROOTS(context, 1); JROOT(maybe_regexp); - JSBool result = JS_InstanceOf(context->js, JSVAL_TO_OBJECT(maybe_regexp), &js_RegExpClass, NULL); + JSBool result = JS_InstanceOf(context, JSVAL_TO_OBJECT(maybe_regexp), &js_RegExpClass, NULL); JRETURN_RUBY(result ? true : false); } -static bool js_value_is_symbol(OurContext* context, jsval maybe_symbol) +static bool js_value_is_symbol(JohnsonRuntime* runtime, jsval maybe_symbol) { jsval nsJohnson, cSymbol; + JSContext * context = johnson_get_current_context(runtime); PREPARE_RUBY_JROOTS(context, 3); JROOT(maybe_symbol); - JCHECK(JS_GetProperty(context->js, context->global, "Johnson", &nsJohnson)); + JCHECK(JS_GetProperty(context, runtime->global, "Johnson", &nsJohnson)); if (!JSVAL_IS_OBJECT(nsJohnson)) JERROR("Unable to retrieve Johnson from JSLand"); JROOT(nsJohnson); - JCHECK(JS_GetProperty(context->js, JSVAL_TO_OBJECT(nsJohnson), "Symbol", &cSymbol)); + JCHECK(JS_GetProperty(context, JSVAL_TO_OBJECT(nsJohnson), "Symbol", &cSymbol)); if (!JSVAL_IS_OBJECT(cSymbol)) JERROR("Unable to retrieve Johnson.Symbol from JSLand"); JROOT(cSymbol); JSBool is_a_symbol; - JCHECK(JS_HasInstance(context->js, JSVAL_TO_OBJECT(cSymbol), maybe_symbol, &is_a_symbol)); + JCHECK(JS_HasInstance(context, JSVAL_TO_OBJECT(cSymbol), maybe_symbol, &is_a_symbol)); JRETURN_RUBY(is_a_symbol != JS_FALSE); } -VALUE convert_to_ruby(OurContext* context, jsval js) +VALUE convert_to_ruby(JohnsonRuntime* runtime, jsval js) { if (JSVAL_NULL == js) return Qnil; + JSContext * context = johnson_get_current_context(runtime); + PREPARE_RUBY_JROOTS(context, 1); - switch (JS_TypeOfValue(context->js, js)) + switch (JS_TypeOfValue(context, js)) { case JSTYPE_VOID: JRETURN_RUBY(Qnil); @@ -185,27 +195,27 @@ VALUE convert_to_ruby(OurContext* context, jsval js) case JSTYPE_OBJECT: JROOT(js); - if (OBJECT_TO_JSVAL(context->global) == js) + if (OBJECT_TO_JSVAL(runtime->global) == js) // global gets special treatment, since the Prelude might not be loaded - JRETURN_RUBY(make_ruby_land_proxy(context, js)); + JRETURN_RUBY(make_ruby_land_proxy(runtime, js)); // this conditional requires the Prelude - if (js_value_is_symbol(context, js)) - JRETURN_RUBY(ID2SYM(rb_intern(JS_GetStringBytes(JS_ValueToString(context->js, js))))); + if (js_value_is_symbol(runtime, js)) + JRETURN_RUBY(ID2SYM(rb_intern(JS_GetStringBytes(JS_ValueToString(context, js))))); - if (js_value_is_proxy(context, js)) - JRETURN_RUBY(unwrap_js_land_proxy(context, js)); + if (js_value_is_proxy(runtime, js)) + JRETURN_RUBY(unwrap_js_land_proxy(runtime, js)); - if (js_value_is_regexp(context, js)) - JRETURN_RUBY(convert_regexp_to_ruby(context, js)); + if (js_value_is_regexp(runtime, js)) + JRETURN_RUBY(convert_regexp_to_ruby(runtime, js)); - JRETURN_RUBY(make_ruby_land_proxy(context, js)); + JRETURN_RUBY(make_ruby_land_proxy(runtime, js)); case JSTYPE_BOOLEAN: JRETURN_RUBY(JSVAL_TRUE == js ? Qtrue : Qfalse); case JSTYPE_STRING: - JRETURN_RUBY(convert_jsstring_to_ruby(context, JSVAL_TO_STRING(js))); + JRETURN_RUBY(convert_js_string_to_ruby(runtime, JSVAL_TO_STRING(js))); case JSTYPE_NUMBER: if (JSVAL_IS_INT(js)) JRETURN_RUBY(INT2FIX(JSVAL_TO_INT(js))); @@ -218,32 +228,35 @@ VALUE convert_to_ruby(OurContext* context, jsval js) JRETURN_RUBY(Qnil); } -NORETURN(void) raise_js_error_in_ruby(OurContext* context) +NORETURN(void) raise_js_error_in_ruby(JohnsonRuntime* runtime) { - if (JS_IsExceptionPending(context->js)) + JSContext * context = johnson_get_current_context(runtime); + JohnsonContext * johnson_context = OUR_CONTEXT(context); + if (JS_IsExceptionPending(context)) { - assert(JS_GetPendingException(context->js, &(context->ex))); - JS_AddNamedRoot(context->js, &(context->ex), "raise_js_error_in_ruby"); - JS_ClearPendingException(context->js); - JS_RemoveRoot(context->js, &(context->ex)); + assert(JS_GetPendingException(context, &(johnson_context->ex))); + JS_AddNamedRoot(context, &(johnson_context->ex), "raise_js_error_in_ruby"); + JS_ClearPendingException(context); + JS_RemoveRoot(context, &(johnson_context->ex)); } - VALUE ruby_context = (VALUE)JS_GetContextPrivate(context->js); - if (context->ex) + VALUE ruby_context = (VALUE)JS_GetContextPrivate(context); + if (johnson_context->ex) rb_funcall(ruby_context, rb_intern("handle_js_exception"), - 1, convert_to_ruby(context, context->ex)); + 1, convert_to_ruby(runtime, johnson_context->ex)); - if (!context->msg) + if (!johnson_context->msg) Johnson_Error_raise("Unknown JavaScript Error"); - Johnson_Error_raise(context->msg); + Johnson_Error_raise(johnson_context->msg); } #define TAG_RAISE 0x6 #define TAG_THROW 0x7 -JSBool report_ruby_error_in_js(OurContext* context, int state, VALUE old_errinfo) +JSBool report_ruby_error_in_js(JohnsonRuntime* runtime, int state, VALUE old_errinfo) { + JSContext * context = johnson_get_current_context(runtime); assert(state); switch (state) { @@ -252,9 +265,9 @@ JSBool report_ruby_error_in_js(OurContext* context, int state, VALUE old_errinfo VALUE local_error = ruby_errinfo; jsval js_err; ruby_errinfo = old_errinfo; - if (!convert_to_js(context, local_error, &js_err)) + if (!convert_to_js(runtime, local_error, &js_err)) return JS_FALSE; - JS_SetPendingException(context->js, js_err); + JS_SetPendingException(context, js_err); return JS_FALSE; } @@ -263,9 +276,9 @@ JSBool report_ruby_error_in_js(OurContext* context, int state, VALUE old_errinfo default: { - JSString* str = JS_NewStringCopyZ(context->js, "Unexpected longjmp from ruby!"); + JSString* str = JS_NewStringCopyZ(context, "Unexpected longjmp from ruby!"); if (str) - JS_SetPendingException(context->js, STRING_TO_JSVAL(str)); + JS_SetPendingException(context, STRING_TO_JSVAL(str)); return JS_FALSE; } } ext/spidermonkey/conversions.c @@ -3,15 +3,16 @@ #include "spidermonkey.h" #include "context.h" +#include "runtime.h" -DECLARE_RUBY_WRAPPER(convert_to_ruby, OurContext* context; jsval js_value) -#define CONVERT_TO_RUBY(context, js) CALL_RUBY_WRAPPER(convert_to_ruby, context, js) +DECLARE_RUBY_WRAPPER(convert_to_ruby, JohnsonRuntime* runtime; jsval js_value) +#define CONVERT_TO_RUBY(runtime, js) CALL_RUBY_WRAPPER(convert_to_ruby, runtime, js) -JSBool convert_to_js(OurContext* context, VALUE ruby, jsval* retval); -VALUE convert_to_ruby(OurContext* context, jsval js); -VALUE convert_jsstring_to_ruby(OurContext* context, JSString* str); +JSBool convert_to_js(JohnsonRuntime* runtime, VALUE ruby, jsval* retval); +VALUE convert_to_ruby(JohnsonRuntime* runtime, jsval js); +VALUE convert_js_string_to_ruby(JohnsonRuntime* runtime, JSString* str); -NORETURN(void raise_js_error_in_ruby(OurContext* context)); -JSBool report_ruby_error_in_js(OurContext* context, int state, VALUE old_errinfo); +NORETURN(void raise_js_error_in_ruby(JohnsonRuntime* runtime)); +JSBool report_ruby_error_in_js(JohnsonRuntime* runtime, int state, VALUE old_errinfo); #endif ext/spidermonkey/conversions.h @@ -8,7 +8,7 @@ static JSTrapStatus interrupt_handler(JSContext *js, JSScript *UNUSED(script), { VALUE self = (VALUE)rb; VALUE rb_bytecode = jsop_to_symbol(*pc); - VALUE rb_rval = convert_to_ruby(OUR_CONTEXT(js), *rval); + VALUE rb_rval = convert_to_ruby(OUR_RUNTIME(js), *rval); return NUM2INT(rb_funcall(self, rb_intern("interrupt_handler"), 2, rb_bytecode, rb_rval)); } @@ -40,7 +40,7 @@ static JSTrapStatus debugger_handler(JSContext *js, JSScript *UNUSED(script), { VALUE self = (VALUE)rb; VALUE rb_bytecode = jsop_to_symbol(*pc); - VALUE rb_rval = convert_to_ruby(OUR_CONTEXT(js), *rval); + VALUE rb_rval = convert_to_ruby(OUR_RUNTIME(js), *rval); return NUM2INT(rb_funcall(self, rb_intern("debugger_handler"), 2, rb_bytecode, rb_rval)); } @@ -82,7 +82,7 @@ static void object_hook(JSContext *js, JSObject *obj, JSBool isNew, void *rb) { VALUE self = (VALUE)rb; - VALUE rb_obj = convert_to_ruby(OUR_CONTEXT(js), OBJECT_TO_JSVAL(obj)); + VALUE rb_obj = convert_to_ruby(OUR_RUNTIME(js), OBJECT_TO_JSVAL(obj)); VALUE rb_is_new = isNew ? Qtrue : Qfalse; rb_funcall(self, rb_intern("object_hook"), 2, rb_obj, rb_is_new); @@ -93,7 +93,7 @@ static JSTrapStatus throw_hook(JSContext *js, JSScript *UNUSED(script), { VALUE self = (VALUE)rb; VALUE rb_bytecode = jsop_to_symbol(*pc); - VALUE rb_rval = convert_to_ruby(OUR_CONTEXT(js), *rval); + VALUE rb_rval = convert_to_ruby(OUR_RUNTIME(js), *rval); return NUM2INT(rb_funcall(self, rb_intern("throw_hook"), 2, rb_bytecode, rb_rval)); } ext/spidermonkey/debugger.c @@ -12,12 +12,13 @@ define_property(JSContext *js_context, JSObject* UNUSED(obj), uintN argc, jsval return JS_DefineProperty(js_context, JSVAL_TO_OBJECT(argv[0]), name, argc > 2 ? argv[2] : JSVAL_VOID, NULL, NULL, flags); } -VALUE init_spidermonkey_extensions(OurContext* context, VALUE self) +VALUE init_spidermonkey_extensions(JohnsonContext* context, VALUE self) { - PREPARE_RUBY_JROOTS(context, 1); + PREPARE_RUBY_JROOTS(context->js, 1); jsval Object; - JCHECK(JS_GetProperty(context->js, context->global, "Object", &Object)); + JSObject * global = JS_GetGlobalObject(context->js); + JCHECK(JS_GetProperty(context->js, global, "Object", &Object)); JROOT(Object); JCHECK(JS_DefineFunction(context->js, JSVAL_TO_OBJECT(Object), ext/spidermonkey/extensions.c @@ -5,6 +5,8 @@ #include "context.h" #include "conversions.h" -VALUE init_spidermonkey_extensions(OurContext* context, VALUE self); +// A context is passed here because there might not be a current context +// for the runtime when the function is called. +VALUE init_spidermonkey_extensions(JohnsonContext* context, VALUE self); #endif ext/spidermonkey/extensions.h @@ -34,12 +34,7 @@ static JSClass OurGlobalClass = { JSCLASS_NO_OPTIONAL_MEMBERS }; -JSObject* create_global_object(OurContext* context) -{ - return JS_NewObject(context->js, &OurGlobalClass, NULL, NULL); -} - JSObject* johnson_create_global_object(JSContext* context) { return JS_NewObject(context, &OurGlobalClass, NULL, NULL); -} \ No newline at end of file +} ext/spidermonkey/global.c @@ -5,8 +5,6 @@ #include "context.h" #include "runtime.h" -JSObject* create_global_object(OurContext* context); // FIXME: remove or rename - // NOTE: one of the FEW places a context should be passed around JSObject* johnson_create_global_object(JSContext* context); ext/spidermonkey/global.h @@ -8,18 +8,28 @@ #define OUR_CONTEXT(js_context) \ ({ \ - OurContext* _context; \ + JohnsonContext* _context; \ const VALUE _ruby_context = (VALUE)JS_GetContextPrivate(js_context); \ - Data_Get_Struct(_ruby_context, OurContext, _context); \ + Data_Get_Struct(_ruby_context, JohnsonContext, _context); \ _context; \ }) +#define OUR_RUNTIME(js_context) \ + ({ \ + JohnsonRuntime* _johnson_runtime; \ + JSRuntime * _js_runtime = JS_GetRuntime(js_context);\ + const VALUE _ruby_runtime = (VALUE)JS_GetRuntimePrivate(_js_runtime); \ + Data_Get_Struct(_ruby_runtime, JohnsonRuntime, _johnson_runtime); \ + _johnson_runtime; \ + }) + + #define _PREPARE_JROOTS(rb, context, cleancount) \ const bool _jroot_ruby = (rb); \ const int _jroot_cleans = (cleancount); \ - void (*_jroot_cleanup[_jroot_cleans])(OurContext*, void*); \ + void (*_jroot_cleanup[_jroot_cleans])(JSContext*, void*); \ void* _jroot_cleanup_data[_jroot_cleans]; \ - OurContext* const _jroot_context = (context); \ + JSContext* const _jroot_context = (context); \ int _jroot_cleanidx = 0; #define PREPARE_JROOTS(context, cleancount) \ @@ -44,7 +54,7 @@ void* const _root = (ptr); \ if (*_name == '\0') \ snprintf(_name, _JROOT_NAMESIZE, "%s[%d]:%s: %s", __FILE__, __LINE__, __func__, (name)); \ - JCHECK(JS_AddNamedRoot(_jroot_context->js, _root, _name)); \ + JCHECK(JS_AddNamedRoot(_jroot_context, _root, _name)); \ JCLEANUP(_JROOT_ROOT, _root); \ } while(0) @@ -59,7 +69,7 @@ for (_jroot_i = _jroot_cleanidx - 1; _jroot_i >= 0; _jroot_i--) \ if (_jroot_cleanup[_jroot_i] == _JROOT_ROOT && _jroot_cleanup_data[_jroot_i] == _jroot_match) \ { \ - JS_RemoveRoot(_jroot_context->js, _jroot_cleanup_data[_jroot_i]); \ + JS_RemoveRoot(_jroot_context, _jroot_cleanup_data[_jroot_i]); \ if (_jroot_i == _jroot_cleanidx - 1) _jroot_cleanidx--; \ _jroot_cleanup[_jroot_i] = NULL; \ } \ @@ -72,7 +82,7 @@ for (_jroot_i = _jroot_cleanidx - 1; _jroot_i >= 0; _jroot_i--) \ { \ if (_jroot_cleanup[_jroot_i] == _JROOT_ROOT) \ - JS_RemoveRoot(_jroot_context->js, _jroot_cleanup_data[_jroot_i]); \ + JS_RemoveRoot(_jroot_context, _jroot_cleanup_data[_jroot_i]); \ else if (_jroot_cleanup[_jroot_i]) \ (_jroot_cleanup[_jroot_i])(_jroot_context, _jroot_cleanup_data[_jroot_i]); \ } \ @@ -85,7 +95,7 @@ if (!(cond)) \ { \ REMOVE_JROOTS; \ - raise_js_error_in_ruby(_jroot_context); \ + raise_js_error_in_ruby(OUR_RUNTIME(_jroot_context)); \ } \ } while (0) @@ -96,7 +106,7 @@ { \ REMOVE_JROOTS; \ if (_jroot_ruby) \ - raise_js_error_in_ruby(_jroot_context); \ + raise_js_error_in_ruby(OUR_RUNTIME(_jroot_context)); \ else \ return JS_FALSE; \ } \ @@ -113,7 +123,7 @@ if (_jroot_ruby) \ rb_jump_tag(_state); \ else \ - return report_ruby_error_in_js(_jroot_context, _state, _old_errinfo); \ + return report_ruby_error_in_js(OUR_RUNTIME(_jroot_context), _state, _old_errinfo); \ } \ _result; \ }) @@ -145,8 +155,8 @@ Johnson_Error_raise(_jroot_msg); \ else \ { \ - JSString* _jroot_err_str = JS_NewStringCopyZ(_jroot_context->js, _jroot_msg); \ - if (_jroot_err_str) JS_SetPendingException(_jroot_context->js, STRING_TO_JSVAL(_jroot_err_str)); \ + JSString* _jroot_err_str = JS_NewStringCopyZ(_jroot_context, _jroot_msg); \ + if (_jroot_err_str) JS_SetPendingException(_jroot_context, STRING_TO_JSVAL(_jroot_err_str)); \ return JS_FALSE; \ } \ } while(0) ext/spidermonkey/jroot.h @@ -58,7 +58,7 @@ static VALUE call_ruby_from_js_invoke(VALUE args) return rb_apply(self, SYM2ID(id), args); } -JSBool call_ruby_from_js_va(OurContext* context, VALUE* result, VALUE self, ID id, int argc, va_list va) +JSBool call_ruby_from_js_va(JohnsonRuntime* runtime, VALUE* result, VALUE self, ID id, int argc, va_list va) { VALUE old_errinfo = ruby_errinfo; VALUE args = rb_ary_new2(argc + 2); @@ -74,27 +74,27 @@ JSBool call_ruby_from_js_va(OurContext* context, VALUE* result, VALUE self, ID i *result = rb_protect(call_ruby_from_js_invoke, args, &state); if (state) - return report_ruby_error_in_js(context, state, old_errinfo); + return report_ruby_error_in_js(runtime, state, old_errinfo); return JS_TRUE; } -JSBool call_ruby_from_js(OurContext* context, jsval* retval, VALUE self, ID id, int argc, ...) +JSBool call_ruby_from_js(JohnsonRuntime* runtime, jsval* retval, VALUE self, ID id, int argc, ...) { VALUE result; va_list va; va_start(va, argc); - JSBool okay = call_ruby_from_js_va(context, &result, self, id, argc, va); + JSBool okay = call_ruby_from_js_va(runtime, &result, self, id, argc, va); va_end(va); if (!okay) return JS_FALSE; - return retval ? convert_to_js(context, result, retval) : JS_TRUE; + return retval ? convert_to_js(runtime, result, retval) : JS_TRUE; } -JSBool call_ruby_from_js2(OurContext* context, VALUE* retval, VALUE self, ID id, int argc, ...) +JSBool call_ruby_from_js2(JohnsonRuntime* runtime, VALUE* retval, VALUE self, ID id, int argc, ...) { va_list va; va_start(va, argc); - JSBool okay = call_ruby_from_js_va(context, retval, self, id, argc, va); + JSBool okay = call_ruby_from_js_va(runtime, retval, self, id, argc, va); va_end(va); return okay; } @@ -163,8 +163,8 @@ static bool respond_to_p(JSContext* js_context, JSObject* obj, char* name) { VALUE ruby_context = (VALUE)JS_GetContextPrivate(js_context); - OurContext* context; - Data_Get_Struct(ruby_context, OurContext, context); + JohnsonContext* context; + Data_Get_Struct(ruby_context, JohnsonContext, context); VALUE self = (VALUE)JS_GetInstancePrivate( context->js, obj, JS_GET_CLASS(context->js, obj), NULL); @@ -179,8 +179,9 @@ static bool respond_to_p(JSContext* js_context, JSObject* obj, char* name) || has_key_p(self, name); } -static jsval evaluate_js_property_expression(OurContext * context, const char * property, jsval* retval) { - return JS_EvaluateScript(context->js, context->global, +static jsval evaluate_js_property_expression(JohnsonRuntime * runtime, const char * property, jsval* retval) { + JSContext * context = johnson_get_current_context(runtime); + return JS_EvaluateScript(context, runtime->global, property, strlen(property), "johnson:evaluate_js_property_expression", 1, retval); } @@ -193,10 +194,14 @@ static JSBool get(JSContext* js_context, JSObject* obj, jsval id, jsval* retval) // get our struct, which is embedded in ruby_context - OurContext* context; - Data_Get_Struct(ruby_context, OurContext, context); + JohnsonContext* context; + JohnsonRuntime* runtime; + Data_Get_Struct(ruby_context, JohnsonContext, context); - PREPARE_JROOTS(context, 1); + VALUE ruby_runtime = (VALUE)JS_GetRuntimePrivate(JS_GetRuntime(js_context)); + Data_Get_Struct(ruby_runtime, JohnsonRuntime, runtime); + + PREPARE_JROOTS(js_context, 1); JROOT(id); // get the Ruby object that backs this proxy @@ -209,7 +214,7 @@ static JSBool get(JSContext* js_context, JSObject* obj, jsval id, jsval* retval) { if (indexable_p(self)) { VALUE idx = INT2FIX(JSVAL_TO_INT(id)); - JCHECK(call_ruby_from_js(context, retval, self, rb_intern("[]"), 1, idx)); + JCHECK(call_ruby_from_js(runtime, retval, self, rb_intern("[]"), 1, idx)); } JRETURN; @@ -221,7 +226,7 @@ static JSBool get(JSContext* js_context, JSObject* obj, jsval id, jsval* retval) // FIXME: we should probably just JS_DefineProperty this, and it shouldn't be enumerable if (!strcasecmp("__iterator__", name)) { - JCHECK(evaluate_js_property_expression(context, "Johnson.Generator.create", retval)); + JCHECK(evaluate_js_property_expression(runtime, "Johnson.Generator.create", retval)); } // if the Ruby object has a dynamic js property with a key @@ -230,7 +235,7 @@ static JSBool get(JSContext* js_context, JSObject* obj, jsval id, jsval* retval) else if (autovivified_p(ruby_context, self, name)) { - JCHECK(call_ruby_from_js(context, retval, Johnson_SpiderMonkey_JSLandProxy(), + JCHECK(call_ruby_from_js(runtime, retval, Johnson_SpiderMonkey_JSLandProxy(), rb_intern("autovivified"), 2, self, rb_str_new2(name))); } @@ -239,14 +244,14 @@ static JSBool get(JSContext* js_context, JSObject* obj, jsval id, jsval* retval) else if (const_p(self, name)) { - JCHECK(call_ruby_from_js(context, retval, self, rb_intern("const_get"), + JCHECK(call_ruby_from_js(runtime, retval, self, rb_intern("const_get"), 1, ID2SYM(ruby_id))); } // otherwise, if it's a global, return the global else if (global_p(name)) { - JCHECK(convert_to_js(context, rb_gv_get(name), retval)); + JCHECK(convert_to_js(runtime, rb_gv_get(name), retval)); } // otherwise, if the Ruby object has a an attribute method matching @@ -254,7 +259,7 @@ static JSBool get(JSContext* js_context, JSObject* obj, jsval id, jsval* retval) else if (attribute_p(self, name)) { - JCHECK(call_ruby_from_js(context, retval, self, ruby_id, 0)); + JCHECK(call_ruby_from_js(runtime, retval, self, ruby_id, 0)); } // otherwise, if the Ruby object quacks sorta like a hash (it responds to @@ -262,7 +267,7 @@ static JSBool get(JSContext* js_context, JSObject* obj, jsval id, jsval* retval) else if (has_key_p(self, name)) { - JCHECK(call_ruby_from_js(context, retval, self, rb_intern("[]"), 1, rb_str_new2(name))); + JCHECK(call_ruby_from_js(runtime, retval, self, rb_intern("[]"), 1, rb_str_new2(name))); } // otherwise, it's a method being accessed as a property, which means @@ -273,7 +278,7 @@ static JSBool get(JSContext* js_context, JSObject* obj, jsval id, jsval* retval) else if (method_p(self, name)) { - JCHECK(call_ruby_from_js(context, retval, self, rb_intern("method"), 1, rb_str_new2(name))); + JCHECK(call_ruby_from_js(runtime, retval, self, rb_intern("method"), 1, rb_str_new2(name))); } // else it's undefined (JS_VOID) by default @@ -284,7 +289,7 @@ static JSBool get(JSContext* js_context, JSObject* obj, jsval id, jsval* retval) static JSBool get_and_destroy_resolved_property( JSContext* js_context, JSObject* obj, jsval id, jsval* retval) { - PREPARE_JROOTS(OUR_CONTEXT(js_context), 1); + PREPARE_JROOTS(js_context, 1); JROOT(id); char* name = JS_GetStringBytes(JSVAL_TO_STRING(id)); JCHECK(JS_DeleteProperty(js_context, obj, name)); @@ -296,10 +301,14 @@ static JSBool set(JSContext* js_context, JSObject* obj, jsval id, jsval* value) { VALUE ruby_context = (VALUE)JS_GetContextPrivate(js_context); - OurContext* context; - Data_Get_Struct(ruby_context, OurContext, context); + JohnsonContext* context; + JohnsonRuntime* runtime; + Data_Get_Struct(ruby_context, JohnsonContext, context); + + VALUE ruby_runtime = (VALUE)JS_GetRuntimePrivate(JS_GetRuntime(js_context)); + Data_Get_Struct(ruby_runtime, JohnsonRuntime, runtime); - PREPARE_JROOTS(context, 2); + PREPARE_JROOTS(js_context, 2); JROOT(id); JROOT_PTR(value); @@ -312,46 +321,46 @@ static JSBool set(JSContext* js_context, JSObject* obj, jsval id, jsval* value) if (indexable_p(self)) { VALUE idx = INT2FIX(JSVAL_TO_INT(id)); - VALUE val = CONVERT_TO_RUBY(context, *value); + VALUE val = CONVERT_TO_RUBY(runtime, *value); - JCHECK(call_ruby_from_js(context, NULL, self, rb_intern("[]="), 2, idx, val)); + JCHECK(call_ruby_from_js(runtime, NULL, self, rb_intern("[]="), 2, idx, val)); } JRETURN; } - VALUE ruby_key = CONVERT_TO_RUBY(context, id); - VALUE ruby_value = CONVERT_TO_RUBY(context, *value); + VALUE ruby_key = CONVERT_TO_RUBY(runtime, id); + VALUE ruby_value = CONVERT_TO_RUBY(runtime, *value); VALUE setter = rb_str_append(rb_str_new3(ruby_key), rb_str_new2("=")); VALUE setter_id = rb_intern(StringValueCStr(setter)); VALUE settable_p, indexable_p; - JCHECK(call_ruby_from_js2(context, &settable_p, self, rb_intern("respond_to?"), 1, ID2SYM(setter_id))); - JCHECK(call_ruby_from_js2(context, &indexable_p, self, rb_intern("respond_to?"), 1, ID2SYM(rb_intern("[]=")))); + JCHECK(call_ruby_from_js2(runtime, &settable_p, self, rb_intern("respond_to?"), 1, ID2SYM(setter_id))); + JCHECK(call_ruby_from_js2(runtime, &indexable_p, self, rb_intern("respond_to?"), 1, ID2SYM(rb_intern("[]=")))); if (settable_p) { VALUE method, arity; - JCHECK(call_ruby_from_js2(context, &method, self, rb_intern("method"), 1, ID2SYM(setter_id))); - JCHECK(call_ruby_from_js2(context, &arity, method, rb_intern("arity"), 0)); + JCHECK(call_ruby_from_js2(runtime, &method, self, rb_intern("method"), 1, ID2SYM(setter_id))); + JCHECK(call_ruby_from_js2(runtime, &arity, method, rb_intern("arity"), 0)); // if the Ruby object has a 1-arity method named "property=", // call it with the converted value if (NUM2INT(arity) == 1) - JCHECK(call_ruby_from_js(context, NULL, self, setter_id, 1, ruby_value)); + JCHECK(call_ruby_from_js(runtime, NULL, self, setter_id, 1, ruby_value)); } else if(indexable_p) { // otherwise, if the Ruby object quacks sorta like a hash for assignment // (it responds to "[]="), assign it by key - JCHECK(call_ruby_from_js(context, NULL, self, rb_intern("[]="), 2, ruby_key, ruby_value)); + JCHECK(call_ruby_from_js(runtime, NULL, self, rb_intern("[]="), 2, ruby_key, ruby_value)); } else { - JCHECK(call_ruby_from_js(context, NULL, Johnson_SpiderMonkey_JSLandProxy(), rb_intern("autovivify"), + JCHECK(call_ruby_from_js(runtime, NULL, Johnson_SpiderMonkey_JSLandProxy(), rb_intern("autovivify"), 3, self, ruby_key, ruby_value)); } @@ -362,19 +371,23 @@ static JSBool construct(JSContext* js_context, JSObject* UNUSED(obj), uintN argc { VALUE ruby_context = (VALUE)JS_GetContextPrivate(js_context); - OurContext* context; - Data_Get_Struct(ruby_context, OurContext, context); + JohnsonContext* context; + JohnsonRuntime* runtime; + Data_Get_Struct(ruby_context, JohnsonContext, context); - PREPARE_JROOTS(context, 0); + VALUE ruby_runtime = (VALUE)JS_GetRuntimePrivate(JS_GetRuntime(js_context)); + Data_Get_Struct(ruby_runtime, JohnsonRuntime, runtime); - VALUE klass = CONVERT_TO_RUBY(context, JS_ARGV_CALLEE(argv)); + PREPARE_JROOTS(js_context, 0); + + VALUE klass = CONVERT_TO_RUBY(runtime, JS_ARGV_CALLEE(argv)); VALUE args = rb_ary_new(); uintN i; for (i = 0; i < argc; ++i) - rb_ary_push(args, CONVERT_TO_RUBY(context, argv[i])); + rb_ary_push(args, CONVERT_TO_RUBY(runtime, argv[i])); - JCHECK(call_ruby_from_js(context, retval, Johnson_SpiderMonkey_JSLandProxy(), + JCHECK(call_ruby_from_js(runtime, retval, Johnson_SpiderMonkey_JSLandProxy(), rb_intern("send_with_possible_block"), 3, klass, ID2SYM(rb_intern("new")), args)); JRETURN; } @@ -383,10 +396,10 @@ static JSBool resolve(JSContext *js_context, JSObject *obj, jsval id, uintN UNUS { VALUE ruby_context = (VALUE)JS_GetContextPrivate(js_context); - OurContext* context; - Data_Get_Struct(ruby_context, OurContext, context); + JohnsonContext* context; + Data_Get_Struct(ruby_context, JohnsonContext, context); - PREPARE_JROOTS(context, 1); + PREPARE_JROOTS(js_context, 1); JROOT(id); char* name = JS_GetStringBytes(JS_ValueToString(js_context, id)); @@ -406,14 +419,18 @@ static JSBool to_string(JSContext* js_context, JSObject* obj, uintN UNUSED(argc) { VALUE ruby_context = (VALUE)JS_GetContextPrivate(js_context); - OurContext* context; - Data_Get_Struct(ruby_context, OurContext, context); + JohnsonContext* context; + JohnsonRuntime* runtime; + Data_Get_Struct(ruby_context, JohnsonContext, context); + + VALUE ruby_runtime = (VALUE)JS_GetRuntimePrivate(JS_GetRuntime(js_context)); + Data_Get_Struct(ruby_runtime, JohnsonRuntime, runtime); - PREPARE_JROOTS(context, 0); + PREPARE_JROOTS(js_context, 0); VALUE self = (VALUE)JS_GetInstancePrivate(context->js, obj, JS_GET_CLASS(context->js, obj), NULL); - JCHECK(call_ruby_from_js(context, retval, self, rb_intern("to_s"), 0)); + JCHECK(call_ruby_from_js(runtime, retval, self, rb_intern("to_s"), 0)); JRETURN; } @@ -421,14 +438,18 @@ static JSBool to_array(JSContext* js_context, JSObject* obj, uintN UNUSED(argc), { VALUE ruby_context = (VALUE)JS_GetContextPrivate(js_context); - OurContext* context; - Data_Get_Struct(ruby_context, OurContext, context); + JohnsonContext* context; + JohnsonRuntime* runtime; + Data_Get_Struct(ruby_context, JohnsonContext, context); - PREPARE_JROOTS(context, 0); + VALUE ruby_runtime = (VALUE)JS_GetRuntimePrivate(JS_GetRuntime(js_context)); + Data_Get_Struct(ruby_runtime, JohnsonRuntime, runtime); + + PREPARE_JROOTS(js_context, 0); VALUE self = (VALUE)JS_GetInstancePrivate(context->js, obj, JS_GET_CLASS(context->js, obj), NULL); - JCHECK(call_ruby_from_js(context, retval, self, rb_intern("to_a"), 0)); + JCHECK(call_ruby_from_js(runtime, retval, self, rb_intern("to_a"), 0)); JRETURN; } @@ -436,10 +457,14 @@ static JSBool method_missing(JSContext* js_context, JSObject* obj, uintN argc, j { VALUE ruby_context = (VALUE)JS_GetContextPrivate(js_context); - OurContext* context; - Data_Get_Struct(ruby_context, OurContext, context); + JohnsonContext* context; + JohnsonRuntime* runtime; + Data_Get_Struct(ruby_context, JohnsonContext, context); + + VALUE ruby_runtime = (VALUE)JS_GetRuntimePrivate(JS_GetRuntime(js_context)); + Data_Get_Struct(ruby_runtime, JohnsonRuntime, runtime); - PREPARE_JROOTS(context, 0); + PREPARE_JROOTS(js_context, 0); VALUE self = (VALUE)JS_GetInstancePrivate(context->js, obj, JS_GET_CLASS(context->js, obj), NULL); @@ -450,9 +475,9 @@ static JSBool method_missing(JSContext* js_context, JSObject* obj, uintN argc, j // FIXME: this is horrible and lazy, to_a comes from enumerable on proxy (argv[1] is a JSArray) VALUE args; - JCHECK(call_ruby_from_js2(context, &args, CONVERT_TO_RUBY(context, argv[1]), rb_intern("to_a"), 0)); + JCHECK(call_ruby_from_js2(runtime, &args, CONVERT_TO_RUBY(runtime, argv[1]), rb_intern("to_a"), 0)); - JCHECK(call_ruby_from_js(context, retval, Johnson_SpiderMonkey_JSLandProxy(), + JCHECK(call_ruby_from_js(runtime, retval, Johnson_SpiderMonkey_JSLandProxy(), rb_intern("send_with_possible_block"), 3, self, ID2SYM(ruby_id), args)); JRETURN; @@ -462,10 +487,14 @@ static JSBool call(JSContext* js_context, JSObject* UNUSED(obj), uintN argc, jsv { VALUE ruby_context = (VALUE)JS_GetContextPrivate(js_context); - OurContext* context; - Data_Get_Struct(ruby_context, OurContext, context); + JohnsonContext* context; + JohnsonRuntime* runtime; + Data_Get_Struct(ruby_context, JohnsonContext, context); - PREPARE_JROOTS(context, 0); + VALUE ruby_runtime = (VALUE)JS_GetRuntimePrivate(JS_GetRuntime(js_context)); + Data_Get_Struct(ruby_runtime, JohnsonRuntime, runtime); + + PREPARE_JROOTS(js_context, 0); VALUE self = (VALUE)JS_GetInstancePrivate(context->js, JSVAL_TO_OBJECT(JS_ARGV_CALLEE(argv)), &JSLandCallableProxyClass, NULL); @@ -473,29 +502,32 @@ static JSBool call(JSContext* js_context, JSObject* UNUSED(obj), uintN argc, jsv uintN i; for (i = 0; i < argc; ++i) - rb_ary_push(args, CONVERT_TO_RUBY(context, argv[i])); + rb_ary_push(args, CONVERT_TO_RUBY(runtime, argv[i])); - JCHECK(call_ruby_from_js(context, retval, Johnson_SpiderMonkey_JSLandProxy(), + JCHECK(call_ruby_from_js(runtime, retval, Johnson_SpiderMonkey_JSLandProxy(), rb_intern("send_with_possible_block"), 3, self, ID2SYM(rb_intern("call")), args)); JRETURN; } -bool js_value_is_proxy(OurContext* MAYBE_UNUSED(context), jsval maybe_proxy) +bool js_value_is_proxy(JohnsonRuntime* MAYBE_UNUSED(runtime), jsval maybe_proxy) { - JSClass* klass = JS_GET_CLASS(context->js, JSVAL_TO_OBJECT(maybe_proxy)); + JSClass* klass = JS_GET_CLASS( + johnson_get_current_context(runtime), + JSVAL_TO_OBJECT(maybe_proxy)); return &JSLandProxyClass == klass || &JSLandClassProxyClass == klass || &JSLandCallableProxyClass == klass; } -VALUE unwrap_js_land_proxy(OurContext* context, jsval proxy) +VALUE unwrap_js_land_proxy(JohnsonRuntime* runtime, jsval proxy) { VALUE value; JSObject *proxy_object = JSVAL_TO_OBJECT(proxy); + JSContext * context = johnson_get_current_context(runtime); - value = (VALUE)JS_GetInstancePrivate(context->js, proxy_object, - JS_GET_CLASS(context->js, proxy_object), NULL); + value = (VALUE)JS_GetInstancePrivate(context, proxy_object, + JS_GET_CLASS(context, proxy_object), NULL); return value; } @@ -506,27 +538,32 @@ static void finalize(JSContext* js_context, JSObject* obj) if (ruby_context) { - OurContext* context; - Data_Get_Struct(ruby_context, OurContext, context); + JohnsonContext* context; + JohnsonRuntime* runtime; + Data_Get_Struct(ruby_context, JohnsonContext, context); + + VALUE ruby_runtime = (VALUE)JS_GetRuntimePrivate(JS_GetRuntime(js_context)); + Data_Get_Struct(ruby_runtime, JohnsonRuntime, runtime); VALUE self = (VALUE)JS_GetInstancePrivate(context->js, obj, JS_GET_CLASS(context->js, obj), NULL); // remove the proxy OID from the id map - JS_HashTableRemove(context->rbids, (void *)rb_obj_id(self)); + JS_HashTableRemove(runtime->rbids, (void *)rb_obj_id(self)); // free up the ruby value for GC - call_ruby_from_js(context, NULL, ruby_context, rb_intern("remove_gcthing"), 1, self); + call_ruby_from_js(runtime, NULL, ruby_context, rb_intern("remove_gcthing"), 1, self); } } -JSBool make_js_land_proxy(OurContext* context, VALUE value, jsval* retval) +JSBool make_js_land_proxy(JohnsonRuntime* runtime, VALUE value, jsval* retval) { - jsid id = (jsid)JS_HashTableLookup(context->rbids, (void *)rb_obj_id(value)); + JSContext * context = johnson_get_current_context(runtime); + jsid id = (jsid)JS_HashTableLookup(runtime->rbids, (void *)rb_obj_id(value)); if (id) { - return JS_IdToValue(context->js, id, retval); + return JS_IdToValue(context, id, retval); } else { @@ -548,26 +585,26 @@ JSBool make_js_land_proxy(OurContext* context, VALUE value, jsval* retval) if (callable_p) klass = &JSLandCallableProxyClass; - JCHECK((jsobj = JS_NewObject(context->js, klass, NULL, NULL))); + JCHECK((jsobj = JS_NewObject(context, klass, NULL, NULL))); JROOT(jsobj); - JCHECK(JS_SetPrivate(context->js, jsobj, (void*)value)); + JCHECK(JS_SetPrivate(context, jsobj, (void*)value)); - JCHECK(JS_DefineFunction(context->js, jsobj, "__noSuchMethod__", method_missing, 2, 0)); + JCHECK(JS_DefineFunction(context, jsobj, "__noSuchMethod__", method_missing, 2, 0)); - JCHECK(JS_DefineFunction(context->js, jsobj, "toArray", to_array, 0, 0)); - JCHECK(JS_DefineFunction(context->js, jsobj, "toString", to_string, 0, 0)); + JCHECK(JS_DefineFunction(context, jsobj, "toArray", to_array, 0, 0)); + JCHECK(JS_DefineFunction(context, jsobj, "toString", to_string, 0, 0)); *retval = OBJECT_TO_JSVAL(jsobj); jsval newid; - JCHECK(JS_ValueToId(context->js, *retval, &newid)); + JCHECK(JS_ValueToId(context, *retval, &newid)); // put the proxy OID in the id map - JCHECK(JS_HashTableAdd(context->rbids, (void *)rb_obj_id(value), (void *)newid)); + JCHECK(JS_HashTableAdd(runtime->rbids, (void *)rb_obj_id(value), (void *)newid)); // root the ruby value for GC - VALUE ruby_context = (VALUE)JS_GetContextPrivate(context->js); + VALUE ruby_context = (VALUE)JS_GetContextPrivate(context); rb_funcall(ruby_context, rb_intern("add_gcthing"), 1, value); JRETURN; ext/spidermonkey/js_land_proxy.c @@ -2,11 +2,11 @@ #define JOHNSON_SPIDERMONKEY_JS_LAND_PROXY_H #include "spidermonkey.h" -#include "context.h" +#include "runtime.h" -bool js_value_is_proxy(OurContext* context, jsval maybe_proxy); -VALUE unwrap_js_land_proxy(OurContext* context, jsval proxy); -JSBool make_js_land_proxy(OurContext* context, VALUE value, jsval* retval); +bool js_value_is_proxy(JohnsonRuntime* runtime, jsval maybe_proxy); +VALUE unwrap_js_land_proxy(JohnsonRuntime* runtime, jsval proxy); +JSBool make_js_land_proxy(JohnsonRuntime* runtime, VALUE value, jsval* retval); #include "node.h" typedef struct { ext/spidermonkey/js_land_proxy.h @@ -12,24 +12,26 @@ static VALUE proxy_class = Qnil; static JSBool get_jsval_for_proxy(RubyLandProxy* proxy, jsval* jv) { - PREPARE_JROOTS(proxy->context, 0); + JSContext * context = johnson_get_current_context(proxy->runtime); + PREPARE_JROOTS(context, 0); // FIXME: this is totally lame char global_key[10]; - sprintf(global_key, "%x", (int)proxy->context->global); + sprintf(global_key, "%x", (int)proxy->runtime->global); if (0 == strcmp(global_key, proxy->key)) { - *jv = OBJECT_TO_JSVAL(proxy->context->global); + *jv = OBJECT_TO_JSVAL(proxy->runtime->global); JRETURN; } - JCHECK(JS_GetProperty(proxy->context->js, proxy->context->gcthings, proxy->key, jv)); + JCHECK(JS_GetProperty(context, proxy->runtime->gcthings, proxy->key, jv)); JRETURN; } -static VALUE call_js_function_value(OurContext* context, jsval target, jsval function, int argc, VALUE* argv) +static VALUE call_js_function_value(JohnsonRuntime* runtime, jsval target, jsval function, int argc, VALUE* argv) { + JSContext * context = johnson_get_current_context(runtime); PREPARE_RUBY_JROOTS(context, argc + 2); JROOT(target); @@ -43,14 +45,14 @@ static VALUE call_js_function_value(OurContext* context, jsval target, jsval fun int i; for(i = 0; i < argc; ++i) { - JCHECK(convert_to_js(context, argv[i], &(args[i]))); + JCHECK(convert_to_js(runtime, argv[i], &(args[i]))); JROOT(args[i]); } - JCHECK(JS_CallFunctionValue(context->js, + JCHECK(JS_CallFunctionValue(context, JSVAL_TO_OBJECT(target), function, (unsigned) argc, args, &result)); - JRETURN_RUBY(CONVERT_TO_RUBY(context, result)); + JRETURN_RUBY(CONVERT_TO_RUBY(runtime, result)); } /* @@ -65,7 +67,8 @@ get(VALUE self, VALUE name) RubyLandProxy* proxy; Data_Get_Struct(self, RubyLandProxy, proxy); - PREPARE_RUBY_JROOTS(proxy->context, 1); + JSContext * context = johnson_get_current_context(proxy->runtime); + PREPARE_RUBY_JROOTS(context, 1); jsval proxy_value; JCHECK(get_jsval_for_proxy(proxy, &proxy_value)); @@ -75,17 +78,17 @@ get(VALUE self, VALUE name) switch(TYPE(name)) { case T_FIXNUM: - JCHECK(JS_GetElement(proxy->context->js, + JCHECK(JS_GetElement(context, JSVAL_TO_OBJECT(proxy_value), NUM2INT(name), &js_value)); break; default: Check_Type(name, T_STRING); - JCHECK(JS_GetProperty(proxy->context->js, + JCHECK(JS_GetProperty(context, JSVAL_TO_OBJECT(proxy_value), StringValueCStr(name), &js_value)); break; } - JRETURN_RUBY(CONVERT_TO_RUBY(proxy->context, js_value)); + JRETURN_RUBY(CONVERT_TO_RUBY(proxy->runtime, js_value)); } /* @@ -99,26 +102,27 @@ set(VALUE self, VALUE name, VALUE value) { RubyLandProxy* proxy; Data_Get_Struct(self, RubyLandProxy, proxy); + JSContext * context = johnson_get_current_context(proxy->runtime); - PREPARE_RUBY_JROOTS(proxy->context, 2); + PREPARE_RUBY_JROOTS(context, 2); jsval proxy_value; JCHECK(get_jsval_for_proxy(proxy, &proxy_value)); JROOT(proxy_value); jsval js_value; - JCHECK(convert_to_js(proxy->context, value, &js_value)); + JCHECK(convert_to_js(proxy->runtime, value, &js_value)); JROOT(js_value); switch(TYPE(name)) { case T_FIXNUM: - JCHECK(JS_SetElement(proxy->context->js, + JCHECK(JS_SetElement(context, JSVAL_TO_OBJECT(proxy_value), NUM2INT(name), &js_value)); break; default: Check_Type(name, T_STRING); - JCHECK(JS_SetProperty(proxy->context->js, + JCHECK(JS_SetProperty(context, JSVAL_TO_OBJECT(proxy_value), StringValueCStr(name), &js_value)); break; } @@ -137,10 +141,11 @@ function_p(VALUE self) { RubyLandProxy* proxy; Data_Get_Struct(self, RubyLandProxy, proxy); - PREPARE_RUBY_JROOTS(proxy->context, 0); + JSContext * context = johnson_get_current_context(proxy->runtime); + PREPARE_RUBY_JROOTS(context, 0); jsval proxy_value; JCHECK(get_jsval_for_proxy(proxy, &proxy_value)); - JRETURN_RUBY(JS_TypeOfValue(proxy->context->js, proxy_value) == JSTYPE_FUNCTION ? Qtrue : Qfalse); + JRETURN_RUBY(JS_TypeOfValue(context, proxy_value) == JSTYPE_FUNCTION ? Qtrue : Qfalse); } /* @@ -155,7 +160,8 @@ respond_to_p(VALUE self, VALUE sym) RubyLandProxy* proxy; Data_Get_Struct(self, RubyLandProxy, proxy); - PREPARE_RUBY_JROOTS(proxy->context, 2); + JSContext * context = johnson_get_current_context(proxy->runtime); + PREPARE_RUBY_JROOTS(context, 2); char* name = rb_id2name(SYM2ID(sym)); @@ -170,10 +176,10 @@ respond_to_p(VALUE self, VALUE sym) JSObject *obj; JSBool found; - JCHECK(JS_ValueToObject(proxy->context->js, proxy_value, &obj)); + JCHECK(JS_ValueToObject(context, proxy_value, &obj)); JROOT(obj); - JCHECK(JS_HasProperty(proxy->context->js, obj, name, &found)); + JCHECK(JS_HasProperty(context, obj, name, &found)); JRETURN_RUBY(found ? Qtrue : CALL_RUBY_WRAPPER(rb_call_super, 1, &sym)); } @@ -195,23 +201,24 @@ native_call(int argc, VALUE* argv, VALUE self) RubyLandProxy* proxy; Data_Get_Struct(self, RubyLandProxy, proxy); + JSContext * context = johnson_get_current_context(proxy->runtime); - PREPARE_RUBY_JROOTS(proxy->context, 1); + PREPARE_RUBY_JROOTS(context, 1); jsval proxy_value; JCHECK(get_jsval_for_proxy(proxy, &proxy_value)); JROOT(proxy_value); jsval global; - JCHECK(convert_to_js(proxy->context, argv[0], &global)); + JCHECK(convert_to_js(proxy->runtime, argv[0], &global)); - JRETURN_RUBY(call_js_function_value(proxy->context, global, proxy_value, argc - 1, &(argv[1]))); + JRETURN_RUBY(call_js_function_value(proxy->runtime, global, proxy_value, argc - 1, &(argv[1]))); } static void -destroy_id_array(OurContext* context, void* data) +destroy_id_array(JSContext* context, void* data) { - JS_DestroyIdArray(context->js, (JSIdArray*)data); + JS_DestroyIdArray(context, (JSIdArray*)data); } /* @@ -225,8 +232,9 @@ each(VALUE self) { RubyLandProxy* proxy; Data_Get_Struct(self, RubyLandProxy, proxy); + JSContext * context = johnson_get_current_context(proxy->runtime); - PREPARE_RUBY_JROOTS(proxy->context, 5); + PREPARE_RUBY_JROOTS(context, 5); jsval proxy_value; JCHECK(get_jsval_for_proxy(proxy, &proxy_value)); @@ -236,23 +244,23 @@ each(VALUE self) JROOT(value); // arrays behave like you'd expect, indexes in order - if (JS_IsArrayObject(proxy->context->js, value)) + if (JS_IsArrayObject(context, value)) { jsuint length; - JCHECK(JS_GetArrayLength(proxy->context->js, value, &length)); + JCHECK(JS_GetArrayLength(context, value, &length)); jsuint i = 0; for (i = 0; i < length; ++i) { jsval element; - JCHECK(JS_GetElement(proxy->context->js, value, (signed) i, &element)); - CALL_RUBY_WRAPPER(rb_yield, convert_to_ruby(proxy->context, element)); + JCHECK(JS_GetElement(context, value, (signed) i, &element)); + CALL_RUBY_WRAPPER(rb_yield, convert_to_ruby(proxy->runtime, element)); } } else { // not an array? behave like each on Hash; yield [key, value] - JSIdArray* ids = JS_Enumerate(proxy->context->js, value); + JSIdArray* ids = JS_Enumerate(context, value); JCHECK(ids); JCLEANUP(destroy_id_array, ids); @@ -262,25 +270,25 @@ each(VALUE self) { jsval js_key, js_value; - JCHECK(JS_IdToValue(proxy->context->js, ids->vector[i], &js_key)); + JCHECK(JS_IdToValue(context, ids->vector[i], &js_key)); JROOT(js_key); if (JSVAL_IS_STRING(js_key)) { // regular properties have string keys - JCHECK(JS_GetProperty(proxy->context->js, value, + JCHECK(JS_GetProperty(context, value, JS_GetStringBytes(JSVAL_TO_STRING(js_key)), &js_value)); } else { // it's a numeric property, use array access - JCHECK(JS_GetElement(proxy->context->js, value, + JCHECK(JS_GetElement(context, value, JSVAL_TO_INT(js_key), &js_value)); } JROOT(js_value); - VALUE key = CONVERT_TO_RUBY(proxy->context, js_key); - VALUE value = CONVERT_TO_RUBY(proxy->context, js_value); + VALUE key = CONVERT_TO_RUBY(proxy->runtime, js_key); + VALUE value = CONVERT_TO_RUBY(proxy->runtime, js_value); CALL_RUBY_WRAPPER(rb_yield, rb_ary_new3(2, key, value)); @@ -303,8 +311,9 @@ length(VALUE self) { RubyLandProxy* proxy; Data_Get_Struct(self, RubyLandProxy, proxy); + JSContext * context = johnson_get_current_context(proxy->runtime); - PREPARE_RUBY_JROOTS(proxy->context, 2); + PREPARE_RUBY_JROOTS(context, 2); jsval proxy_value; JCHECK(get_jsval_for_proxy(proxy, &proxy_value)); @@ -313,20 +322,20 @@ length(VALUE self) JSObject* value = JSVAL_TO_OBJECT(proxy_value); JROOT(value); - if (JS_IsArrayObject(proxy->context->js, value)) + if (JS_IsArrayObject(context, value)) { jsuint length; - JCHECK(JS_GetArrayLength(proxy->context->js, value, &length)); + JCHECK(JS_GetArrayLength(context, value, &length)); JRETURN_RUBY(INT2FIX(length)); } else { - JSIdArray* ids = JS_Enumerate(proxy->context->js, value); + JSIdArray* ids = JS_Enumerate(context, value); JCHECK(ids); VALUE length = INT2FIX(ids->length); - JS_DestroyIdArray(proxy->context->js, ids); + JS_DestroyIdArray(context, ids); JRETURN_RUBY(length); } @@ -334,16 +343,16 @@ length(VALUE self) /* * call-seq: - * context + * runtime * - * Returns context. + * Returns runtime. */ static VALUE -context(VALUE self) +runtime(VALUE self) { RubyLandProxy* proxy; Data_Get_Struct(self, RubyLandProxy, proxy); - return (VALUE)JS_GetContextPrivate(proxy->context->js); + return (VALUE)JS_GetRuntimePrivate(proxy->runtime->js); } /* @@ -359,8 +368,9 @@ function_property_p(VALUE self, VALUE name) RubyLandProxy* proxy; Data_Get_Struct(self, RubyLandProxy, proxy); + JSContext * context = johnson_get_current_context(proxy->runtime); - PREPARE_RUBY_JROOTS(proxy->context, 2); + PREPARE_RUBY_JROOTS(context, 2); jsval proxy_value; JCHECK(get_jsval_for_proxy(proxy, &proxy_value)); @@ -368,12 +378,12 @@ function_property_p(VALUE self, VALUE name) jsval js_value; - JCHECK(JS_GetProperty(proxy->context->js, + JCHECK(JS_GetProperty(context, JSVAL_TO_OBJECT(proxy_value), StringValueCStr(name), &js_value)); JROOT(js_value); - JSType type = JS_TypeOfValue(proxy->context->js, js_value); + JSType type = JS_TypeOfValue(context, js_value); JRETURN_RUBY(type == JSTYPE_FUNCTION ? Qtrue : Qfalse); } @@ -389,11 +399,12 @@ call_function_property(int argc, VALUE* argv, VALUE self) { RubyLandProxy* proxy; Data_Get_Struct(self, RubyLandProxy, proxy); + JSContext * context = johnson_get_current_context(proxy->runtime); if (argc < 1) rb_raise(rb_eArgError, "Function name required"); - PREPARE_RUBY_JROOTS(proxy->context, 2); + PREPARE_RUBY_JROOTS(context, 2); jsval proxy_value; JCHECK(get_jsval_for_proxy(proxy, &proxy_value)); @@ -401,18 +412,18 @@ call_function_property(int argc, VALUE* argv, VALUE self) jsval function; - JCHECK(JS_GetProperty(proxy->context->js, + JCHECK(JS_GetProperty(context, JSVAL_TO_OBJECT(proxy_value), StringValueCStr(argv[0]), &function)); JROOT(function); - JSType funtype = JS_TypeOfValue(proxy->context->js, function); + JSType funtype = JS_TypeOfValue(context, function); // should never be anything but a function if (funtype != JSTYPE_FUNCTION) JERROR("Specified property \"%s\" isn't a function.", StringValueCStr(argv[0])); - JRETURN_RUBY(call_js_function_value(proxy->context, proxy_value, function, argc - 1, &(argv[1]))); + JRETURN_RUBY(call_js_function_value(proxy->runtime, proxy_value, function, argc - 1, &(argv[1]))); } /* @@ -425,15 +436,16 @@ static VALUE to_s(VALUE self) { RubyLandProxy* proxy; Data_Get_Struct(self, RubyLandProxy, proxy); + JSContext * context = johnson_get_current_context(proxy->runtime); - PREPARE_RUBY_JROOTS(proxy->context, 1); + PREPARE_RUBY_JROOTS(context, 1); jsval proxy_value; JCHECK(get_jsval_for_proxy(proxy, &proxy_value)); JROOT(proxy_value); - JSString* str = JS_ValueToString(proxy->context->js, proxy_value); - JRETURN_RUBY(convert_jsstring_to_ruby(proxy->context, str)); + JSString* str = JS_ValueToString(context, proxy_value); + JRETURN_RUBY(convert_js_string_to_ruby(proxy->runtime, str)); } /////////////////////////////////////////////////////////////////////////// @@ -442,20 +454,21 @@ static VALUE to_s(VALUE self) static void finalize(RubyLandProxy* proxy) { - PREPARE_RUBY_JROOTS(proxy->context, 0); + JSContext * context = johnson_get_current_context(proxy->runtime); + PREPARE_RUBY_JROOTS(context, 0); jsval proxy_value; JCHECK_RUBY(get_jsval_for_proxy(proxy, &proxy_value)); // could get finalized after the context has been freed - if (proxy->context && proxy->context->jsids) + if (proxy->runtime && proxy->runtime->jsids) { // remove this proxy from the OID map - JS_HashTableRemove(proxy->context->jsids, (void *)proxy_value); + JS_HashTableRemove(proxy->runtime->jsids, (void *)proxy_value); // remove our GC handle on the JS value - JS_DeleteProperty(proxy->context->js, proxy->context->gcthings, proxy->key); + JS_DeleteProperty(context, proxy->runtime->gcthings, proxy->key); - proxy->context = 0; + proxy->runtime = 0; } free(proxy); @@ -466,8 +479,9 @@ bool ruby_value_is_proxy(VALUE maybe_proxy) return proxy_class == CLASS_OF(maybe_proxy); } -JSBool unwrap_ruby_land_proxy(OurContext* context, VALUE wrapped, jsval* retval) +JSBool unwrap_ruby_land_proxy(JohnsonRuntime* runtime, VALUE wrapped, jsval* retval) { + JSContext * context = johnson_get_current_context(runtime); assert(ruby_value_is_proxy(wrapped)); PREPARE_JROOTS(context, 0); @@ -479,9 +493,10 @@ JSBool unwrap_ruby_land_proxy(OurContext* context, VALUE wrapped, jsval* retval) JRETURN; } -VALUE make_ruby_land_proxy(OurContext* context, jsval value) +VALUE make_ruby_land_proxy(JohnsonRuntime* runtime, jsval value) { - VALUE id = (VALUE)JS_HashTableLookup(context->jsids, (void *)value); + VALUE id = (VALUE)JS_HashTableLookup(runtime->jsids, (void *)value); + JSContext * context = johnson_get_current_context(runtime); if (id) { @@ -501,12 +516,12 @@ VALUE make_ruby_land_proxy(OurContext* context, jsval value) // root the value for JS GC and lookups sprintf(our_proxy->key, "%x", (int)value); - JCHECK(JS_SetProperty(context->js, context->gcthings, our_proxy->key, &value)); + JCHECK(JS_SetProperty(context, runtime->gcthings, our_proxy->key, &value)); - our_proxy->context = context; + our_proxy->runtime = runtime; // put the proxy OID in the id map - JCHECK(JS_HashTableAdd(context->jsids, (void *)value, (void *)rb_obj_id(proxy))); + JCHECK(JS_HashTableAdd(runtime->jsids, (void *)value, (void *)rb_obj_id(proxy))); JRETURN_RUBY(proxy); } @@ -531,7 +546,7 @@ void init_Johnson_SpiderMonkey_Proxy(VALUE spidermonkey) rb_define_method(proxy_class, "to_s", to_s, 0); rb_define_private_method(proxy_class, "native_call", native_call, -1); - rb_define_private_method(proxy_class, "context", context, 0); + rb_define_private_method(proxy_class, "runtime", runtime, 0); rb_define_private_method(proxy_class, "function_property?", function_property_p, 1); rb_define_private_method(proxy_class, "call_function_property", call_function_property, -1); } ext/spidermonkey/ruby_land_proxy.c @@ -2,16 +2,16 @@ #define JOHNSON_SPIDERMONKEY_RUBY_LAND_PROXY_H #include "spidermonkey.h" -#include "context.h" +#include "runtime.h" typedef struct { char key[10]; - OurContext* context; + JohnsonRuntime* runtime; } RubyLandProxy; bool ruby_value_is_proxy(VALUE maybe_proxy); -JSBool unwrap_ruby_land_proxy(OurContext* context, VALUE proxy, jsval* retval); -VALUE make_ruby_land_proxy(OurContext* context, jsval value); +JSBool unwrap_ruby_land_proxy(JohnsonRuntime* runtime, VALUE proxy, jsval* retval); +VALUE make_ruby_land_proxy(JohnsonRuntime* runtime, jsval value); void init_Johnson_SpiderMonkey_Proxy(VALUE spidermonkey); #endif ext/spidermonkey/ruby_land_proxy.h @@ -2,47 +2,151 @@ #include "error.h" #include "global.h" #include "idhash.h" +#include "conversions.h" +#include "jsdbgapi.h" -JSContext* johnson_get_current_context(JohnsonRuntime* runtime) +/* + * call-seq: + * global + * + * Returns the global object used for this context. + */ +static VALUE global(VALUE self) { - // First, see if we already have a context for the current thread. - JSContext* context = (JSContext*)JS_HashTableLookup(runtime->contexts, (void*)rb_thread_current()); - - // If not, - if (!context) + JohnsonRuntime* runtime; + Data_Get_Struct(self, JohnsonRuntime, runtime); + return convert_to_ruby(runtime, OBJECT_TO_JSVAL(runtime->global)); +} + +/* + * call-seq: + * evaluate(script, filename=nil, linenum=nil) + * + * Evaluate +script+ with +filename+ using +linenum+ + */ +static VALUE evaluate(int argc, VALUE* argv, VALUE self) +{ + VALUE script, filename, linenum; + + JohnsonRuntime* runtime; + Data_Get_Struct(self, JohnsonRuntime, runtime); + + JSContext * context = johnson_get_current_context(runtime); + JohnsonContext * johnson_context = OUR_CONTEXT(context); + rb_scan_args( argc, argv, "12", &script, &filename, &linenum ); + + // clean things up first + johnson_context->ex = 0; + memset(johnson_context->msg, 0, MAX_EXCEPTION_MESSAGE_SIZE); + + const char* filenamez = RTEST(filename) ? StringValueCStr(filename) : "none"; + int linenumi = RTEST(linenum) ? NUM2INT(linenum) : 1; + + jsval js; + + // FIXME: should be able to pass in the 'file' name + JSBool ok = JS_EvaluateScript(context, runtime->global, + StringValuePtr(script), (unsigned)StringValueLen(script), filenamez, (unsigned)linenumi, &js); + + if (!ok) { - // try and create one. - if ((context = JS_NewContext(runtime->js, 8192))) + if (JS_IsExceptionPending(context)) { - // See if the runtime already has a shared global object. - JSObject* global = runtime->global; - - // If it does, use it. If not, - if (!global) - // create one of our global objects. - global = johnson_create_global_object(context); + // If there's an exception pending here, it's a syntax error. + JS_GetPendingException(context, &johnson_context->ex); + JS_ClearPendingException(context); + } - // Manually set the context's global object. - JS_SetGlobalObject(context, global); - - // Register this context (thread -> context) for lookup next time. - JS_HashTableAdd(runtime->contexts, (void*)rb_thread_current(), (void*) context); + if (johnson_context->ex) + { + return rb_funcall(self, rb_intern("handle_js_exception"), + 1, convert_to_ruby(runtime, johnson_context->ex)); - // Success. - return context; + // VALUE message, file, line, stack; + // + // jsval js_message; + // assert(JS_GetProperty(context->js, JSVAL_TO_OBJECT(context->ex), "message", &js_message)); + // message = convert_to_ruby(context, js_message); + // + // jsval js_file; + // assert(JS_GetProperty(context->js, JSVAL_TO_OBJECT(context->ex), "fileName", &js_file)); + // file = convert_to_ruby(context, js_file); + // + // jsval js_line; + // assert(JS_GetProperty(context->js, JSVAL_TO_OBJECT(context->ex), "lineNumber", &js_line)); + // line = convert_to_ruby(context, js_line); + // + // jsval js_stack; + // assert(JS_GetProperty(context->js, JSVAL_TO_OBJECT(context->ex), "stack", &js_stack)); + // stack = convert_to_ruby(context, js_stack); + // + // return rb_funcall(self, rb_intern("handle_js_exception"), + // 4, message, file, line, stack); } - - // Something went wrong! If a context was created, - if (context) - // destroy it safely. - JS_DestroyContext(context); - // Scream for help. - Johnson_Error_raise("Unable to create Johnson::SpiderMonkey::Runtime!"); + char* msg = johnson_context->msg; + + // toString() whatever the exception object is (if we have one) + if (johnson_context->ex) + msg = JS_GetStringBytes(JS_ValueToString(context, johnson_context->ex)); + + return Johnson_Error_raise(msg); } - - // Success. Already had a context for the current thread. - return context; + + return convert_to_ruby(runtime, js); +} + +/* + * call-seq: + * debugger=(debugger) + * + * Sets a debugger object + */ +static VALUE +set_debugger(VALUE self, VALUE debugger) +{ + JohnsonRuntime* runtime; + JSDebugHooks* debug_hooks; + + Data_Get_Struct(self, JohnsonRuntime, runtime); + Data_Get_Struct(debugger, JSDebugHooks, debug_hooks); + + JSContext * context = johnson_get_current_context(runtime); + + JS_SetInterrupt( runtime->js, + debug_hooks->interruptHandler, + debug_hooks->interruptHandlerData); + JS_SetNewScriptHook( runtime->js, + debug_hooks->newScriptHook, + debug_hooks->newScriptHookData); + JS_SetDestroyScriptHook( runtime->js, + debug_hooks->destroyScriptHook, + debug_hooks->destroyScriptHookData); + JS_SetDebuggerHandler( runtime->js, + debug_hooks->debuggerHandler, + debug_hooks->debuggerHandlerData); + JS_SetSourceHandler( runtime->js, + debug_hooks->sourceHandler, + debug_hooks->sourceHandlerData); + JS_SetExecuteHook( runtime->js, + debug_hooks->executeHook, + debug_hooks->executeHookData); + JS_SetCallHook( runtime->js, + debug_hooks->callHook, + debug_hooks->callHookData); + JS_SetObjectHook( runtime->js, + debug_hooks->objectHook, + debug_hooks->objectHookData); + JS_SetThrowHook( runtime->js, + debug_hooks->throwHook, + debug_hooks->throwHookData); + JS_SetDebugErrorHook( runtime->js, + debug_hooks->debugErrorHook, + debug_hooks->debugErrorHookData); + + JS_SetContextDebugHooks(context, debug_hooks); + + return debugger; } static VALUE @@ -51,32 +155,51 @@ initialize_native(VALUE self, VALUE UNUSED(options)) JohnsonRuntime* runtime; Data_Get_Struct(self, JohnsonRuntime, runtime); + bool gcthings_rooted_p = false; + if ((runtime->js = JS_NewRuntime(0x100000)) - && (runtime->contexts = create_id_hash())) + && (runtime->jsids = create_id_hash()) + && (runtime->rbids = create_id_hash()) + ) { + JS_SetRuntimePrivate(runtime->js, (void *)self); JSContext* context = johnson_get_current_context(runtime); - runtime->global = JS_GetGlobalObject(context); - JS_AddNamedRoot(context, &(runtime->global), "runtime->global"); - - return self; + if( + (runtime->gcthings = JS_NewObject(context, NULL, 0, 0)) + &&(runtime->global = JS_GetGlobalObject(context)) + &&(gcthings_rooted_p = JS_AddNamedRoot(context, &(runtime->global), "runtime->global")) + ) { + return self; + } + if (gcthings_rooted_p) + JS_RemoveRoot(context, &(runtime->gcthings)); } - - if (runtime->contexts) - JS_HashTableDestroy(runtime->contexts); - + + + if (runtime->rbids) + JS_HashTableDestroy(runtime->rbids); + + if (runtime->jsids) + JS_HashTableDestroy(runtime->jsids); + if (runtime->js) JS_DestroyRuntime(runtime->js); return Johnson_Error_raise("Couldn't initialize the runtime!"); } +JSContext* johnson_get_current_context(JohnsonRuntime * runtime) +{ + JohnsonContext * context = NULL; + VALUE self = (VALUE)JS_GetRuntimePrivate(runtime->js); + Data_Get_Struct(rb_funcall(self, rb_intern("current_context"), 0), JohnsonContext, context); + return context->js; +} + static void deallocate(JohnsonRuntime* runtime) { JS_RemoveRoot(johnson_get_current_context(runtime), &(runtime->global)); - JS_HashTableDestroy(runtime->contexts); - runtime->contexts = 0; - JSContext *context; JSContext *iterator = NULL; @@ -99,4 +222,8 @@ void init_Johnson_SpiderMonkey_Runtime(VALUE spidermonkey) rb_define_alloc_func(klass, allocate); rb_define_private_method(klass, "initialize_native", initialize_native, 1); + + rb_define_method(klass, "global", global, 0); + rb_define_method(klass, "evaluate", evaluate, -1); + rb_define_method(klass, "debugger=", set_debugger, 1); } ext/spidermonkey/runtime.c @@ -4,9 +4,12 @@ #include "spidermonkey.h" typedef struct { - JSHashTable* contexts; JSObject* global; JSRuntime* js; + + JSHashTable *jsids; // jsid -> rbid + JSHashTable *rbids; // rbid -> jsid + JSObject *gcthings; } JohnsonRuntime; JSContext* johnson_get_current_context(JohnsonRuntime* runtime); ext/spidermonkey/runtime.h @@ -62,7 +62,7 @@ Johnson.require = function(file) { if(Ruby.File.send("file?", path)) { Johnson.required[file] = true; - Johnson.currentContext.load(path); + Johnson.runtime.load(path); return true; } js/johnson/prelude.js @@ -24,7 +24,7 @@ require "johnson/spidermonkey/debugger" require "johnson/spidermonkey/immutable_node" # the 'public' interface -require "johnson/context" +require "johnson/runtime" require "johnson/parser" $LOAD_PATH.push(File.expand_path("#{File.dirname(__FILE__)}/../js")) @@ -33,10 +33,10 @@ module Johnson PRELUDE = IO.read(File.dirname(__FILE__) + "/../js/johnson/prelude.js") def self.evaluate(expression, vars={}) - context = Johnson::Context.new - vars.each { |key, value| context[key] = value } + runtime = Johnson::Runtime.new + vars.each { |key, value| runtime[key] = value } - context.evaluate(expression) + runtime.evaluate(expression) end def self.parse(js, *args) lib/johnson.rb @@ -1,37 +1,10 @@ module Johnson #:nodoc: module SpiderMonkey #:nodoc: class Context # native - def initialize(options={}) - initialize_native(options) + def initialize(runtime, options={}) + @runtime = runtime + initialize_native(runtime, options) @gcthings = {} - self["Ruby"] = Object - end - - def [](key) - global[key] - end - - def []=(key, value) - global[key] = value - end - - protected - - def handle_js_exception(jsex) - raise jsex if Exception === jsex - raise Johnson::Error.new(jsex.to_s) unless Johnson::SpiderMonkey::RubyLandProxy === jsex - - # FIXME: sanitize stack traces - stack = jsex.stack rescue nil - - ex = Johnson::Error.new(jsex) - if stack - ex.set_backtrace(stack.split("\n") + caller) - else - ex.set_backtrace(caller) - end - - raise ex end # called from js_land_proxy.c:make_js_land_proxy lib/johnson/spidermonkey/context.rb @@ -16,7 +16,7 @@ module Johnson #:nodoc: end def call(*args) - call_using(context.global, *args) + call_using(runtime.global, *args) end def call_using(this, *args) lib/johnson/spidermonkey/ruby_land_proxy.rb @@ -3,6 +3,39 @@ module Johnson #:nodoc: class Runtime # native def initialize(options={}) initialize_native(options) + self["Ruby"] = Object + end + + def current_context + contexts = (Thread.current[:johson_context_map] ||= {}) + contexts[self.object_id] ||= Context.new(self) + end + + def [](key) + global[key] + end + + def []=(key, value) + global[key] = value + end + + protected + + def handle_js_exception(jsex) + raise jsex if Exception === jsex + raise Johnson::Error.new(jsex.to_s) unless Johnson::SpiderMonkey::RubyLandProxy === jsex + + # FIXME: sanitize stack traces + stack = jsex.stack rescue nil + + ex = Johnson::Error.new(jsex) + if stack + ex.set_backtrace(stack.split("\n") + caller) + else + ex.set_backtrace(caller) + end + + raise ex end end end lib/johnson/spidermonkey/runtime.rb @@ -21,14 +21,14 @@ module Johnson undef :default_test def assert_js(expression, options={}) - context = options[:context] || @context - assert(context.evaluate(expression), "Expected JS expression [#{expression}] to be true.") + runtime = options[:runtime] || @runtime + assert(runtime.evaluate(expression), "Expected JS expression [#{expression}] to be true.") end def assert_js_equal(expected, expression, options={}) - context = options.delete(:context) || @context - options.each { |k, v| context[k.to_s] = v } - assert_equal(expected, context.evaluate(expression)) + runtime = options.delete(:runtime) || @runtime + options.each { |k, v| runtime[k.to_s] = v } + assert_equal(expected, runtime.evaluate(expression)) end end test/helper.rb @@ -3,15 +3,15 @@ require File.expand_path(File.join(File.dirname(__FILE__), "/../helper")) module Johnson class BrowserTest < Johnson::TestCase def setup - @context = Johnson::Context.new - @context.evaluate('Johnson.require("johnson/browser");') + @runtime = Johnson::Runtime.new + @runtime.evaluate('Johnson.require("johnson/browser");') end def test_set_location_returns_location filename = "file://#{File.expand_path(__FILE__)}" - @context.evaluate("window.location = '#{filename}'") + @runtime.evaluate("window.location = '#{filename}'") uri = URI.parse(filename) - assert_equal(uri.to_s, @context.evaluate('window.location').to_s) + assert_equal(uri.to_s, @runtime.evaluate('window.location').to_s) end end end test/johnson/browser_test.rb @@ -4,32 +4,32 @@ module Johnson module Conversions class ArrayTest < Johnson::TestCase def setup - @context = Johnson::Context.new + @runtime = Johnson::Runtime.new end def test_array_index_get - @context[:list] = [1, 2, 3, 4] - assert_equal(1, @context.evaluate("list[0]")) + @runtime[:list] = [1, 2, 3, 4] + assert_equal(1, @runtime.evaluate("list[0]")) end def test_array_index_set - @context[:list] = [] - @context.evaluate("list[0] = 42") - assert_equal(42, @context[:list][0]) + @runtime[:list] = [] + @runtime.evaluate("list[0] = 42") + assert_equal(42, @runtime[:list][0]) end def test_array_works_with_for_in list = [1, 2, 3, 4] - @context['alert'] = lambda { |x| p x } - @context['list'] = list - @context.evaluate(" + @runtime['alert'] = lambda { |x| p x } + @runtime['list'] = list + @runtime.evaluate(" var new_list = []; for(x in list) { new_list.push(x + 1); } ") - assert_equal(list.map { |x| x + 1}, @context['new_list'].to_a) + assert_equal(list.map { |x| x + 1}, @runtime['new_list'].to_a) end end end test/johnson/conversions/array_test.rb @@ -4,17 +4,17 @@ module Johnson module Conversions class BooleanTest < Johnson::TestCase def setup - @context = Johnson::Context.new + @runtime = Johnson::Runtime.new end def test_truthiness - @context[:v] = true - assert_same(true, @context.evaluate("v === true")) + @runtime[:v] = true + assert_same(true, @runtime.evaluate("v === true")) end def test_dirty_lies - @context[:v] = false - assert_same(false, @context.evaluate("v === true")) + @runtime[:v] = false + assert_same(false, @runtime.evaluate("v === true")) end end end test/johnson/conversions/boolean_test.rb @@ -4,22 +4,22 @@ module Johnson module Conversions class CallableTest < Johnson::TestCase def setup - @context = Johnson::Context.new + @runtime = Johnson::Runtime.new end def test_proc_works_in_jsland - @context[:squared] = Proc.new { |x| x * x } + @runtime[:squared] = Proc.new { |x| x * x } assert_js_equal(4, "squared(2)") end def test_procs_roundtrip - @context[:k] = k = lambda { |x| x } - assert_same(k, @context.evaluate("k")) + @runtime[:k] = k = lambda { |x| x } + assert_same(k, @runtime.evaluate("k")) end def test_proc_js_function_proxy_gets_reused - @context[:k] = k = lambda { |x| x } - @context[:kk] = k + @runtime[:k] = k = lambda { |x| x } + @runtime[:kk] = k assert_js("k === kk") end @@ -30,7 +30,7 @@ module Johnson end def test_anything_with_a_call_method_can_be_called_as_a_method - @context[:c] = CallableThing.new + @runtime[:c] = CallableThing.new assert_js_equal("foo", "c()") end end test/johnson/conversions/callable_test.rb @@ -4,14 +4,14 @@ module Johnson module Conversions class FileTest < Johnson::TestCase def setup - @context = Johnson::Context.new + @runtime = Johnson::Runtime.new end def test_read_file File.open(__FILE__, 'rb') { |f| - @context[:foo] = f - assert_equal(f, @context.evaluate("foo")) - assert_equal(File.read(__FILE__), @context.evaluate("foo.read()")) + @runtime[:foo] = f + assert_equal(f, @runtime.evaluate("foo")) + assert_equal(File.read(__FILE__), @runtime.evaluate("foo.read()")) } end end test/johnson/conversions/file_test.rb @@ -4,20 +4,20 @@ module Johnson module Conversions class NilTest < Johnson::TestCase def setup - @context = Johnson::Context.new + @runtime = Johnson::Runtime.new end def test_ruby_nil_is_js_null - @context[:v] = nil - assert_equal(true, @context.evaluate("v == null")) + @runtime[:v] = nil + assert_equal(true, @runtime.evaluate("v == null")) end def test_js_null_is_ruby_nil - assert_nil(@context.evaluate("null")) + assert_nil(@runtime.evaluate("null")) end def test_js_undefined_is_ruby_nil - assert_nil(@context.evaluate("undefined")) + assert_nil(@runtime.evaluate("undefined")) end end end test/johnson/conversions/nil_test.rb @@ -4,34 +4,34 @@ module Johnson module Conversions class NumberTest < Johnson::TestCase def setup - @context = Johnson::Context.new + @runtime = Johnson::Runtime.new end def test_ruby_fixnum_in_js - @context[:v] = 42 + @runtime[:v] = 42 assert_js("v == 42") assert_js_equal(42, "v") - assert_equal(42, @context[:v]) + assert_equal(42, @runtime[:v]) end def test_js_fixnum_in_ruby - fix = @context.evaluate("42") + fix = @runtime.evaluate("42") assert_equal(42, fix) assert_kind_of(Fixnum, fix) end def test_ruby_float_in_js - @context[:pi] = pi = 3.141592654 + @runtime[:pi] = pi = 3.141592654 assert_js_equal(pi, "pi") - assert_in_delta(pi, @context.evaluate("pi"), 2 ** -20) + assert_in_delta(pi, @runtime.evaluate("pi"), 2 ** -20) end def test_ruby_bignum_in_js - @context[:big] = big = 2 ** 200 + @runtime[:big] = big = 2 ** 200 assert_js_equal(big, "big") - assert_kind_of(Float, @context.evaluate("big")) + assert_kind_of(Float, @runtime.evaluate("big")) end end end test/johnson/conversions/number_test.rb @@ -4,24 +4,24 @@ module Johnson module Conversions class RegexpTest < Johnson::TestCase def setup - @context = Johnson::Context.new + @runtime = Johnson::Runtime.new end def test_regex_converts - @context[:x] = /aaron/ - @context[:y] = /john/i - assert @context.evaluate('"aaron".match(x)') - assert !@context.evaluate('"Aaron".match(x)') - assert @context.evaluate('"john".match(y)') - assert @context.evaluate('"John".match(y)') + @runtime[:x] = /aaron/ + @runtime[:y] = /john/i + assert @runtime.evaluate('"aaron".match(x)') + assert !@runtime.evaluate('"Aaron".match(x)') + assert @runtime.evaluate('"john".match(y)') + assert @runtime.evaluate('"John".match(y)') end def test_regex_roundtrips - @context[:x] = /aaron/ - assert_equal(/aaron/, @context.evaluate('x')) + @runtime[:x] = /aaron/ + assert_equal(/aaron/, @runtime.evaluate('x')) - @context[:x] = /aaron/m - assert_equal(/aaron/m, @context.evaluate('x')) + @runtime[:x] = /aaron/m + assert_equal(/aaron/m, @runtime.evaluate('x')) end end end test/johnson/conversions/regexp_test.rb @@ -4,26 +4,26 @@ module Johnson module Conversions class StringTest < Johnson::TestCase def setup - @context = Johnson::Context.new + @runtime = Johnson::Runtime.new end def test_ruby_string_in_js - @context[:v] = "foo" + @runtime[:v] = "foo" assert_js("'foo' == v") end def test_js_string_in_ruby - assert_equal("foo", @context.evaluate("'foo'")) + assert_equal("foo", @runtime.evaluate("'foo'")) end def test_roundtrip - @context[:v] = v = "hola" - assert_equal(v, @context.evaluate("v")) + @runtime[:v] = v = "hola" + assert_equal(v, @runtime.evaluate("v")) end def test_strings_are_copies - @context[:v] = v = "hola" - assert_not_same(v, @context.evaluate("v")) + @runtime[:v] = v = "hola" + assert_not_same(v, @runtime.evaluate("v")) end end end test/johnson/conversions/string_test.rb @@ -4,15 +4,15 @@ module Johnson module Conversions class StructTest < Johnson::TestCase def setup - @context = Johnson::Context.new + @runtime = Johnson::Runtime.new end def test_use_struct f = Struct.new(:phil_collins).new f.phil_collins = 'awesome' - @context[:foo] = f - assert_equal(f, @context.evaluate('foo')) - assert_equal('awesome', @context.evaluate('foo.phil_collins')) + @runtime[:foo] = f + assert_equal(f, @runtime.evaluate('foo')) + assert_equal('awesome', @runtime.evaluate('foo.phil_collins')) end end end test/johnson/conversions/struct_test.rb @@ -4,19 +4,19 @@ module Johnson module Conversions class SymbolTest < Johnson::TestCase def setup - @context = Johnson::Context.new + @runtime = Johnson::Runtime.new end def test_symbols_are_interned - @context[:v] = :symbol - @context[:x] = :symbol + @runtime[:v] = :symbol + @runtime[:x] = :symbol - assert(@context.evaluate("v !== null && v === x")) + assert(@runtime.evaluate("v !== null && v === x")) end def test_ruby_symbol_roundtrips - @context[:v] = :foo - assert_equal(:foo, @context.evaluate("v")) + @runtime[:v] = :foo + assert_equal(:foo, @runtime.evaluate("v")) end end end test/johnson/conversions/symbol_test.rb @@ -4,14 +4,25 @@ module Johnson module Conversions class ThreadTest < Johnson::TestCase def setup - @context = Johnson::Context.new + @runtime = Johnson::Runtime.new end def test_manipulate_thread thread = Thread.new { } - @context['thread'] = thread + @runtime['thread'] = thread assert_js_equal(false, "thread.send('alive?')") end + + def test_new_js_thread + @runtime.evaluate('function testing() { Ruby.sleep(10); }') + @runtime.evaluate('new Ruby.Thread(function() { testing(); })') + end + + def test_js_thread_read_file + @runtime['filename'] = File.expand_path(__FILE__) + @runtime.evaluate('function testing() { Ruby.File.read(filename); }') + @runtime.evaluate('new Ruby.Thread(function() { testing(); })') + end end end end test/johnson/conversions/thread_test.rb @@ -4,18 +4,18 @@ module Johnson module Extensions class DefinePropertyTest < Johnson::TestCase def setup - @context = Johnson::Context.new - @context.evaluate("x = {}") + @runtime = Johnson::Runtime.new + @runtime.evaluate("x = {}") end def test_object_can_define_property - @context.evaluate("Object.defineProperty(x, 'answer', 42)") + @runtime.evaluate("Object.defineProperty(x, 'answer', 42)") assert_js_equal(42, "x.answer") end def test_object_can_define_unenumerable_property - @context.evaluate("Object.defineProperty(x, 'answer', 42)") - @context.evaluate <<-JS + @runtime.evaluate("Object.defineProperty(x, 'answer', 42)") + @runtime.evaluate <<-JS y = []; for(prop in x) if(prop == "answer") y.push(prop) JS @@ -23,8 +23,8 @@ module Johnson end def test_object_can_define_enumerable_property - @context.evaluate("Object.defineProperty(x, 'answer', 42, Object.ITERABLE)") - @context.evaluate <<-JS + @runtime.evaluate("Object.defineProperty(x, 'answer', 42, Object.ITERABLE)") + @runtime.evaluate <<-JS y = []; for(prop in x) if(prop == "answer") y.push(prop) JS @@ -32,22 +32,22 @@ module Johnson end def test_object_can_define_read_only_property - @context.evaluate("Object.defineProperty(x, 'answer', 42, Object.READ_ONLY)") - @context.evaluate("x.answer = 47") + @runtime.evaluate("Object.defineProperty(x, 'answer', 42, Object.READ_ONLY)") + @runtime.evaluate("x.answer = 47") assert_js_equal(42, "x.answer") end def test_object_can_define_non_deletable_property - @context.evaluate("Object.defineProperty(x, 'answer', 42, Object.NON_DELETABLE)") - @context.evaluate("r = (delete x.answer)") + @runtime.evaluate("Object.defineProperty(x, 'answer', 42, Object.NON_DELETABLE)") + @runtime.evaluate("r = (delete x.answer)") assert_js_equal(false, "r") assert_js_equal(42, "x.answer") end def test_object_can_define_mixed_property - @context.evaluate("Object.defineProperty(x, 'answer', 42, Object.NON_DELETABLE | Object.READ_ONLY)") - @context.evaluate("r = (delete x.answer)") - @context.evaluate("x.answer = 47") + @runtime.evaluate("Object.defineProperty(x, 'answer', 42, Object.NON_DELETABLE | Object.READ_ONLY)") + @runtime.evaluate("r = (delete x.answer)") + @runtime.evaluate("x.answer = 47") assert_js_equal(false, "r") assert_js_equal(42, "x.answer") end test/johnson/extensions_test.rb @@ -3,11 +3,11 @@ require File.expand_path(File.join(File.dirname(__FILE__), "/../helper")) module Johnson class PreludeTest < Johnson::TestCase def setup - @context = Johnson::Context.new + @runtime = Johnson::Runtime.new end def test_symbols_are_interned - assert(@context.evaluate("Johnson.symbolize('foo') === Johnson.symbolize('foo')")) + assert(@runtime.evaluate("Johnson.symbolize('foo') === Johnson.symbolize('foo')")) end def test_strings_had_a_to_symbol_method @@ -15,7 +15,7 @@ module Johnson end def test_string_to_symbol_is_not_enumerable - assert(!@context.evaluate(<<-END)) + assert(!@runtime.evaluate(<<-END)) var flag = false; for (x in "foo") { if (x == 'toSymbol') flag = true } flag @@ -23,18 +23,18 @@ module Johnson end def test_symbol_to_string - assert_equal("monkey", @context.evaluate("Johnson.symbolize('monkey').toString()")) + assert_equal("monkey", @runtime.evaluate("Johnson.symbolize('monkey').toString()")) end def test_symbol_inspect - assert_equal(":monkey", @context.evaluate("Johnson.symbolize('monkey').inspect()")) + assert_equal(":monkey", @runtime.evaluate("Johnson.symbolize('monkey').inspect()")) end def test_all_of_ruby_is_available - assert_raise(Johnson::Error) { @context.evaluate("Ruby.Set.new()") } + assert_raise(Johnson::Error) { @runtime.evaluate("Ruby.Set.new()") } - @context.evaluate("Ruby.require('set')") - assert_kind_of(Set, @context.evaluate("Ruby.Set.new()")) + @runtime.evaluate("Ruby.require('set')") + assert_kind_of(Set, @runtime.evaluate("Ruby.Set.new()")) end def test_require_an_existing_js_file_without_extension @@ -43,7 +43,7 @@ module Johnson def test_require_returns_false_the_second_time_around assert_js("Johnson.require('johnson/template')") - assert(!@context.evaluate("Johnson.require('johnson/template')")) + assert(!@runtime.evaluate("Johnson.require('johnson/template')")) end def test_missing_requires_throw_LoadError test/johnson/prelude_test.rb @@ -4,17 +4,17 @@ module Johnson module SpiderMonkey class ContextTest < Johnson::TestCase def setup - @context = Johnson::Context.new(Johnson::SpiderMonkey::Context) + @runtime = Johnson::Runtime.new(Johnson::SpiderMonkey::Runtime) end def test_wraps_global_unfuckedly - assert_same(@context.global, @context.evaluate("this")) + assert_same(@runtime.global, @runtime.evaluate("this")) end - def test_provides_basic_context_interface - assert(@context.respond_to?(:evaluate)) - assert(@context.respond_to?(:[])) - assert(@context.respond_to?(:[]=)) + def test_provides_basic_runtime_interface + assert(@runtime.respond_to?(:evaluate)) + assert(@runtime.respond_to?(:[])) + assert(@runtime.respond_to?(:[]=)) end end end test/johnson/spidermonkey/context_test.rb @@ -58,7 +58,7 @@ module Johnson end def setup - @context = Johnson::Context.new(Johnson::SpiderMonkey::Context) + @runtime = Johnson::Runtime.new(Johnson::SpiderMonkey::Runtime) end def test_find_constants @@ -66,14 +66,14 @@ module Johnson end def test_proxies_get_reused - @context["foo"] = @context["bar"] = Foo.new + @runtime["foo"] = @runtime["bar"] = Foo.new assert_js_equal(true, "foo === bar") end def test_attributes_get_added_to_ruby - foo = @context["foo"] = Foo.new + foo = @runtime["foo"] = Foo.new assert !foo.respond_to?(:johnson) - @context.evaluate("foo.johnson = 'explode';") + @runtime.evaluate("foo.johnson = 'explode';") assert foo.respond_to?(:johnson) assert_equal('explode', foo.johnson) assert_js_equal('explode', 'foo.johnson') @@ -81,9 +81,9 @@ module Johnson end def test_assign_function_as_attribute - foo = @context["foo"] = Foo.new + foo = @runtime["foo"] = Foo.new assert !foo.respond_to?(:johnson) - f = @context.evaluate("foo.johnson = function() { return 'explode'; }") + f = @runtime.evaluate("foo.johnson = function() { return 'explode'; }") assert foo.respond_to?(:johnson) assert_equal('explode', foo.johnson) assert_js_equal('explode', 'foo.johnson()') @@ -92,115 +92,115 @@ module Johnson end def test_assign_function_as_attribute_with_this - foo = @context["foo"] = Foo.new - @context.evaluate("foo.ex_squared = function(x) { return this.x2(x); }") + foo = @runtime["foo"] = Foo.new + @runtime.evaluate("foo.ex_squared = function(x) { return this.x2(x); }") assert_equal(4, foo.ex_squared(2)) - @context.evaluate("foo.ex_squared = 20;") + @runtime.evaluate("foo.ex_squared = 20;") assert_equal(20, foo.ex_squared) end def test_use_ruby_global_object - func = @context.evaluate("function(x) { return this.x2(x); }") + func = @runtime.evaluate("function(x) { return this.x2(x); }") foo = Foo.new assert_equal(4, func.call_using(foo, 2)) end def test_proxies_roundtrip - @context["foo"] = foo = Foo.new - assert_same(foo, @context.evaluate("foo")) + @runtime["foo"] = foo = Foo.new + assert_same(foo, @runtime.evaluate("foo")) end def test_proxies_classes - @context["Foo"] = Foo - assert_same(Foo, @context.evaluate("Foo")) + @runtime["Foo"] = Foo + assert_same(Foo, @runtime.evaluate("Foo")) end def test_proxies_modules - @context["AModule"] = AModule - assert_same(AModule, @context.evaluate("AModule")) + @runtime["AModule"] = AModule + assert_same(AModule, @runtime.evaluate("AModule")) end def test_proxies_hashes - @context["beatles"] = { "george" => "guitar" } - assert_equal("guitar", @context.evaluate("beatles['george']")) + @runtime["beatles"] = { "george" => "guitar" } + assert_equal("guitar", @runtime.evaluate("beatles['george']")) end def test_getter_calls_0_arity_method - @context["foo"] = Foo.new + @runtime["foo"] = Foo.new assert_js_equal(10, "foo.bar") end def test_getter_calls_indexer - @context["foo"] = indexable = Indexable.new + @runtime["foo"] = indexable = Indexable.new indexable["bar"] = 10 assert_js_equal(10, "foo.bar") end def test_getter_returns_nil_for_unknown_properties - @context["foo"] = Foo.new + @runtime["foo"] = Foo.new assert_js_equal(nil, "foo.quux") end def test_setter_calls_key= - @context["foo"] = foo = Foo.new + @runtime["foo"] = foo = Foo.new assert_js_equal(42, "foo.bar = 42") assert_equal(42, foo.bar) end def test_setter_calls_indexer - @context["foo"] = indexable = Indexable.new + @runtime["foo"] = indexable = Indexable.new assert_js_equal(42, "foo.monkey = 42") assert_equal(42, indexable["monkey"]) end def test_calls_attr_reader - @context["foo"] = Foo.new + @runtime["foo"] = Foo.new assert_js_equal(10, "foo.bar") end def test_calls_1_arity_method - @context["foo"] = Foo.new + @runtime["foo"] = Foo.new assert_js_equal(10, "foo.x2(5)") end def test_calls_n_arity_method - @context["foo"] = Foo.new + @runtime["foo"] = Foo.new assert_js_equal(10, "foo.add(4, 2, 2, 1, 1)") end def test_calls_class_method - @context["Foo"] = Foo + @runtime["Foo"] = Foo assert_js_equal(Foo.bar, "Foo.bar()") end def test_accesses_consts - @context["Foo"] = Foo - assert_same(Foo::Inner, @context.evaluate("Foo.Inner")) + @runtime["Foo"] = Foo + assert_same(Foo::Inner, @runtime.evaluate("Foo.Inner")) end def test_can_create_new_instances_in_js - @context["AClass"] = AClass - foo = @context.evaluate("AClass.new()") + @runtime["AClass"] = AClass + foo = @runtime.evaluate("AClass.new()") assert_kind_of(AClass, foo) end def test_class_proxies_provide_a_ctor - @context["AClass"] = AClass - foo = @context.evaluate("new AClass()") + @runtime["AClass"] = AClass + foo = @runtime.evaluate("new AClass()") assert_kind_of(AClass, foo) - bar = @context.evaluate("new AClass(1, 2, 3)") + bar = @runtime.evaluate("new AClass(1, 2, 3)") assert_equal([1, 2, 3], bar.args) end def test_dwims_blocks - @context["foo"] = Foo.new + @runtime["foo"] = Foo.new assert_js_equal(4, "foo.xform(2, function(x) { return x * 2 })") end def test_dwims_blocks_for_0_arity_methods - @context[:arr] = [1, 2, 3] + @runtime[:arr] = [1, 2, 3] assert_js_equal([2, 4, 6], "arr.collect(function(x) { return x * 2 })") end @@ -221,15 +221,15 @@ module Johnson end def test_raises_string_to_ruby - assert_raise(Johnson::Error) { @context.evaluate("throw 'my string';") } + assert_raise(Johnson::Error) { @runtime.evaluate("throw 'my string';") } end def test_raises_object_to_ruby - assert_raise(Johnson::Error) { @context.evaluate("throw { bad: true };") } + assert_raise(Johnson::Error) { @runtime.evaluate("throw { bad: true };") } end def test_raises_exception_to_ruby - assert_raise(Johnson::Error) { @context.evaluate("undefinedValue();") } + assert_raise(Johnson::Error) { @runtime.evaluate("undefinedValue();") } end end end test/johnson/spidermonkey/js_land_proxy_test.rb @@ -4,7 +4,7 @@ module Johnson module SpiderMonkey class RubyLandProxyTest < Johnson::TestCase def setup - @context = Johnson::Context.new(Johnson::SpiderMonkey::Context) + @runtime = Johnson::Runtime.new(Johnson::SpiderMonkey::Runtime) end def test_constructing_a_proxy_directly_asplodes @@ -12,18 +12,18 @@ module Johnson end def test_objects_get_wrapped_as_proxies - assert_kind_of(Johnson::SpiderMonkey::RubyLandProxy, @context.evaluate("x = {}")) - assert_kind_of(Johnson::SpiderMonkey::RubyLandProxy, @context.evaluate("new Object()")) + assert_kind_of(Johnson::SpiderMonkey::RubyLandProxy, @runtime.evaluate("x = {}")) + assert_kind_of(Johnson::SpiderMonkey::RubyLandProxy, @runtime.evaluate("new Object()")) end def test_proxies_get_unwrapped_when_roundtripping - proxy = @context.evaluate("x = {}") - @context["y"] = proxy - assert(@context.evaluate("x === y")) + proxy = @runtime.evaluate("x = {}") + @runtime["y"] = proxy + assert(@runtime.evaluate("x === y")) end def test_array_indexable - proxy = @context.evaluate("var x = [1,2,3]; x") + proxy = @runtime.evaluate("var x = [1,2,3]; x") assert_equal(1, proxy[0]) assert_equal(1, proxy['0']) @@ -32,7 +32,7 @@ module Johnson end def test_hash_indexable - proxy = @context.evaluate("var x = { 0: 1, 1: 2, 2: 3 }; x") + proxy = @runtime.evaluate("var x = { 0: 1, 1: 2, 2: 3 }; x") assert_equal(1, proxy[0]) assert_equal(1, proxy['0']) @@ -41,49 +41,49 @@ module Johnson end def test_functions_get_wrapped_as_proxies - f = @context.evaluate("function() {}") + f = @runtime.evaluate("function() {}") assert_kind_of(Johnson::SpiderMonkey::RubyLandProxy, f) assert(f.function?) end def test_function? - f = @context.evaluate("function() {}") + f = @runtime.evaluate("function() {}") assert_kind_of(Johnson::SpiderMonkey::RubyLandProxy, f) assert(f.function?) - f = @context.evaluate("new Object()") + f = @runtime.evaluate("new Object()") assert_kind_of(Johnson::SpiderMonkey::RubyLandProxy, f) assert(!f.function?) end def test_calling_non_functions_complains - assert_raise(Johnson::Error) { @context.evaluate("new Object()").call } + assert_raise(Johnson::Error) { @runtime.evaluate("new Object()").call } end def test_functions_can_be_called - f = @context.evaluate("function() { return 42; }") + f = @runtime.evaluate("function() { return 42; }") assert_equal(42, f.call) end def test_functions_can_be_called_with_args - f = @context.evaluate("function(x) { return x * 2; }") + f = @runtime.evaluate("function(x) { return x * 2; }") assert_equal(84, f.call(42)) end def test_functions_can_be_used_as_procs - f = @context.evaluate("function(x) { return x * 2; }") + f = @runtime.evaluate("function(x) { return x * 2; }") a = [1, 2, 3] assert_equal([2, 4, 6], a.collect(&f)) end def test_function_proxies_are_called_with_a_global_this - f = @context.evaluate("x = 42; function() { return this.x; }") + f = @runtime.evaluate("x = 42; function() { return this.x; }") assert_equal(42, f.call) end def test_can_be_indexed_by_string - proxy = @context.evaluate("x = { foo: 42 }") + proxy = @runtime.evaluate("x = { foo: 42 }") assert_kind_of(Johnson::SpiderMonkey::RubyLandProxy, proxy) assert_equal(42, proxy["foo"]) @@ -97,29 +97,29 @@ module Johnson end def test_multilevel_indexing_works - proxy = @context.evaluate("x = { foo: { bar: 42 , baz: function() { return 42 } } }") + proxy = @runtime.evaluate("x = { foo: { bar: 42 , baz: function() { return 42 } } }") assert_equal(42, proxy["foo"]["bar"]) assert_equal(42, proxy["foo"]["baz"].call) end def test_respond_to_works - proxy = @context.evaluate("x = { foo: 42 }") + proxy = @runtime.evaluate("x = { foo: 42 }") assert(!proxy.respond_to?(:bar)) assert(proxy.respond_to?(:foo)) end def test_respond_to_always_returns_true_for_assignment - proxy = @context.evaluate("x = {}") + proxy = @runtime.evaluate("x = {}") assert(proxy.respond_to?(:bar=)) end def test_accessor - proxy = @context.evaluate("x = { foo: 42 }") + proxy = @runtime.evaluate("x = { foo: 42 }") assert_equal(42, proxy.foo) end def test_mutator - proxy = @context.evaluate("x = {}") + proxy = @runtime.evaluate("x = {}") proxy.foo = 42 assert_js_equal(42, "x.foo") @@ -127,22 +127,22 @@ module Johnson end def test_method_with_no_arguments - proxy = @context.evaluate("x = { foo: function() { return 42 } }") + proxy = @runtime.evaluate("x = { foo: function() { return 42 } }") assert_equal(42, proxy.foo) end def test_method_with_one_argument - proxy = @context.evaluate("f = { f: function(x) { return x * 2 } }") + proxy = @runtime.evaluate("f = { f: function(x) { return x * 2 } }") assert_equal(84, proxy.f(42)) end def test_method_with_multiple_arguments - proxy = @context.evaluate("x = { add: function(x, y) { return x + y } }") + proxy = @runtime.evaluate("x = { add: function(x, y) { return x + y } }") assert_equal(42, proxy.add(40, 2)) end def test_supports_each_on_arrays - proxy = @context.evaluate("[1, 2, 3]") + proxy = @runtime.evaluate("[1, 2, 3]") values = [] proxy.each { |n| values << n } @@ -150,7 +150,7 @@ module Johnson end def test_supports_each_on_things_that_arent_arrays - proxy = @context.evaluate("x = { foo: 'fooval', bar: 'barval' }; x[0] = 42; x") + proxy = @runtime.evaluate("x = { foo: 'fooval', bar: 'barval' }; x[0] = 42; x") values = {} proxy.each { |k, v| values[k] = v } @@ -158,7 +158,7 @@ module Johnson end def test_each_passes_an_exception - proxy = @context.evaluate("x = { foo: 'fooval', bar: 'barval' }; x[0] = 42; x") + proxy = @runtime.evaluate("x = { foo: 'fooval', bar: 'barval' }; x[0] = 42; x") values = {} assert_raise(RuntimeError) do @@ -171,29 +171,29 @@ module Johnson end def test_is_enumerable - proxy = @context.evaluate("[1, 2, 3]") + proxy = @runtime.evaluate("[1, 2, 3]") assert_kind_of(Enumerable, proxy) assert_equal([2, 4, 6], proxy.collect { |n| n * 2 }) end def test_has_a_length - proxy = @context.evaluate("[1, 2, 3]") + proxy = @runtime.evaluate("[1, 2, 3]") assert_equal(3, proxy.length) end def test_length_is_aliased_as_size - proxy = @context.evaluate("[1, 2, 3]") + proxy = @runtime.evaluate("[1, 2, 3]") assert_equal(3, proxy.size) end def test_length_for_arrays_ignores_non_numeric_properties - proxy = @context.evaluate("x = [1, 2, 3]; x['foo'] = 'bar'; x") + proxy = @runtime.evaluate("x = [1, 2, 3]; x['foo'] = 'bar'; x") assert_equal(3, proxy.length) end def test_length_for_objects_includes_all_properties - proxy = @context.evaluate("x = { foo: 'foo', bar: 'bar', 0: 42 }") + proxy = @runtime.evaluate("x = { foo: 'foo', bar: 'bar', 0: 42 }") assert_equal(3, proxy.length) end test/johnson/spidermonkey/ruby_land_proxy_test.rb @@ -8,7 +8,9 @@ module Johnson end def test_can_create_more_than_one_without_barfing - Johnson::SpiderMonkey::Runtime.new + assert_nothing_raised { + Johnson::SpiderMonkey::Runtime.new + } end end end test/johnson/spidermonkey/runtime_test.rb @@ -9,7 +9,7 @@ class JohnsonTest < Test::Unit::TestCase assert_equal(4, Johnson.evaluate("2 + foo", :foo => 2)) end - def test_evaluate_uses_a_new_context_each_time + def test_evaluate_uses_a_new_runtime_each_time assert_equal(4, Johnson.evaluate("foo", :foo => 4)) assert_raise(Johnson::Error) { Johnson.evaluate("foo") } end test/johnson_test.rb @@ -4,7 +4,6 @@ require 'stringio' class ParserTest < Test::Unit::TestCase include Johnson::Nodes def setup - @context = Johnson::Context.new @parser = Johnson::Parser end test/parser_test.rb lib/johnson/context.rb test/johnson/context_test.rb todo/threading_test.rb 794e0ac850a2b7e90feeb27c48267194e1c99be8 John Barnette jbarnette@gmail.com http://github.com/jbarnette/johnson/commit/ae3584f2d4e47d82c063c89631bcd8b23acfd9db ae3584f2d4e47d82c063c89631bcd8b23acfd9db 2008-05-30T17:18:16-07:00 2008-05-30T17:18:16-07:00 Runtime is the new Context. One context per Ruby thread. 019aa9a9739d6de9d366bad61e894779f48d5a2a John Barnette jbarnette@gmail.com