JavaScriptCore-554.1.tar.gz

[apple/javascriptcore.git] / debugger / DebuggerCallFrame.cpp

diff --git a/debugger/DebuggerCallFrame.cpp b/debugger/DebuggerCallFrame.cpp
index 27b824cd3f14e604e64c234d2ebd13a89148218a..cd8702bc44bed163b0ed404b3bea909d5abe7947 100644 (file)
--- a/debugger/DebuggerCallFrame.cpp
+++ b/debugger/DebuggerCallFrame.cpp
@@ -46,6 +46,17 @@ const UString* DebuggerCallFrame::functionName() const
         return 0;
     return &function->name(&m_callFrame->globalData());
 }
         return 0;
     return &function->name(&m_callFrame->globalData());
 }

+    
+UString DebuggerCallFrame::calculatedFunctionName() const
+{
+    if (!m_callFrame->codeBlock())
+        return 0;
+    
+    JSFunction* function = static_cast<JSFunction*>(m_callFrame->callee());
+    if (!function)
+        return 0;
+    return function->calculatedDisplayName(&m_callFrame->globalData());
+}

 
 DebuggerCallFrame::Type DebuggerCallFrame::type() const
 {
 
 DebuggerCallFrame::Type DebuggerCallFrame::type() const
 {


@@ -63,10 +74,10 @@ JSObject* DebuggerCallFrame::thisObject() const
     return asObject(m_callFrame->thisValue());
 }
 
     return asObject(m_callFrame->thisValue());
 }
 

-JSValuePtr DebuggerCallFrame::evaluate(const UString& script, JSValuePtr& exception) const
+JSValue DebuggerCallFrame::evaluate(const UString& script, JSValue& exception) const

 {
     if (!m_callFrame->codeBlock())
 {
     if (!m_callFrame->codeBlock())

-        return noValue();
+        return JSValue();

 
     int errLine;
     UString errMsg;
 
     int errLine;
     UString errMsg;