lib/johnson/error.rb @@ -1,7 +1,6 @@ #include "context.h" #include "conversions.h" #include "global.h" -#include "error.h" #include "extensions.h" #include "idhash.h" #include "jsdbgapi.h" ext/spidermonkey/context.c @@ -1,7 +1,6 @@ #include "conversions.h" #include "js_land_proxy.h" #include "ruby_land_proxy.h" -#include "error.h" DEFINE_RUBY_WRAPPER(convert_to_ruby, convert_to_ruby, ARGLIST2(runtime, js_value)) @@ -116,7 +115,7 @@ JSBool convert_to_js(JohnsonRuntime* runtime, VALUE ruby, jsval* retval) return make_js_land_proxy(runtime, ruby, retval); default: - Johnson_Error_raise("unknown ruby type in switch"); + rb_raise(rb_eRuntimeError, "unknown ruby type in switch"); } *retval = JSVAL_NULL; @@ -240,16 +239,17 @@ NORETURN(void) raise_js_error_in_ruby(JohnsonRuntime* runtime) JS_RemoveRoot(context, &(johnson_context->ex)); } - VALUE ruby_context = (VALUE)JS_GetContextPrivate(context); VALUE ruby_runtime = (VALUE)JS_GetRuntimePrivate(runtime->js); if (johnson_context->ex) - rb_funcall(ruby_runtime, rb_intern("handle_js_exception"), - 1, convert_to_ruby(runtime, johnson_context->ex)); + RAISE_JS_ERROR(ruby_runtime, johnson_context->ex); + // FIXME: I don't think this is needed, it should + // be done on the Ruby side. if (!johnson_context->msg) - Johnson_Error_raise("Unknown JavaScript Error"); + rb_raise(rb_eRuntimeError, "Unknown JavaScriptError"); - Johnson_Error_raise(johnson_context->msg); + // FIXME: I don't think this can ever happen.... + rb_raise(rb_eRuntimeError, johnson_context->msg); } #define TAG_RAISE 0x6 ext/spidermonkey/conversions.c @@ -152,7 +152,7 @@ char _jroot_msg[_JROOT_ERRSIZE]; \ snprintf(_jroot_msg, _JROOT_ERRSIZE, (format) , ## args); \ if (_jroot_ruby) \ - Johnson_Error_raise(_jroot_msg); \ + rb_raise(rb_eRuntimeError, _jroot_msg); \ else \ { \ JSString* _jroot_err_str = JS_NewStringCopyZ(_jroot_context, _jroot_msg); \ ext/spidermonkey/jroot.h @@ -1,6 +1,5 @@ #include "ruby_land_proxy.h" #include "conversions.h" -#include "error.h" DECLARE_RUBY_WRAPPER(rb_call_super, int argc; const VALUE* argv) DEFINE_RUBY_WRAPPER(rb_call_super, rb_call_super, ARGLIST2(argc, argv)) @@ -193,8 +192,9 @@ respond_to_p(VALUE self, VALUE sym) static VALUE native_call(int argc, VALUE* argv, VALUE self) { + // FIXME: This should really call super#native_call. if (!function_p(self)) - Johnson_Error_raise("This Johnson::SpiderMonkey::RubyLandProxy isn't a function."); + rb_raise(rb_eRuntimeError, "This Johnson::SpiderMonkey::RubyLandProxy isn't a function."); if (argc < 1) rb_raise(rb_eArgError, "Target object required"); ext/spidermonkey/ruby_land_proxy.c @@ -1,5 +1,4 @@ #include "runtime.h" -#include "error.h" #include "global.h" #include "idhash.h" #include "conversions.h" @@ -57,40 +56,10 @@ static VALUE evaluate(int argc, VALUE* argv, VALUE self) JS_ClearPendingException(context); } - if (johnson_context->ex) - { - return rb_funcall(self, rb_intern("handle_js_exception"), - 1, convert_to_ruby(runtime, johnson_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); + if (johnson_context->ex) { + RAISE_JS_ERROR(self, johnson_context->ex); + return Qnil; } - - 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); } return convert_to_ruby(runtime, js); @@ -189,7 +158,8 @@ initialize_native(VALUE self, VALUE UNUSED(options)) if (runtime->js) JS_DestroyRuntime(runtime->js); - return Johnson_Error_raise("Couldn't initialize the runtime!"); + rb_raise(rb_eRuntimeError, "Couldn't initialize the runtime!"); + return Qnil; } JSContext* johnson_get_current_context(JohnsonRuntime * runtime) ext/spidermonkey/runtime.c @@ -3,6 +3,14 @@ #include "spidermonkey.h" +#define RAISE_JS_ERROR(rb_runtime, ex) \ + do {\ + JohnsonRuntime * _rt = NULL;\ + Data_Get_Struct(rb_runtime, JohnsonRuntime, _rt);\ + rb_funcall(CLASS_OF(rb_runtime), rb_intern("raise_js_exception"), 1,\ + convert_to_ruby(_rt, ex)); \ + } while(0) + typedef struct { JSObject* global; JSRuntime* js; ext/spidermonkey/runtime.h @@ -1,6 +1,5 @@ #include "spidermonkey.h" #include "context.h" -#include "error.h" #include "ruby_land_proxy.h" #include "debugger.h" #include "immutable_node.h" @@ -10,7 +9,6 @@ void Init_spidermonkey() VALUE johnson = rb_define_module("Johnson"); // FIXME: this belongs outside the extension VALUE spidermonkey = rb_define_module_under(johnson, "SpiderMonkey"); - init_Johnson_Error(johnson); // FIXME: this belongs outside the extension init_Johnson_SpiderMonkey_Context(spidermonkey); init_Johnson_SpiderMonkey_Proxy(spidermonkey); init_Johnson_SpiderMonkey_Debugger(spidermonkey); ext/spidermonkey/spidermonkey.c @@ -68,7 +68,7 @@ Johnson.require = function(file) { } } - throw LoadError; + throw Ruby.LoadError; } null; // no need to marshal a result js/johnson/prelude.js @@ -24,6 +24,7 @@ require "johnson/spidermonkey/debugger" require "johnson/spidermonkey/immutable_node" # the 'public' interface +require "johnson/error" require "johnson/runtime" require "johnson/parser" lib/johnson.rb @@ -19,23 +19,25 @@ module Johnson #:nodoc: 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) + class << self + def raise_js_exception(jsex) + raise jsex if Exception === jsex + raise Johnson::Error.new(jsex.to_s) unless Johnson::SpiderMonkey::RubyLandProxy === jsex + + stack = jsex.stack rescue nil + + message = jsex['message'] || jsex.to_s + at = "(#{jsex['fileName']}):#{jsex['lineNumber']}" + ex = Johnson::Error.new("#{message} at #{at}") + if stack + js_caller = stack.split("\n").find_all { |x| x != '@:0' } + ex.set_backtrace(js_caller + caller) + else + ex.set_backtrace(caller) + end + + raise ex end - - raise ex end end end lib/johnson/spidermonkey/runtime.rb @@ -57,7 +57,7 @@ module Johnson end def test_calling_non_functions_complains - assert_raise(Johnson::Error) { @runtime.evaluate("new Object()").call } + assert_raise(RuntimeError) { @runtime.evaluate("new Object()").call } end def test_functions_can_be_called test/johnson/spidermonkey/ruby_land_proxy_test.rb ext/spidermonkey/error.c ext/spidermonkey/error.h ab1e446a5d21481038a96a04a88585eb34bcaa1e Aaron Patterson aaron.patterson@gmail.com http://github.com/jbarnette/johnson/commit/d4969c6bdba5740518c2b4ae625a9037287465cc d4969c6bdba5740518c2b4ae625a9037287465cc 2008-06-01T13:59:39-07:00 2008-06-01T13:59:39-07:00 Making exceptions better. 7130ce198274333298a8d3714eee06ec9757e360 Aaron Patterson aaron.patterson@gmail.com