@@ -297,12 +297,12 @@ JSBool report_ruby_error_in_js(JohnsonRuntime* runtime, int state, VALUE old_err case TAG_RAISE: { VALUE local_error = ruby_errinfo; - jsval js_err; ruby_errinfo = old_errinfo; - if (!convert_to_js(runtime, local_error, &js_err)) - return JS_FALSE; - JS_SetPendingException(context, js_err); - return JS_FALSE; + + local_error = rb_funcall(local_error, rb_intern("inspect"), 0); + JS_ReportError(context, StringValuePtr(local_error)); + + return JS_FALSE ; } case TAG_THROW: ext/spidermonkey/conversions.c @@ -204,11 +204,25 @@ module Johnson end def test_raises_in_js - err = RuntimeError.new("an exception") - asplode = lambda { raise err } - assert_js_equal(err, "x = null; try { foo(); } catch(ex) { x = ex; }; x", :foo => asplode) + @runtime["foo"] = lambda { raise RuntimeError.new("an exception") } + raised = @runtime.evaluate "x = null; try { foo(); } catch(ex) { x = ex; }; x" + assert_equal "#<RuntimeError: an exception>", raised.message end - + + def test_uncaught_exceptions_have_decent_stack_trace + @runtime["foo"] = lambda { raise RuntimeError.new("an exception") } + line_number = __LINE__ - 1 # reference to previous line + begin + @runtime.evaluate "foo()" + rescue Exception => e + assert_equal "#<RuntimeError: an exception> at (none):1", e.message + assert_match %r/none:1\b/, e.backtrace[0] + assert_match %r/#{__FILE__}:#{line_number}\b/, e.backtrace[1] + else + flunk "exception was not raised" + end + end + def test_array_multiple_assignment a = @runtime.evaluate("[1,2,3]") x, y, z = a test/johnson/spidermonkey/ruby_land_proxy_test.rb 13bdf927cb158e13938e357b36088f49346c2ec0 Mike Dalessio mike@csa.net http://github.com/jbarnette/johnson/commit/54ebdfc3bad9af226294b4007113c0d18305f2b3 54ebdfc3bad9af226294b4007113c0d18305f2b3 2009-06-05T11:23:39-07:00 2009-06-05T11:16:22-07:00 uncaught ruby exceptions now have a somewhat-mode-helpful stack trace which includes javascript stack. Signed-off-by: Aaron Patterson <aaron.patterson@gmail.com> 511cd3c91f1eae3535fffc074657cd4f8c8d1d6a Aaron Patterson aaron.patterson@gmail.com