feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

jsdebugger: use a real structure for a stack frame in the debuggeragent

Browse Source
This commit is contained in:
hjk
2010-10-27 17:36:39 +02:00
parent f93fe86be7
commit f51301585e
3 changed files with 67 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/plugins/debugger/qml/qmlengine.cpp
View File

@@ -100,6 +100,17 @@ QDataStream &operator>>(QDataStream &s, WatchData &data)
return s;
}
QDataStream &operator>>(QDataStream &s, StackFrame &frame)
{
frame = StackFrame();
QByteArray function;
QByteArray file;
s >> function >> file >> frame.line;
frame.function = QString::fromUtf8(function);
frame.file = QString::fromUtf8(file);
return s;
}
} // namespace Internal
struct QmlEnginePrivate
@@ -619,22 +630,13 @@ void QmlEngine::messageReceived(const QByteArray &message)
notifyInferiorSpontaneousStop();
}
QList<QPair<QString, QPair<QString, qint32> > > backtrace;
Internal::StackFrames stackFrames;
QList<Internal::WatchData> watches;
QList<Internal::WatchData> locals;
stream >> backtrace >> watches >> locals;
stream >> stackFrames >> watches >> locals;
Internal::StackFrames stackFrames;
typedef QPair<QString, QPair<QString, qint32> > Iterator;
int level = 0;
foreach (const Iterator &it, backtrace) {
Internal::StackFrame frame;
frame.level = ++level;
frame.file = it.second.first;
frame.line = it.second.second;
frame.function = it.first;
stackFrames.append(frame);
}
for (int i = 0; i != stackFrames.size(); ++i)
stackFrames[i].level = i + 1;
gotoLocation(stackFrames.value(0), true);
stackHandler()->setFrames(stackFrames);