From 92fcd9b923d925f01aa87467b669d61a758c5310 Mon Sep 17 00:00:00 2001 From: Roy Qu Date: Thu, 25 Nov 2021 20:26:43 +0800 Subject: [PATCH] implemented: watch var handles --- NEWS.md | 4 + RedPandaIDE/RedPandaIDE_zh_CN.qm | Bin 106714 -> 106748 bytes RedPandaIDE/RedPandaIDE_zh_CN.ts | 375 +++++++++---------- RedPandaIDE/debugger.cpp | 577 +++++++++++++++--------------- RedPandaIDE/debugger.h | 87 +++-- RedPandaIDE/gdbmiresultparser.cpp | 8 +- RedPandaIDE/gdbmiresultparser.h | 5 +- RedPandaIDE/mainwindow.cpp | 17 +- RedPandaIDE/mainwindow.ui | 4 +- RedPandaIDE/version.h | 2 +- 10 files changed, 555 insertions(+), 524 deletions(-) diff --git a/NEWS.md b/NEWS.md index 0a9732f6..9fce4961 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,7 @@ +Version 0.10.0 For Dev-C++ 7 Beta + - enhancement: use gdb/mi interface to communicate with gdb debug session + - enhancement: better display of watch vars + Version 0.9.3 For Dev-C++ 7 Beta - fix: the count in the title of issues view isn't correct - fix: columns calculation not correct when paint lines containing chinese characters diff --git a/RedPandaIDE/RedPandaIDE_zh_CN.qm b/RedPandaIDE/RedPandaIDE_zh_CN.qm index 751c4090e99fd5c582d14f73c906fa6c473fcb3b..18a0af6e662aae3f6e32b6f353104435b0ee1394 100644 GIT binary patch delta 9923 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ǽJe~7WVnv?2Id2iJ)a*OwBX%Rof5iFtz+SeY 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 F{2yL2`qKaa diff --git a/RedPandaIDE/RedPandaIDE_zh_CN.ts b/RedPandaIDE/RedPandaIDE_zh_CN.ts index dd35d1e5..239e2e49 100644 --- a/RedPandaIDE/RedPandaIDE_zh_CN.ts +++ b/RedPandaIDE/RedPandaIDE_zh_CN.ts @@ -95,17 +95,17 @@ BacktraceModel - + Function 函数 - + Filename 文件名 - + Line 行 @@ -151,37 +151,37 @@ BreakpointModel - + Filename 文件名 - + Line 行 - + Condition 条件 - + Save file '%1' failed. 保存文件'%1'失败。 - + Can't open file '%1' for write. 无法写入文件'%1'. - + Error in json file '%1':%2 : %3 JSON文件'%1':%2中存在错误：%3 - + Can't open file '%1' for read. 无法读取文件'%1'. @@ -952,73 +952,71 @@ Are you really want to continue? Debugger - + No compiler set 无编译器设置 - + No compiler set is configured. 没有配置编译器设置。 - + Can't start debugging. 无法启动调试器 - + Debugger path error 调试路径错误 - + Debugger's path "%1" contains non-ascii characters. 调试路径"%1"中包含非ASCII字符（如，中文字符） - + This prevents it from executing. 这会导致调试器无法启动。 - + Debugger not exists 找不到调试器 - + Can''t find debugger in : "%1" 找不到调试器程序"%1" - - + Execute to evaluate 执行以求值 - Not found in current context - 不在当前语境中 + 不在当前语境中 - + Compile 编译 - + Source file is more recent than executable. 源文件比程序文件新。 - + Recompile? 重新编译？ - + Signal "%1" Received: 收到信号"%1": @@ -2867,11 +2865,11 @@ Are you really want to continue? - + + - - - + + Issues 编译器 @@ -3128,8 +3126,8 @@ Are you really want to continue? - - + + Copy 复制 @@ -3140,7 +3138,7 @@ Are you really want to continue? - + Paste 粘贴 @@ -3151,7 +3149,7 @@ Are you really want to continue? - + Select All 选择全部 @@ -3278,7 +3276,7 @@ Are you really want to continue? - + New Problem Set 新建试题集 @@ -3297,14 +3295,14 @@ Are you really want to continue? - + Save Problem Set 保存试题集 - + Load Problem Set 载入试题集 @@ -3639,7 +3637,7 @@ Are you really want to continue? - + Clear all breakpoints 删除所有断点 @@ -3740,7 +3738,7 @@ Are you really want to continue? - + Rename Symbol 重命名符号 @@ -3761,13 +3759,13 @@ Are you really want to continue? - + Export As RTF 导出为RTF - + Export As HTML 导出为HTML @@ -3887,7 +3885,7 @@ Are you really want to continue? - + Open Folder 打开文件夹 @@ -3897,7 +3895,7 @@ Are you really want to continue? 运行参数... - + File Encoding 文件编码 @@ -4070,44 +4068,44 @@ Are you really want to continue? 重新编译？ - - + + Save last open info error 保存上次打开信息失败 - + Can't remove old last open information file '%1' 无法删除旧上次打开信息文件'%1' - + Can't save last open info file '%1' 无法保存上次打开信息文件'%1' - + Load last open info error 载入上次打开信息失败 - + Can't load last open info file '%1' 无法载入上次打开信息文件'%1' - + Show detail debug logs 显示详细调试器日志 - + Copy all 全部复制 - - + + Clear 清除 @@ -4123,7 +4121,7 @@ Are you really want to continue? - + Problem Set %1 试题集%1 @@ -4161,56 +4159,56 @@ Are you really want to continue? 项目已经被修改过，是否需要重新构建？ - + Auto Save Error 自动保存出错 - + Auto save "%1" to "%2" failed:%3 自动保存"%1"到"%2"失败：%3 - + Properties... 试题属性... - + Set Problem Set Name 设置试题集名称 - + Problem Set Name: 试题集名称： - + Remove 删除 - + Remove All Bookmarks 删除全部书签 - + Modify Description 修改描述 - - - + + + Bookmark Description 书签描述 - - - + + + Description: 描述： @@ -4219,363 +4217,363 @@ Are you really want to continue? 在调试主控台中显示调试器输出 - + Remove this search 清除这次搜索 - + Clear all searches 删除所有搜索 - + Breakpoint condition... 断点条件... - + Break point condition 断点条件 - + Enter the condition of the breakpoint: 输入当前断点的生效条件: - + Remove All Breakpoints Remove all breakpoints 删除所有断点 - + Remove Breakpoint 删除当前断点 - + Rename File 重命名文件 - - + + Add Folder 添加文件夹 - + New folder 新文件夹 - + Folder name: 文件夹： - + Rename Folder 重命名 - + Remove Folder 删除文件夹 - + Sort By Type 按类型排序 - + Sort alphabetically 按名称排序 - + Show inherited members 显示继承的成员 - + Goto declaration 跳转到声明处 - + Goto definition 跳转到定义处 - + Open in Editor 在编辑器中打开 - + Open in External Program 使用外部程序打开 - + Open in Terminal 在终端中打开 - + Open in Windows Explorer 在Windows浏览器中打开 - + Character sets 字符集 - + %1 files autosaved 已自动保存%1个文件 - + Set answer to... 设置答案源代码... - + select other file... 选择其他文件... - + Select Answer Source File 选择答案源代码文件 - + C/C++Source Files (*.c *.cpp *.cc *.cxx) C/C++Source Files (*.c *.cpp *.cc *.cxx C/C++源代码文件 (*.c *.cpp *.cc *.cxx) - + Save project 保存项目 - + The project '%1' has modifications. 项目'%1'有改动。 - - + + Do you want to save it? 需要保存吗？ - - + + File Changed 文件已发生变化 - + New Project File? 新建项目文件? - + Do you want to add the new file to the project? 您是否要将新建的文件加入项目? - - - - + + + + Save Error 保存失败 - + Change Project Compiler Set 改变项目编译器配置集 - + Change the project's compiler set will lose all custom compiler set options. 改变项目的编译器配置集会导致所有的自定义编译器选项被重置。 - + Do you really want to do that? 你真的想要做那些吗？ - + Do you really want to clear all breakpoints in this file? 您真的要清除该文件的所有断点吗？ - + New project 新建项目 - + Close %1 and start new project? 关闭'%1'以打开新项目? - + Folder not exist 文件夹不存在 - + Folder '%1' doesn't exist. Create it now? 文件夹'%1'不存在。是否创建？ - + Can't create folder 无法创建文件夹 - + Failed to create folder '%1'. 创建文件夹'%1'失败。 - + Save new project as - + Red panda Dev-C++ project file (*.dev) 小熊猫Dev-C++项目文件 (*.dev) - + New project fail 新建项目失败 - + Can't assign project template 无法使用模板创建项目 - + Remove file 删除文件 - + Remove the file from disk? 同时从硬盘上删除文件？ - + untitled 无标题 - + New Project File Name 新的项目文件名 - + File Name: 文件名： - + File Already Exists! 文件已存在！ - + File '%1' already exists! 文件'%1'已经存在！ - + Add to project 添加到项目 - + Rename Error 重命名出错 - + Symbol '%1' is defined in system header. 符号'%1'在系统头文件中定义，无法修改。 - + New Name 新名称 - - + + Replace Error 替换出错 - + Can't open file '%1' for replace! 无法打开文件'%1'进行替换！ - + Contents has changed since last search! 内容和上次查找时不一致。 - + Rich Text Format Files (*.rtf) RTF格式文件 (*.rtf) - + HTML Files (*.html) HTML文件 (*.html) - + The current problem set is not empty. 当前的试题集不是空的。 - + Problem %1 试题%1 - - + + Problem Set Files (*.pbs) 试题集文件 (*.pbs) - + Load Error 载入失败 - - + + Problem Case %1 试题案例%1 @@ -4587,14 +4585,14 @@ Are you really want to continue? - - - - - - - - + + + + + + + + Error 错误 @@ -4604,75 +4602,75 @@ Are you really want to continue? 项目历史 - + File '%1' was changed. 磁盘文件'%1'已被修改。 - + Reload its content from disk? 是否重新读取它的内容？ - + File '%1' was removed. 磁盘文件'%1'已被删除。 - + Keep it open? 是否保持它在小熊猫C++中打开的编辑窗口？ - + Open 打开 - + Compile Failed 编译失败 - + Run Failed 运行失败 - - + + Confirm Convertion 确认转换 - - + + The editing file will be saved using %1 encoding. <br />This operation can't be reverted. <br />Are you sure to continue? 当前编辑器中的文件将会使用%1编码保存。<br />这项操作无法被撤回。<br />你确定要继续吗？ - + New Watch Expression 新监视表达式 - + Enter Watch Expression (it is recommended to use 'this->' for class members): 输入监视表达式 - + Parsing file %1 of %2: "%3" （%1/%2）正在解析文件"%3" - - + + Done parsing %1 files in %2 seconds 完成%1个文件的解析,用时%2秒 - + (%1 files per second) (每秒%1个文件） @@ -6188,12 +6186,12 @@ Are you really want to continue? RegisterModel - + Register 寄存器 - + Value 值 @@ -6600,7 +6598,7 @@ Are you really want to continue? 自动链接 - + @@ -6676,7 +6674,7 @@ Are you really want to continue? 杂项 - + Program Runner @@ -7089,37 +7087,48 @@ Are you really want to continue? WatchModel - + Save file '%1' failed. 保存文件'%1'失败。 - + Can't open file '%1' for write. 无法写入文件'%1'. - + Error in json file '%1':%2 : %3 JSON文件'%1':%2中存在错误：%3 - + + Execute to evaluate 执行以求值 - + + Not Valid + 在当前作用域中无效 + + + Can't open file '%1' for read. 无法读取文件'%1'. - + Expression 表达式 - + + Type + 类型 + + + Value 值 diff --git a/RedPandaIDE/debugger.cpp b/RedPandaIDE/debugger.cpp index f371f8c7..06f6ae10 100644 --- a/RedPandaIDE/debugger.cpp +++ b/RedPandaIDE/debugger.cpp @@ -27,6 +27,9 @@ Debugger::Debugger(QObject *parent) : QObject(parent) mReader = nullptr; mCommandChanged = false; mLeftPageIndexBackup = -1; + + connect(mWatchModel, &WatchModel::fetchChildren, + this, &Debugger::fetchVarChildren); } bool Debugger::start() @@ -58,6 +61,7 @@ bool Debugger::start() tr("Can''t find debugger in : \"%1\"").arg(debuggerPath)); return false; } + mWatchModel->resetAllVarInfos(); mReader = new DebugReader(this); mReader->setDebuggerPath(debuggerPath); connect(mReader, &QThread::finished,this,&Debugger::clearUpReader); @@ -81,10 +85,20 @@ bool Debugger::start() &Debugger::updateRegisterNames); connect(mReader, &DebugReader::registerValuesUpdated, this, &Debugger::updateRegisterValues); + connect(mReader, &DebugReader::varCreated,mWatchModel, + &WatchModel::updateVarInfo); + connect(mReader, &DebugReader::prepareVarChildren,mWatchModel, + &WatchModel::prepareVarChildren); + connect(mReader, &DebugReader::addVarChild,mWatchModel, + &WatchModel::addVarChild); + connect(mReader, &DebugReader::varValueUpdated,mWatchModel, + &WatchModel::updateVarValue); connect(mReader, &DebugReader::inferiorContinued,pMainWindow, &MainWindow::removeActiveBreakpoints); connect(mReader, &DebugReader::inferiorStopped,pMainWindow, &MainWindow::setActiveBreakpoint); + connect(mReader, &DebugReader::inferiorStopped,this, + &Debugger::refreshWatchVars); mReader->registerInferiorStoppedCommand("-stack-list-frames",""); mReader->registerInferiorStoppedCommand("-stack-list-variables", "--all-values"); @@ -110,10 +124,6 @@ void Debugger::clearUpReader() mReader->deleteLater(); mReader=nullptr; -// if WatchVarList.Count = 0 then // nothing worth showing, restore view -// MainForm.LeftPageControl.ActivePageIndex := LeftPageIndexBackup; - -// // Close CPU window if (pMainWindow->cpuDialog()!=nullptr) { pMainWindow->cpuDialog()->close(); } @@ -129,9 +139,9 @@ void Debugger::clearUpReader() mBacktraceModel->clear(); - for(PWatchVar var:mWatchModel->watchVars()) { - invalidateWatchVar(var); - } + mWatchModel->clearAllVarInfos(); + + mBreakpointModel->invalidateAllBreakpointNumbers(); pMainWindow->updateEditorActions(); } @@ -279,37 +289,43 @@ void Debugger::sendAllBreakpointsToDebugger() } } -void Debugger::addWatchVar(const QString &namein) +void Debugger::addWatchVar(const QString &expression) { // Don't allow duplicates... - PWatchVar oldVar = mWatchModel->findWatchVar(namein); + PWatchVar oldVar = mWatchModel->findWatchVar(expression); if (oldVar) return; PWatchVar var = std::make_shared(); var->parent= nullptr; - var->expression = namein; + var->expression = expression; var->value = tr("Execute to evaluate"); var->numChild = 0; var->hasMore = false; + var->parent = nullptr; mWatchModel->addWatchVar(var); sendWatchCommand(var); } -void Debugger::renameWatchVar(const QString &oldname, const QString &newname) +void Debugger::modifyWatchVarExpression(const QString &oldExpr, const QString &newExpr) { // check if name already exists; - PWatchVar var = mWatchModel->findWatchVar(newname); + PWatchVar var = mWatchModel->findWatchVar(newExpr); if (var) return; - var = mWatchModel->findWatchVar(oldname); + var = mWatchModel->findWatchVar(oldExpr); if (var) { - var->name = newname; - if (mExecuting && var->gdbIndex!=-1) + if (mExecuting && !var->expression.isEmpty()) sendRemoveWatchCommand(var); - invalidateWatchVar(var); + var->expression = newExpr; + var->type.clear(); + var->value.clear(); + var->hasMore = false; + var->numChild=0; + var->name.clear(); + var->children.clear(); if (mExecuting) { sendWatchCommand(var); @@ -319,9 +335,16 @@ void Debugger::renameWatchVar(const QString &oldname, const QString &newname) void Debugger::refreshWatchVars() { - for (PWatchVar var:mWatchModel->watchVars()) { - if (var->gdbIndex == -1) - sendWatchCommand(var); + if (mExecuting) { + sendAllWatchVarsToDebugger(); + sendCommand("-var-update"," --all-values *"); + } +} + +void Debugger::fetchVarChildren(const QString &varName) +{ + if (mExecuting) { + sendCommand("-var-list-children",varName); } } @@ -332,75 +355,37 @@ void Debugger::removeWatchVars(bool deleteparent) } else { for(const PWatchVar& var:mWatchModel->watchVars()) { sendRemoveWatchCommand(var); - invalidateWatchVar(var); } + mWatchModel->clearAllVarInfos(); } } void Debugger::removeWatchVar(const QModelIndex &index) { + PWatchVar var = mWatchModel->findWatchVar(index); + if (!var) + return; + sendRemoveWatchCommand(var); mWatchModel->removeWatchVar(index); } -void Debugger::invalidateAllVars() -{ - mReader->setInvalidateAllVars(true); -} - -void Debugger::sendAllWatchvarsToDebugger() +void Debugger::sendAllWatchVarsToDebugger() { for (PWatchVar var:mWatchModel->watchVars()) { - sendWatchCommand(var); + if (var->name.isEmpty()) + sendWatchCommand(var); } } -void Debugger::invalidateWatchVar(const QString &name) +PWatchVar Debugger::findWatchVar(const QString &expression) { - PWatchVar var = mWatchModel->findWatchVar(name); - if (var) { - invalidateWatchVar(var); - } -} - -void Debugger::invalidateWatchVar(PWatchVar var) -{ - var->gdbIndex = -1; - QString value; - if (mExecuting) { - value = tr("Not found in current context"); - } else { - value = tr("Execute to evaluate"); - } - var->value = value; - if (var->children.isEmpty()) { - mWatchModel->notifyUpdated(var); - } else { - mWatchModel->beginUpdate(); - var->children.clear(); - mWatchModel->endUpdate(); - } -} - -PWatchVar Debugger::findWatchVar(const QString &name) -{ - return mWatchModel->findWatchVar(name); + return mWatchModel->findWatchVar(expression); } //void Debugger::notifyWatchVarUpdated(PWatchVar var) //{ // mWatchModel->notifyUpdated(var); //} - -void Debugger::notifyBeforeProcessWatchVar() -{ - mWatchModel->beginUpdate(); -} - -void Debugger::notifyAfterProcessWatchVar() -{ - mWatchModel->endUpdate(); -} - BacktraceModel* Debugger::backtraceModel() { return mBacktraceModel; @@ -413,7 +398,7 @@ BreakpointModel *Debugger::breakpointModel() void Debugger::sendWatchCommand(PWatchVar var) { - sendCommand("-var-carete", QString(" - %1").arg(var->expression)); + sendCommand("-var-create", var->expression); } void Debugger::sendRemoveWatchCommand(PWatchVar var) @@ -587,7 +572,6 @@ DebugReader::DebugReader(Debugger* debugger, QObject *parent) : QThread(parent), mDebugger = debugger; mProcess = nullptr; mCmdRunning = false; - mInvalidateAllVars = false; } void DebugReader::postCommand(const QString &Command, const QString &Params, @@ -740,6 +724,15 @@ void DebugReader::processResult(const QByteArray &result) case GDBMIResultType::RegisterValues: handleRegisterValue(multiValues["register-values"].array()); return; + case GDBMIResultType::CreateVar: + handleCreateVar(multiValues); + return; + case GDBMIResultType::ListVarChildren: + handleListVarChildren(multiValues); + return; + case GDBMIResultType::UpdateVarValue: + handleUpdateVarValue(multiValues["changelist"].array()); + return; } } @@ -846,12 +839,6 @@ void DebugReader::processDebugOutput(const QByteArray& debugOutput) // Only update once per update at most //WatchView.Items.BeginUpdate; - if (mInvalidateAllVars) { - //invalidate all vars when there's first output - mDebugger->removeWatchVars(false); - mInvalidateAllVars = false; - } - emit parseStarted(); mConsoleOutput.clear(); @@ -899,190 +886,6 @@ void DebugReader::runInferiorStoppedHook() } } -QString DebugReader::processEvalOutput() -{ - int indent = 0; - - // First line gets special treatment - QString result =""; - if (result.startsWith('{')) - indent+=4; - - // Collect all data, add formatting in between -// AnnotationType nextAnnotation; -// QString nextLine; -// bool shouldExit = false; -// do { -// nextAnnotation = getNextAnnotation(); -// nextLine = getNextLine(); -// switch(nextAnnotation) { -// // Change indent if { or } is found -// case AnnotationType::TFieldBegin: -// result += "\r\n" + QString(4,' '); -// break; -// case AnnotationType::TFieldValue: -// if (nextLine.startsWith('{') && (peekNextAnnotation() != -// AnnotationType::TArrayBegin)) -// indent+=4; -// break; -// case AnnotationType::TFieldEnd: -// if (nextLine.endsWith('}')) { -// indent-=4; -// result += "\r\n" + QString(4,' '); -// } -// break; -// case AnnotationType::TEOF: -// case AnnotationType::TValueHistoryEnd: -// case AnnotationType::TDisplayEnd: -// shouldExit = true; -// default: -// break; -// } -// result += nextLine; -// } while (!shouldExit); - return result; -} - -void DebugReader::processWatchOutput(PWatchVar watchVar) -{ -// // Expand if it was expanded or if it didn't have any children -// bool ParentWasExpanded = false; - - // Do not remove root node of watch variable - - watchVar->children.clear(); - watchVar->value = ""; - // Process output parsed by ProcessEvalStruct - QString s = processEvalOutput(); - - QStringList tokens = tokenize(s); - PWatchVar parentVar = watchVar; - PWatchVar currentVar = watchVar; - - QVector varStack; - int i=0; - while (i='a' && ch<='z') - || (ch>='A' && ch<='Z') || (ch>127)) { - //is identifier,create new child node - PWatchVar newVar = std::make_shared(); - newVar->parent = parentVar.get(); - newVar->name = token; - newVar->fullName = parentVar->fullName + '.'+token; - newVar->value = ""; - newVar->gdbIndex = -1; - parentVar->children.append(newVar); - currentVar = newVar; - } else if (ch == '{') { - if (parentVar->value.isEmpty()) { - parentVar->value = "{"; - } else { - PWatchVar newVar = std::make_shared(); - newVar->parent = parentVar.get(); - if (parentVar) { - int count = parentVar->children.count(); - newVar->name = QString("[%1]").arg(count); - newVar->fullName = parentVar->fullName + newVar->name; - } else { - newVar->name = QString("[0]"); - newVar->fullName = newVar->name; - } - newVar->value = "{"; - parentVar->children.append(newVar); - varStack.push_back(parentVar); - parentVar = newVar; - } - currentVar = nullptr; - } else if (ch == '}') { - currentVar = nullptr; - PWatchVar newVar = std::make_shared(); - newVar->parent = parentVar.get(); - newVar->name = ""; - newVar->value = "}"; - newVar->gdbIndex = -1; - parentVar->children.append(newVar); - if (!varStack.isEmpty()) { - parentVar = varStack.back(); - varStack.pop_back(); - } - } else if (ch == '=') { - // just skip it - } else if (ch == ',') { - currentVar = nullptr; - } else { - if (currentVar) { - if (currentVar->value.isEmpty()) { - currentVar->value = token; - } else { - currentVar->value += " "+token; - } - } else { - PWatchVar newVar = std::make_shared(); - newVar->parent = parentVar.get(); - newVar->name = QString("[%1]") - .arg(parentVar->children.count()); - newVar->fullName = parentVar->fullName + newVar->name; - newVar->value = token; - newVar->gdbIndex = -1; - parentVar->children.append(newVar); - } - } - i++; - } - // add placeholder name for variable name so we can format structs using one rule - - // Add children based on indent -// QStringList lines = TextToLines(s); - -// for (const QString& line:lines) { -// // Format node text. Remove trailing comma -// QString nodeText = line.trimmed(); -// if (nodeText.endsWith(',')) { -// nodeText.remove(nodeText.length()-1,1); -// } - -// if (nodeText.endsWith('{')) { // new member struct -// if (parentVar->text.isEmpty()) { // root node, replace text only -// parentVar->text = nodeText; -// } else { -// PWatchVar newVar = std::make_shared(); -// newVar->parent = parentVar.get(); -// newVar->name = ""; -// newVar->text = nodeText; -// newVar->gdbIndex = -1; -// parentVar->children.append(newVar); -// varStack.push_back(parentVar); -// parentVar = newVar; -// } -// } else if (nodeText.startsWith('}')) { // end of struct, change parent -// PWatchVar newVar = std::make_shared(); -// newVar->parent = parentVar.get(); -// newVar->name = ""; -// newVar->text = "}"; -// newVar->gdbIndex = -1; -// parentVar->children.append(newVar); -// if (!varStack.isEmpty()) { -// parentVar = varStack.back(); -// varStack.pop_back(); -// } -// } else { // next parent member/child -// if (parentVar->text.isEmpty()) { // root node, replace text only -// parentVar->text = nodeText; -// } else { -// PWatchVar newVar = std::make_shared(); -// newVar->parent = parentVar.get(); -// newVar->name = ""; -// newVar->text = nodeText; -// newVar->gdbIndex = -1; -// parentVar->children.append(newVar); -// } -// } -// } - // TODO: remember expansion state -} - void DebugReader::runNextCmd() { QMutexLocker locker(&mCmdQueueMutex); @@ -1100,10 +903,19 @@ void DebugReader::runNextCmd() emit cmdStarted(); QByteArray s; + QByteArray params; s=pCmd->command.toLocal8Bit(); if (!pCmd->params.isEmpty()) { - s+= ' '+pCmd->params.toLocal8Bit(); + params = pCmd->params.toLocal8Bit(); } + if (pCmd->command == "-var-create") { + //hack for variable creation,to easy remember var expression + params = " - @ "+params; + } else if (pCmd->command == "-var-list-children") { + //hack for list variable children,to easy remember var expression + params = " --all-values " + params; + } + s+=" "+params; s+= "\n"; if (mProcess->write(s)<0) { emit writeToDebugFailed(); @@ -1113,9 +925,9 @@ void DebugReader::runNextCmd() if (pSettings->debugger().enableDebugConsole() ) { //update debug console if (!pSettings->debugger().showDetailLog()) { - emit changeDebugConsoleLastLine(pCmd->command + ' ' + pCmd->params); + emit changeDebugConsoleLastLine(pCmd->command + ' ' + params); } else { - emit changeDebugConsoleLastLine(pCmd->command + ' ' + pCmd->params); + emit changeDebugConsoleLastLine(pCmd->command + ' ' + params); } } } @@ -1309,6 +1121,62 @@ void DebugReader::handleRegisterValue(const QList emit registerValuesUpdated(result); } +void DebugReader::handleCreateVar(const GDBMIResultParser::ParseObject &multiVars) +{ + if (!mCurrentCmd) + return; + QString expression = mCurrentCmd->params; + QString name = multiVars["name"].value(); + int numChild = multiVars["numchild"].intValue(0); + QString value = multiVars["value"].value(); + QString type = multiVars["type"].value(); + bool hasMore = multiVars["has_more"].value() != "0"; + emit varCreated(expression,name,numChild,value,type,hasMore); +} + +void DebugReader::handleListVarChildren(const GDBMIResultParser::ParseObject &multiVars) +{ + if (!mCurrentCmd) + return; + QString parentName = mCurrentCmd->params; + int parentNumChild = multiVars["numchild"].intValue(0); + QList children = multiVars["children"].array(); + bool hasMore = multiVars["has_more"].value()!="0"; + emit prepareVarChildren(parentName,parentNumChild,hasMore); + foreach(const GDBMIResultParser::ParseValue& child, children) { + GDBMIResultParser::ParseObject childObj = child.object(); + QString name = childObj["name"].value(); + QString exp = childObj["exp"].value(); + int numChild = childObj["numchild"].intValue(0); + QString value = childObj["value"].value(); + QString type = childObj["type"].value(); + bool hasMore = childObj["has_more"].value() != "0"; + emit addVarChild(parentName, + name, + exp, + numChild, + value, + type, + hasMore); + } +} + +void DebugReader::handleUpdateVarValue(const QList &changes) +{ + foreach (const GDBMIResultParser::ParseValue& value, changes) { + GDBMIResultParser::ParseObject obj = value.object(); + QString name = obj["name"].value(); + QString val = obj["value"].value(); + QString inScope = obj["in_scope"].value(); + bool typeChanged = (obj["type_changed"].value()=="true"); + QString newType = obj["new_type"].value(); + int newNumChildren = obj["new_num_children"].intValue(-1); + bool hasMore = (obj["has_more"].value() == "1"); + emit varValueUpdated(name,val,inScope,typeChanged,newType,newNumChildren, + hasMore); + } +} + QByteArray DebugReader::removeToken(const QByteArray &line) { int p=0; @@ -1374,16 +1242,6 @@ bool DebugReader::processExited() const return mProcessExited; } -bool DebugReader::invalidateAllVars() const -{ - return mInvalidateAllVars; -} - -void DebugReader::setInvalidateAllVars(bool invalidateAllVars) -{ - mInvalidateAllVars = invalidateAllVars; -} - QString DebugReader::debuggerPath() const { return mDebuggerPath; @@ -1810,7 +1668,6 @@ QVariant WatchModel::data(const QModelIndex &index, int role) const WatchVar* item = static_cast(index.internalPointer()); switch (role) { case Qt::DisplayRole: - //qDebug()<<"item->text:"<text; switch(index.column()) { case 0: return item->expression; @@ -1827,7 +1684,6 @@ QModelIndex WatchModel::index(int row, int column, const QModelIndex &parent) co { if (!hasIndex(row,column,parent)) return QModelIndex(); - WatchVar* parentItem; PWatchVar pChild; if (!parent.isValid()) { @@ -1897,9 +1753,9 @@ void WatchModel::addWatchVar(PWatchVar watchVar) return; } } - this->beginInsertRows(QModelIndex(),mWatchVars.size(),mWatchVars.size()); + beginInsertRows(QModelIndex(),mWatchVars.count(),mWatchVars.count()); mWatchVars.append(watchVar); - this->endInsertRows(); + endInsertRows(); } void WatchModel::removeWatchVar(const QString &express) @@ -1909,6 +1765,8 @@ void WatchModel::removeWatchVar(const QString &express) if (express == var->expression) { this->beginResetModel(); //this->beginRemoveRows(QModelIndex(),i,i); + if (mVarIndex.contains(var->name)) + mVarIndex.remove(var->name); mWatchVars.removeAt(i); //this->endRemoveRows(); this->endResetModel(); @@ -1920,6 +1778,9 @@ void WatchModel::removeWatchVar(const QModelIndex &index) { int r=index.row(); this->beginRemoveRows(QModelIndex(),r,r); + PWatchVar var = mWatchVars[r]; + if (mVarIndex.contains(var->name)) + mVarIndex.remove(var->name); mWatchVars.removeAt(r); this->endRemoveRows(); } @@ -1936,24 +1797,124 @@ const QList &WatchModel::watchVars() return mWatchVars; } -PWatchVar WatchModel::findWatchVar(const QString &name) +PWatchVar WatchModel::findWatchVar(const QModelIndex &index) +{ + if (!index.isValid()) + return PWatchVar(); + int r=index.row(); + return mWatchVars[r]; +} + +PWatchVar WatchModel::findWatchVar(const QString &expr) { for (PWatchVar var:mWatchVars) { - if (name == var->name) { + if (expr == var->expression) { return var; } } return PWatchVar(); } -PWatchVar WatchModel::findWatchVar(int gdbIndex) +void WatchModel::resetAllVarInfos() { - for (PWatchVar var:mWatchVars) { - if (gdbIndex == var->gdbIndex) { - return var; - } + beginResetModel(); + foreach (PWatchVar var, mWatchVars) { + var->name.clear(); + var->value = tr("Not Valid"); + var->numChild = 0; + var->hasMore = false; + var->type.clear(); + var->children.clear(); } - return PWatchVar(); + mVarIndex.clear(); + endResetModel(); +} + +void WatchModel::updateVarInfo(const QString &expression, const QString &name, int numChild, const QString &value, const QString &type, bool hasMore) +{ + PWatchVar var = findWatchVar(expression); + if (!var) + return; + var->name = name; + var->value = value; + var->numChild = numChild; + var->hasMore = hasMore; + var->type = type; + mVarIndex.insert(name,var); + QModelIndex idx = index(var); + if (!idx.isValid()) + return; + emit dataChanged(idx,createIndex(idx.row(),2,var.get())); +} + +void WatchModel::prepareVarChildren(const QString &parentName, int numChild, bool hasMore) +{ + PWatchVar var = mVarIndex.value(parentName,PWatchVar()); + if (var) { + var->numChild = numChild; + var->hasMore = hasMore; + } +} + +void WatchModel::addVarChild(const QString &parentName, const QString &name, + const QString &exp, int numChild, const QString &value, + const QString &type, bool hasMore) +{ + PWatchVar var = mVarIndex.value(parentName,PWatchVar()); + if (!var) + return; + beginInsertRows(index(var),var->children.count(),var->children.count()); + PWatchVar child = std::make_shared(); + child->name = name; + child->expression = exp; + child->numChild = numChild; + child->value = value; + child->type = type; + child->hasMore = hasMore; + child->parent = var.get(); + var->children.append(child); + endInsertRows(); + mVarIndex.insert(name,child); +} + +void WatchModel::updateVarValue(const QString &name, const QString &val, const QString &inScope, bool typeChanged, const QString &newType, int newNumChildren, bool hasMore) +{ + PWatchVar var = mVarIndex.value(name,PWatchVar()); + if (!var) + return; + if (inScope == "true") { + var->value = val; + } else{ + var->value = tr("Not Valid"); + } + if (typeChanged) { + var->type = newType; + } + QModelIndex idx = index(var); + if (newNumChildren>=0 + && var->numChild!=newNumChildren) { + beginRemoveRows(idx,0,var->children.count()); + var->children.clear(); + endRemoveRows(); + var->numChild = newNumChildren; + } + var->hasMore = hasMore; + emit dataChanged(idx,createIndex(idx.row(),2,var.get())); +} + +void WatchModel::clearAllVarInfos() +{ + beginResetModel(); + foreach (PWatchVar var, mWatchVars) { + var->name.clear(); + var->value = tr("Execute to evaluate"); + var->numChild = 0; + var->hasMore = false; + var->type.clear(); + var->children.clear(); + } + mVarIndex.clear(); + endResetModel(); } void WatchModel::beginUpdate() @@ -2036,6 +1997,7 @@ void WatchModel::load(const QString &filename) var->value = tr("Execute to evaluate"); var->numChild = 0; var->hasMore=false; + var->parent = nullptr; addWatchVar(var); } @@ -2045,6 +2007,41 @@ void WatchModel::load(const QString &filename) } } +QModelIndex WatchModel::index(PWatchVar var) const +{ + if (!var) + return QModelIndex(); + return index(var.get()); +} + +QModelIndex WatchModel::index(WatchVar* pVar) const { + if (pVar==nullptr) + return QModelIndex(); + if (pVar->parent) { + int row=-1; + for (int i=0;iparent->children.count();i++) { + if (pVar->parent->children[i].get() == pVar) { + row = i; + break; + } + } + if (row<0) + return QModelIndex(); + return createIndex(row,0,pVar); + } else { + int row=-1; + for (int i=0;i(parent.internalPointer()); + item->hasMore = false; + item->numChild = item->children.count(); + emit fetchChildren(item->name); } bool WatchModel::canFetchMore(const QModelIndex &parent) const @@ -2072,13 +2075,13 @@ bool WatchModel::canFetchMore(const QModelIndex &parent) const return false; } WatchVar* item = static_cast(parent.internalPointer()); - return item->numChild>item->children.count(); + return item->numChild>item->children.count() || item->hasMore; } bool WatchModel::hasChildren(const QModelIndex &parent) const { if (!parent.isValid()) { - return false; + return true; } WatchVar* item = static_cast(parent.internalPointer()); return item->numChild>0; diff --git a/RedPandaIDE/debugger.h b/RedPandaIDE/debugger.h index 345a6093..f08ce6e0 100644 --- a/RedPandaIDE/debugger.h +++ b/RedPandaIDE/debugger.h @@ -131,34 +131,51 @@ public: QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override; QModelIndex parent(const QModelIndex &index) const override; - + QVariant headerData(int section, Qt::Orientation orientation, int role) const override; + void fetchMore(const QModelIndex &parent) override; + bool canFetchMore(const QModelIndex &parent) const override; int rowCount(const QModelIndex &parent = QModelIndex()) const override; int columnCount(const QModelIndex &parent = QModelIndex()) const override; + bool hasChildren(const QModelIndex &parent) const override; void addWatchVar(PWatchVar watchVar); void removeWatchVar(const QString& expression); void removeWatchVar(const QModelIndex& index); void clear(); const QList& watchVars(); - PWatchVar findWatchVar(const QString& name); - PWatchVar findWatchVar(int gdbIndex); + PWatchVar findWatchVar(const QModelIndex& index); + PWatchVar findWatchVar(const QString& expr); + void resetAllVarInfos(); + void clearAllVarInfos(); void beginUpdate(); void endUpdate(); void notifyUpdated(PWatchVar var); void save(const QString& filename); void load(const QString& filename); +public slots: + void updateVarInfo(const QString& expression, + const QString& name, + int numChild, + const QString& value, + const QString& type, + bool hasMore); + void prepareVarChildren(const QString& parentName, int numChild, bool hasMore); + void addVarChild(const QString& parentName, const QString& name, + const QString& exp, int numChild, + const QString& value, const QString& type, + bool hasMore); + void updateVarValue(const QString& name, const QString& val, + const QString& inScope, bool typeChanged, + const QString& newType, int newNumChildren, + bool hasMore); +signals: + void fetchChildren(const QString& name); +private: + QModelIndex index(PWatchVar var) const; + QModelIndex index(WatchVar* pVar) const; private: QList mWatchVars; + QHash mVarIndex; int mUpdateCount; - - // QAbstractItemModel interface -public: - QVariant headerData(int section, Qt::Orientation orientation, int role) const override; - void fetchMore(const QModelIndex &parent); - bool canFetchMore(const QModelIndex &parent) const; - - // QAbstractItemModel interface -public: - bool hasChildren(const QModelIndex &parent) const; }; @@ -192,25 +209,16 @@ public: PBreakpoint breakpointAt(int line, const Editor* editor, int &index); void setBreakPointCondition(int index, const QString& condition); void sendAllBreakpointsToDebugger(); - void validateBreakpoint(int line, const QString& filename, int number); - void invalidateAllBreakpoints(); //watch vars - void addWatchVar(const QString& namein); -// void removeWatchVar(nodein: TTreeNode); overload; - void renameWatchVar(const QString& oldname, const QString& newname); + void addWatchVar(const QString& expression); + void modifyWatchVarExpression(const QString& oldExpr, const QString& newExpr); - void refreshWatchVars(); void removeWatchVars(bool deleteparent); void removeWatchVar(const QModelIndex& index); - void invalidateAllVars(); - void sendAllWatchvarsToDebugger(); - void invalidateWatchVar(const QString& name); - void invalidateWatchVar(PWatchVar var); - PWatchVar findWatchVar(const QString& name); + void sendAllWatchVarsToDebugger(); + PWatchVar findWatchVar(const QString& expression); // void notifyWatchVarUpdated(PWatchVar var); - void notifyBeforeProcessWatchVar(); - void notifyAfterProcessWatchVar(); BacktraceModel* backtraceModel(); BreakpointModel* breakpointModel(); @@ -246,7 +254,8 @@ private slots: void clearUpReader(); void updateRegisterNames(const QStringList& registerNames); void updateRegisterValues(const QHash& values); - + void refreshWatchVars(); + void fetchVarChildren(const QString& varName); private: bool mExecuting; bool mCommandChanged; @@ -272,9 +281,6 @@ public: bool commandRunning(); void waitStart(); - bool invalidateAllVars() const; - void setInvalidateAllVars(bool invalidateAllVars); - bool inferiorPaused() const; bool processExited() const; @@ -332,11 +338,24 @@ signals: void disassemblyUpdate(const QString& filename, const QString& funcName, const QStringList& result); void registerNamesUpdated(const QStringList& registerNames); void registerValuesUpdated(const QHash& values); + void varCreated(const QString& expression, + const QString& name, + int numChild, + const QString& value, + const QString& type, + bool hasMore); + void prepareVarChildren(const QString& parentName,int numChild, bool hasMore); + void addVarChild(const QString& parentName, const QString& name, + const QString& exp, int numChild, + const QString& value, const QString& type, + bool hasMore); + void varValueUpdated(const QString& name, const QString& val, + const QString& inScope, bool typeChanged, + const QString& newType, int newNumChildren, + bool hasMore); private: void clearCmdQueue(); - QString processEvalOutput(); - void processWatchOutput(PWatchVar WatchVar); void runNextCmd(); QStringList tokenize(const QString& s); @@ -348,6 +367,9 @@ private: void handleMemory(const QList & rows); void handleRegisterNames(const QList & names); void handleRegisterValue(const QList & values); + void handleCreateVar(const GDBMIResultParser::ParseObject& multiVars); + void handleListVarChildren(const GDBMIResultParser::ParseObject& multiVars); + void handleUpdateVarValue(const QList &changes); void processConsoleOutput(const QByteArray& line); void processResult(const QByteArray& result); void processExecAsyncRecord(const QByteArray& line); @@ -362,7 +384,6 @@ private: QRecursiveMutex mCmdQueueMutex; QSemaphore mStartSemaphore; QQueue mCmdQueue; - bool mInvalidateAllVars; //fOnInvalidateAllVars: TInvalidateAllVarsEvent; bool mCmdRunning; diff --git a/RedPandaIDE/gdbmiresultparser.cpp b/RedPandaIDE/gdbmiresultparser.cpp index 961da48a..d6767850 100644 --- a/RedPandaIDE/gdbmiresultparser.cpp +++ b/RedPandaIDE/gdbmiresultparser.cpp @@ -18,6 +18,9 @@ GDBMIResultParser::GDBMIResultParser() mResultTypes.insert("-data-read-memory",GDBMIResultType::Memory); mResultTypes.insert("-data-list-register-names",GDBMIResultType::RegisterNames); mResultTypes.insert("-data-list-register-values",GDBMIResultType::RegisterValues); + mResultTypes.insert("-var-create",GDBMIResultType::CreateVar); + mResultTypes.insert("-var-list-children",GDBMIResultType::ListVarChildren); + mResultTypes.insert("-var-update",GDBMIResultType::UpdateVarValue); } bool GDBMIResultParser::parse(const QByteArray &record, const QString& command, GDBMIResultType &type, ParseObject& multiValues) @@ -290,6 +293,8 @@ bool GDBMIResultParser::isNameChar(char ch) { if (ch=='-') return true; + if (ch=='_') + return true; if (ch>='a' && ch<='z') return true; if (ch>='A' && ch<='Z') @@ -315,19 +320,16 @@ void GDBMIResultParser::skipSpaces(const char *&p) const QByteArray &GDBMIResultParser::ParseValue::value() const { - Q_ASSERT(mType == ParseValueType::Value); return mValue; } const QList<::GDBMIResultParser::ParseValue> &GDBMIResultParser::ParseValue::array() const { - Q_ASSERT(mType == ParseValueType::Array); return mArray; } const GDBMIResultParser::ParseObject &GDBMIResultParser::ParseValue::object() const { - Q_ASSERT(mType == ParseValueType::Object); return mObject; } diff --git a/RedPandaIDE/gdbmiresultparser.h b/RedPandaIDE/gdbmiresultparser.h index 4b0964b8..c7742612 100644 --- a/RedPandaIDE/gdbmiresultparser.h +++ b/RedPandaIDE/gdbmiresultparser.h @@ -19,8 +19,9 @@ enum class GDBMIResultType { RegisterNames, RegisterValues, Memory, - VariableInfo, - + CreateVar, + ListVarChildren, + UpdateVarValue }; diff --git a/RedPandaIDE/mainwindow.cpp b/RedPandaIDE/mainwindow.cpp index 7aa2184e..fb3c2d1b 100644 --- a/RedPandaIDE/mainwindow.cpp +++ b/RedPandaIDE/mainwindow.cpp @@ -1444,10 +1444,6 @@ void MainWindow::debug() includeOrSkipDirs(compilerSet->defaultCppIncludeDirs(),true); } - // Add breakpoints and watch vars -// for i := 0 to fDebugger.WatchVarList.Count - 1 do -// fDebugger.AddWatchVar(i); - mDebugger->sendAllWatchvarsToDebugger(); mDebugger->sendAllBreakpointsToDebugger(); // Run the debugger @@ -1677,10 +1673,10 @@ void MainWindow::includeOrSkipDirs(const QStringList &dirs, bool skip) foreach (QString dir,dirs) { QString dirName = dir.replace('\\','/'); if (skip) { -// mDebugger->sendCommand( -// "skip", -// QString("-gfi \"%1/%2\"") -// .arg(dirName,"*.*")); + mDebugger->sendCommand( + "skip", + QString("-gfi \"%1/%2\"") + .arg(dirName,"*.*")); } else { mDebugger->sendCommand( "-environment-directory", @@ -4001,7 +3997,6 @@ void MainWindow::on_actionStep_Over_triggered() { if (mDebugger->executing()) { //WatchView.Items.BeginUpdate(); - mDebugger->invalidateAllVars(); mDebugger->sendCommand("-exec-next", ""); } } @@ -4010,7 +4005,6 @@ void MainWindow::on_actionStep_Into_triggered() { if (mDebugger->executing()) { //WatchView.Items.BeginUpdate(); - mDebugger->invalidateAllVars(); mDebugger->sendCommand("-exec-step", ""); } @@ -4020,7 +4014,6 @@ void MainWindow::on_actionStep_Out_triggered() { if (mDebugger->executing()) { //WatchView.Items.BeginUpdate(); - mDebugger->invalidateAllVars(); mDebugger->sendCommand("-exec-finish", ""); } @@ -4032,7 +4025,6 @@ void MainWindow::on_actionRun_To_Cursor_triggered() Editor *e=mEditorList->getEditor(); if (e!=nullptr) { //WatchView.Items.BeginUpdate(); - mDebugger->invalidateAllVars(); mDebugger->sendCommand("-exec-until", QString("\"%1\":%2") .arg(e->filename()) .arg(e->caretY())); @@ -4045,7 +4037,6 @@ void MainWindow::on_actionContinue_triggered() { if (mDebugger->executing()) { //WatchView.Items.BeginUpdate(); - mDebugger->invalidateAllVars(); mDebugger->sendCommand("-exec-continue", ""); } } diff --git a/RedPandaIDE/mainwindow.ui b/RedPandaIDE/mainwindow.ui index e9d75868..bcef089b 100644 --- a/RedPandaIDE/mainwindow.ui +++ b/RedPandaIDE/mainwindow.ui @@ -85,7 +85,7 @@ QTabWidget::West - 3 + 1 true @@ -174,7 +174,7 @@ false - 50 + 100 diff --git a/RedPandaIDE/version.h b/RedPandaIDE/version.h index e80b2153..e8f5a828 100644 --- a/RedPandaIDE/version.h +++ b/RedPandaIDE/version.h @@ -2,6 +2,6 @@ #define VERSION_H #include -#define DEVCPP_VERSION "beta.0.9.3" +#define DEVCPP_VERSION "beta.0.10.0" #endif // VERSION_H