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

Debugger: Use Gdbmi parser in CDB for parsing of protocol 1

Browse Source 
Change dumper protocol 1 output not to contain type names as
hash keys (might contain blanks), use lists instead.
Start fixing autotests for 4.6.
This commit is contained in:
Friedemann Kleint
2009-09-18 16:55:17 +02:00
parent 5b182196f9
commit 603630fad6
6 changed files with 150 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/debugger/watchutils.h
View File

@@ -49,6 +49,7 @@ namespace Debugger {
namespace Internal {
class WatchData;
class GdbMi;
QString dotEscape(QString str);
QString currentTime();
@@ -181,7 +182,6 @@ public:
void clear();
double dumperVersion() const { return m_dumperVersion; }
void setDumperVersion(double v) { m_dumperVersion = v; }
int typeCount() const;
// Look up a simple, non-template type
@@ -192,17 +192,14 @@ public:
int qtVersion() const;
QString qtVersionString() const;
void setQtVersion(int v);
void setQtVersion(const QString &v);
QString qtNamespace() const;
void setQtNamespace(const QString &qtNamespace);
// Complete parse of "query" (protocol 1) response from debuggee buffer.
// 'data' excludes the leading indicator character.
bool parseQuery(const char *data, Debugger debugger);
// Set up from pre-parsed type list
void parseQueryTypes(const QStringList &l, Debugger debugger);
bool parseQuery(const GdbMi &data, Debugger debugger);
// Sizes can be added as the debugger determines them
void addSize(const QString &name, int size);
// Determine the parameters required for an "evaluate" (protocol 2) call
void evaluationParameters(const WatchData &data,
@@ -228,9 +225,6 @@ public:
QString toString(bool debug = false) const;
// Helpers for debuggers that use a different dumper parser.
void addSize(const QString &name, int size);
void addExpression(const QString &expression, const QString &value);
static QString msgDumperOutdated(double requiredVersion, double currentVersion);
@@ -241,6 +235,7 @@ private:
// Look up a simple (namespace) type
static Type specialType(QString s);
QString evaluationSizeofTypeExpression(const QString &typeName, Debugger d) const;
void parseQueryTypes(const QStringList &l, Debugger debugger);
NameTypeMap m_nameTypeMap;
SizeCache m_sizeCache;