JavaScriptCore-576.tar.gz

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

diff --git a/debugger/DebuggerCallFrame.cpp b/debugger/DebuggerCallFrame.cpp
index 27b824cd3f14e604e64c234d2ebd13a89148218a..a3299d432a0afc79949c82f122be221802b7ef1f 100644 (file)
--- a/debugger/DebuggerCallFrame.cpp
+++ b/debugger/DebuggerCallFrame.cpp
@@ -41,10 +41,27 @@ const UString* DebuggerCallFrame::functionName() const
     if (!m_callFrame->codeBlock())
         return 0;
 
     if (!m_callFrame->codeBlock())
         return 0;
 

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

     if (!function)
         return 0;
     if (!function)
         return 0;

-    return &function->name(&m_callFrame->globalData());
+    return function->calculatedDisplayName(m_callFrame);

 }
 
 DebuggerCallFrame::Type DebuggerCallFrame::type() const
 }
 
 DebuggerCallFrame::Type DebuggerCallFrame::type() const


@@ -63,19 +80,17 @@ 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;
-    SourceCode source = makeSource(script);
-    RefPtr<EvalNode> evalNode = m_callFrame->scopeChain()->globalData->parser->parse<EvalNode>(m_callFrame, m_callFrame->dynamicGlobalObject()->debugger(), source, &errLine, &errMsg);
-    if (!evalNode)
-        return Error::create(m_callFrame, SyntaxError, errMsg, errLine, source.provider()->asID(), source.provider()->url());
+    RefPtr<EvalExecutable> eval = EvalExecutable::create(m_callFrame, makeSource(script));
+    JSObject* error = eval->compile(m_callFrame, m_callFrame->scopeChain());
+    if (error)
+        return error;

 
 

-    return m_callFrame->scopeChain()->globalData->interpreter->execute(evalNode.get(), m_callFrame, thisObject(), m_callFrame->scopeChain(), &exception);
+    return m_callFrame->scopeChain()->globalData->interpreter->execute(eval.get(), m_callFrame, thisObject(), m_callFrame->scopeChain(), &exception);

 }
 
 } // namespace JSC
 }
 
 } // namespace JSC