forks
/
dlangide
mirror of https://github.com/buggins/dlangide.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

debugger support fixes

This commit is contained in:
Vadim Lopatin 2016-05-16 23:09:46 +03:00
parent c9d038feaa
commit ac07ac9868
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ddebug/gdb/gdbinterface.d
View File

@ -33,6 +33,7 @@ abstract class ConsoleDebuggerInterface : DebuggerBase, TextWriter {
protected void onDebuggerStdoutLine(string line) { protected void onDebuggerStdoutLine(string line) {
} }
private void onStdoutText(string text) { private void onStdoutText(string text) {
Log.v("onStdoutText: ", text);
_stdoutBuf ~= text; _stdoutBuf ~= text;
// pass full lines // pass full lines
int startPos = 0; int startPos = 0;
@ -53,6 +54,7 @@ abstract class ConsoleDebuggerInterface : DebuggerBase, TextWriter {
} }
} }
if (fullLinesFound) { if (fullLinesFound) {
//Log.v("onStdoutText: full lines found");
for (int i = 0; i + startPos < _stdoutBuf.length; i++) for (int i = 0; i + startPos < _stdoutBuf.length; i++)
_stdoutBuf[i] = _stdoutBuf[i + startPos]; _stdoutBuf[i] = _stdoutBuf[i + startPos];
_stdoutBuf.length = _stdoutBuf.length - startPos; _stdoutBuf.length = _stdoutBuf.length - startPos;
@ -632,7 +634,7 @@ class GDBInterface : ConsoleDebuggerInterface, TextCommandTarget {
} }
override protected void onDebuggerStdoutLine(string gdbLine) { override protected void onDebuggerStdoutLine(string gdbLine) {
//Log.d("GDB stdout: '", line, "'"); Log.d("GDB stdout: '", gdbLine, "'");
string line = gdbLine; string line = gdbLine;
if (line.empty) if (line.empty)
return; return;

11
src/dlangide/builders/builder.d
View File

@ -69,8 +69,17 @@ class Builder : BackgroundOperationWatcher {
scope(exit)pollText(); scope(exit)pollText();
ExternalProcessState state = _extprocess.state; ExternalProcessState state = _extprocess.state;
if (state == ExternalProcessState.None) { if (state == ExternalProcessState.None) {
import dlangui.core.files;
string exepath = findExecutablePath(_executable);
if (!exepath) {
_finished = true;
destroy(_extprocess);
_extprocess = null;
return;
}
_log.clear(); _log.clear();
char[] program = _executable.dup; char[] program = exepath.dup;
char[][] params; char[][] params;
char[] dir = _project.dir.dup; char[] dir = _project.dir.dup;

10
src/dlangide/builders/extprocess.d
View File

@ -111,11 +111,13 @@ class BackgroundReaderBase : Thread {
_bytes.length = _bytes.length ? _bytes.length * 2 : 1024; _bytes.length = _bytes.length ? _bytes.length * 2 : 1024;
bool eolchar = (data == '\r' || data == '\n'); bool eolchar = (data == '\r' || data == '\n');
bool preveol = (prevchar == '\r' || prevchar == '\n'); bool preveol = (prevchar == '\r' || prevchar == '\n');
if ((eolchar && !preveol) || (!eolchar && preveol)) {
//Log.d("Flushing for prevChar=", prevchar, " newChar=", data);
flush();
}
_bytes[_len++] = data; _bytes[_len++] = data;
if (data == '\n')
flush();
//if ((eolchar && !preveol) || (!eolchar && preveol) || data == '\n') {
// //Log.d("Flushing for prevChar=", prevchar, " newChar=", data);
// flush();
//}
prevchar = data; prevchar = data;
} }
void flush() { void flush() {