Skip to content

Fix handling of signed numbers in standard output #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nberth merged 1 commit into from
Dec 9, 2025
Merged

Fix handling of signed numbers in standard output #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
## Next

* Fixed a bug that made the extension hang when debugged programs displayed signed numbers [PR #39](https://github.com/ocamlpro/superbol-vscode-debug/pull/39)
* Show COBOL statements in entries of stackframe summary [PR #38](https://github.com/ocamlpro/superbol-vscode-debug/pull/38)
* Remove `gdbpath` and `libcobpath` from launch configurations (these are provided in extension settings) [PR #36](https://github.com/ocamlpro/superbol-vscode-debug/pull/36)
* Fix enforcement of a default `preLaunchTask` that is not available [PR #34](https://github.com/ocamlpro/superbol-vscode-debug/pull/34)
Expand Down
218 changes: 109 additions & 109 deletions src/mi2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { parseExpression, cleanRawValue } from "./functions";
import * as vscode from 'vscode';
import * as log from './log';

const nonOutput = /(^(?:\d*|undefined)[*+\-=~@&^])([^*+\-=~@&]{1,})/;
const nonOutput = /(^(?:\d*|undefined)[*+\-=~@&^])([^*+\-=~@&]+[a-zA-Z]+)/;
const gdbRegex = /(?:\d*|undefined)\(gdb\)/;
const numRegex = /\d+/;
const gcovRegex = /"([0-9a-z_\-/\s\\:]+\.o)"/gi;
Expand Down Expand Up @@ -219,128 +219,128 @@ export class MI2 extends EventEmitter implements IDebugger {
return false;
}

onOutput(linesStr: string) {
private onOutput(linesStr: string) {
const lines = linesStr.split('\n');
lines.forEach(line => {
if (couldBeOutput(line)) {
if (!gdbRegex.exec(line)) {
this.log("stdout", line);
}
} else {
const parsed = parseMI(line);
// if (this.verbose) {
// this.log("stderr", "GDB -> App: " + JSON.stringify(parsed));
// }
let handled = false;
if (parsed.token !== undefined) {
if (this.handlers[parsed.token]) {
this.handlers[parsed.token](parsed);
delete this.handlers[parsed.token];
handled = true;
}
}
if (!handled && parsed.resultRecords && parsed.resultRecords.resultClass == "error") {
this.log("stderr", <string>parsed.result("msg") || line);
}
if (parsed.outOfBandRecord) {
parsed.outOfBandRecord.forEach(async record => {
if (record.isStream) {
this.log(record.type, record.content);
} else {
if (record.type == "exec") {
this.emit("exec-async-output", parsed);
// 002 - stepOver in routines with "perform"
subroutine = this.map.hasLineSubroutine(parsed.record('frame.fullname'), parseInt(parsed.record('frame.line')));
// 002
if (record.asyncClass == "running") {
this.emit("running", parsed);
} else if (record.asyncClass == "stopped") {
const reason = <string>parsed.record("reason");
log.debug("stop:", reason);
if (reason == "breakpoint-hit") {
if (!this.map.hasLineCobol(parsed.record('frame.fullname'), parseInt(parsed.record('frame.line')))) {
if(this.lastStepCommand==this.continue && parsed.record("disp")=="del")
void this.lastStepCommand();
else
this.stepOver(); // 002 - stepInto/stepOut in routines with "perform"
} else {
this.emit("step-end", parsed);
}
} else if (reason == "location-reached") { // 002 - stepOver in routines with "perform"
if (!this.map.hasLineCobol(parsed.record('frame.fullname'), parseInt(parsed.record('frame.line')))) {
this.stepOver();
} else {
this.emit("step-end", parsed);
}
} else if (reason == "end-stepping-range") {
if (!this.map.hasLineCobol(<string>parsed.record('frame.fullname'), parseInt(<string>parsed.record('frame.line')))) {
void this.lastStepCommand().then();
} else {
this.emit("step-end", parsed);
}
} else if (reason == "function-finished") {
if (!this.map.hasLineCobol(<string>parsed.record('frame.fullname'), parseInt(<string>parsed.record('frame.line')))) {
void this.lastStepCommand();
} else {
this.emit("step-out-end", parsed);
}
} else if (reason == "signal-received") {
this.emit("signal-stop", parsed);
} else if (reason == "exited-normally") {
this.emit("exited-normally", parsed);
} else if (reason == "exited") { // exit with error code != 0
log.info("Program exited with code " + <string>parsed.record("exit-code"));
this.emit("quit", parsed);
} else if (reason == "solib-event") {
this.onSolibEvent (parsed);
this.resume ();
} else {
if (!this.map.hasLineCobol(<string>parsed.record('frame.fullname'), parseInt(<string>parsed.record('frame.line')))) {
void this.continue();
} else {
log.error("Not implemented stop reason (assuming exception):", reason);
this.emit("stopped", parsed);
}
}
this.onMINode(parseMI(line));
}
});
}

private onMINode(parsed: MINode) {
let handled = false;
if (parsed && parsed.token !== undefined) {
if (this.handlers[parsed.token]) {
this.handlers[parsed.token](parsed);
delete this.handlers[parsed.token];
handled = true;
}
}
if (!handled && parsed.resultRecords && parsed.resultRecords.resultClass == "error") {
this.log("stderr", <string>parsed.result("msg"));
}
if (parsed.outOfBandRecord) {
parsed.outOfBandRecord.forEach(async record => {
if (record.isStream) {
this.log(record.type, record.content);
} else {
if (record.type == "exec") {
this.emit("exec-async-output", parsed);
// 002 - stepOver in routines with "perform"
subroutine = this.map.hasLineSubroutine(parsed.record('frame.fullname'), parseInt(parsed.record('frame.line')));
// 002
if (record.asyncClass == "running") {
this.emit("running", parsed);
} else if (record.asyncClass == "stopped") {
const reason = <string>parsed.record("reason");
log.debug("stop:", reason);
if (reason == "breakpoint-hit") {
if (!this.map.hasLineCobol(parsed.record('frame.fullname'), parseInt(parsed.record('frame.line')))) {
if (this.lastStepCommand == this.continue && parsed.record("disp") == "del")
void this.lastStepCommand();
else
this.stepOver(); // 002 - stepInto/stepOut in routines with "perform"
} else {
this.emit("step-end", parsed);
}
} else if (reason == "location-reached") { // 002 - stepOver in routines with "perform"
if (!this.map.hasLineCobol(parsed.record('frame.fullname'), parseInt(parsed.record('frame.line')))) {
this.stepOver();
} else {
this.emit("step-end", parsed);
}
} else if (reason == "end-stepping-range") {
if (!this.map.hasLineCobol(<string>parsed.record('frame.fullname'), parseInt(<string>parsed.record('frame.line')))) {
void this.lastStepCommand().then();
} else {
log.debug (() => JSON.stringify(parsed));
this.emit("step-end", parsed);
}
} else if (record.type == "notify") {
if (record.asyncClass == "thread-created") {
this.emit("thread-created", parsed);
} else if (record.asyncClass == "thread-exited") {
this.emit("thread-exited", parsed);
} else if (record.asyncClass == "library-loaded") {
// Possibly unreachable if `stop-on-solib-events` is on; still handle in case.
let libname = record.output.find((e) => e[0] == "target-name")?.[1];
if (this.map.addLib (libname)) {
log.debug (() => `Added library to map: ${libname}`);
log.debug (() => this.map.toString ("updated"));
this.reloadBreakPoints ();
}
} else if (record.asyncClass == "library-unloaded") {
// Ditto: possibly unreachable if `stop-on-solib-events` is on; still handle in case.
let libname = record.output.find((e) => e[0] == "target-name")?.[1];
if (this.map.remLib (libname)) {
log.debug (() => this.map.toString ("updated"));
this.reloadBreakPoints ();
}
} else if (reason == "function-finished") {
if (!this.map.hasLineCobol(<string>parsed.record('frame.fullname'), parseInt(<string>parsed.record('frame.line')))) {
void this.lastStepCommand();
} else {
log.debug (() => JSON.stringify(parsed));
this.emit("step-out-end", parsed);
}
} else if (reason == "signal-received") {
this.emit("signal-stop", parsed);
} else if (reason == "exited-normally") {
this.emit("exited-normally", parsed);
} else if (reason == "exited") { // exit with error code != 0
log.info("Program exited with code " + <string>parsed.record("exit-code"));
this.emit("quit", parsed);
} else if (reason == "solib-event") {
this.onSolibEvent(parsed);
this.resume();
} else {
if (!this.map.hasLineCobol(<string>parsed.record('frame.fullname'), parseInt(<string>parsed.record('frame.line')))) {
void this.continue();
} else {
log.error("Not implemented stop reason (assuming exception):", reason);
this.emit("stopped", parsed);
}
}
} else {
log.debug(() => JSON.stringify(parsed));
}
});
handled = true;
}
if (parsed.token == undefined && parsed.resultRecords == undefined && parsed.outOfBandRecord.length == 0) {
handled = true;
}
if (!handled) {
log.error("Unhandled: " + JSON.stringify(parsed));
} else if (record.type == "notify") {
if (record.asyncClass == "thread-created") {
this.emit("thread-created", parsed);
} else if (record.asyncClass == "thread-exited") {
this.emit("thread-exited", parsed);
} else if (record.asyncClass == "library-loaded") {
// Possibly unreachable if `stop-on-solib-events` is on; still handle in case.
let libname = record.output.find((e) => e[0] == "target-name")?.[1];
if (this.map.addLib(libname)) {
log.debug(() => `Added library to map: ${libname}`);
log.debug(() => this.map.toString("updated"));
this.reloadBreakPoints();
}
} else if (record.asyncClass == "library-unloaded") {
// Ditto: possibly unreachable if `stop-on-solib-events` is on; still handle in case.
let libname = record.output.find((e) => e[0] == "target-name")?.[1];
if (this.map.remLib(libname)) {
log.debug(() => this.map.toString("updated"));
this.reloadBreakPoints();
}
} else {
log.debug(() => JSON.stringify(parsed));
}
}
}
}
});
});
handled = true;
}
if (parsed.token == undefined && parsed.resultRecords == undefined && parsed.outOfBandRecord.length == 0) {
handled = true;
}
if (!handled) {
log.error("Unhandled: " + JSON.stringify(parsed));
}
}

private onSolibEvent(node: MINode): void {
Expand Down
3 changes: 3 additions & 0 deletions test/suite/mi2.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ suite("GDB output", () => {
test("++", () => {
assert.equal(true, couldBeOutput('++'));
});
test("+0000", () => {
assert.equal(true, couldBeOutput('+0000'));
});
test("GDB done", () => {
assert.equal(false, couldBeOutput('2^done'));
});
Expand Down