diff --git a/ext/v8/rr.cpp b/ext/v8/rr.cpp index c2cdeb7..4dacae9 100644 --- a/ext/v8/rr.cpp +++ b/ext/v8/rr.cpp @@ -8,6 +8,7 @@ #include "v8_date.h" #include "v8_msg.h" #include "v8_external.h" +#include "v8_exception.h" using namespace v8; @@ -75,6 +76,13 @@ VALUE rr_v82rb(Handle value) { VALUE rr_v82rb(Handle value) { return rr_reflect_v8_message(value); } +VALUE rr_v82rb(Handle value) { + return rr_reflect_v8_stacktrace(value); +} +VALUE rr_v82rb(Handle value) { + return rr_reflect_v8_stackframe(value); +} + VALUE rr_v82rb(Handle value) { return rr_v82rb((Handle)value); } @@ -87,6 +95,9 @@ VALUE rr_v82rb(Handle value) { VALUE rr_v82rb(Handle value) { return rr_v82rb((Handle)value); } +VALUE rr_v82rb(Handle value) { + return rr_v82rb((Handle)value); +} VALUE rr_v82rb(v8::Handle value) { return rr_v82rb((Handle)value); } diff --git a/ext/v8/rr.h b/ext/v8/rr.h index 2555282..828c679 100644 --- a/ext/v8/rr.h +++ b/ext/v8/rr.h @@ -16,11 +16,15 @@ VALUE rr_v82rb(v8::Handle value); VALUE rr_v82rb(v8::Handle value); VALUE rr_v82rb(v8::Handle value); VALUE rr_v82rb(v8::Handle value); +VALUE rr_v82rb(v8::Handle value); VALUE rr_v82rb(v8::Handle value); VALUE rr_v82rb(v8::Handle value); VALUE rr_v82rb(v8::Handle value); VALUE rr_v82rb(v8::Handle value); VALUE rr_v82rb(v8::Handle value); +VALUE rr_v82rb(v8::Handle value); +VALUE rr_v82rb(v8::Handle value); + VALUE rr_v82rb(bool value); VALUE rr_v82rb(double value); VALUE rr_v82rb(int64_t value); diff --git a/ext/v8/v8_exception.cpp b/ext/v8/v8_exception.cpp index 098b7e6..d166301 100644 --- a/ext/v8/v8_exception.cpp +++ b/ext/v8/v8_exception.cpp @@ -1,5 +1,6 @@ #include "v8_exception.h" #include "rr.h" +#include "v8_ref.h" #include "execinfo.h" #include "signal.h" @@ -38,19 +39,90 @@ namespace { HandleScope scope; return rr_v82rb(Exception::Error(rr_rb2v8(value)->ToString())); } + + VALUE StackTraceClass; + VALUE StackFrameClass; + namespace Trace { + + Local trace(VALUE value) { + return V8_Ref_Get(value); + } + VALUE GetFrame(VALUE self, VALUE index) { + HandleScope scope; + return rr_v82rb(trace(self)->GetFrame(NUM2UINT(index))); + } + VALUE GetFrameCount(VALUE self) { + HandleScope scope; + Local t = trace(self); + return rr_v82rb(t->GetFrameCount()); + } + VALUE AsArray(VALUE self) { + return rr_v82rb(trace(self)->AsArray()); + } + VALUE CurrentStackTrace(VALUE self, VALUE frame_limit) { + return rr_v82rb(StackTrace::CurrentStackTrace(NUM2INT(frame_limit))); + } + } + + namespace Frame { + Local frame(VALUE value) { + return V8_Ref_Get(value); + } + VALUE GetLineNumber(VALUE self) { + return rr_v82rb(frame(self)->GetLineNumber()); + } + VALUE GetColumn(VALUE self) { + return rr_v82rb(frame(self)->GetColumn()); + } + VALUE GetScriptName(VALUE self) { + return rr_v82rb(frame(self)->GetScriptName()); + } + VALUE GetFunctionName(VALUE self) { + return rr_v82rb(frame(self)->GetFunctionName()); + } + VALUE IsEval(VALUE self) { + return rr_v82rb(frame(self)->IsEval()); + } + VALUE IsConstructor(VALUE self) { + return rr_v82rb(frame(self)->IsConstructor()); + } + } + } void rr_init_v8_exception() { VALUE V8 = rb_define_module("V8"); VALUE V8_C = rb_define_module_under(V8, "C"); rr_define_singleton_method(V8_C, "ThrowException", _ThrowException, 1); + VALUE ExceptionClass = rr_define_class("Exception"); rr_define_singleton_method(ExceptionClass, "RangeError", RangeError, 1); rr_define_singleton_method(ExceptionClass, "ReferenceError", ReferenceError, 1); rr_define_singleton_method(ExceptionClass, "SyntaxError", SyntaxError, 1); rr_define_singleton_method(ExceptionClass, "Error", Error, 1); - + + StackTraceClass = rr_define_class("StackTrace"); + rr_define_singleton_method(StackTraceClass, "CurrentStackTrace", Trace::CurrentStackTrace, 0); + rr_define_method(StackTraceClass, "GetFrame", Trace::GetFrame, 1); + rr_define_method(StackTraceClass, "GetFrameCount", Trace::GetFrameCount, 0); + rr_define_method(StackTraceClass, "AsArray", Trace::AsArray, 0); + + StackFrameClass = rr_define_class("StackFrame"); + rr_define_method(StackFrameClass, "GetLineNumber", Frame::GetLineNumber, 0); + rr_define_method(StackFrameClass, "GetColumn", Frame::GetColumn, 0); + rr_define_method(StackFrameClass, "GetScriptName", Frame::GetScriptName, 0); + rr_define_method(StackFrameClass, "GetFunctionName", Frame::GetFunctionName, 0); + rr_define_method(StackFrameClass, "IsEval", Frame::IsEval, 0); + rr_define_method(StackFrameClass, "IsConstructor", Frame::IsConstructor, 0); + v8::V8::SetFatalErrorHandler(fatal); //comment this in for debugging. // signal(SIGSEGV, segfault); -} \ No newline at end of file +} + +VALUE rr_reflect_v8_stacktrace(Handle value) { + return rr_v8_ref_create(StackTraceClass, value); +} +VALUE rr_reflect_v8_stackframe(Handle value) { + return rr_v8_ref_create(StackFrameClass, value); +} diff --git a/ext/v8/v8_exception.h b/ext/v8/v8_exception.h index 7049f47..28f7aee 100644 --- a/ext/v8/v8_exception.h +++ b/ext/v8/v8_exception.h @@ -1,6 +1,11 @@ #ifndef _RR_V8_EXCEPTION_ #define _RR_V8_EXCEPTION_ +#include "v8.h" +#include "ruby.h" + void rr_init_v8_exception(); +VALUE rr_reflect_v8_stacktrace(v8::Handle value); +VALUE rr_reflect_v8_stackframe(v8::Handle value); #endif diff --git a/ext/v8/v8_msg.cpp b/ext/v8/v8_msg.cpp index 04edbed..b2e9807 100644 --- a/ext/v8/v8_msg.cpp +++ b/ext/v8/v8_msg.cpp @@ -23,6 +23,10 @@ namespace { return rr_v82rb(unwrap(self)->GetScriptResourceName()); } + VALUE GetStackTrace(VALUE self) { + return rr_v82rb(unwrap(self)->GetStackTrace()); + } + VALUE GetLineNumber(VALUE self) { return rr_v82rb(unwrap(self)->GetLineNumber()); } @@ -49,6 +53,7 @@ void rr_init_msg() { rr_define_method(MessageClass, "Get", Get, 0); rr_define_method(MessageClass, "GetSourceLine", GetSourceLine, 0); rr_define_method(MessageClass, "GetScriptResourceName", GetScriptResourceName, 0); + rr_define_method(MessageClass, "GetStackTrace", GetStackTrace, 0); rr_define_method(MessageClass, "GetLineNumber", GetLineNumber, 0); rr_define_method(MessageClass, "GetStartPosition", GetStartPosition, 0); rr_define_method(MessageClass, "GetEndPosition", GetEndPosition, 0);