jyapayne/code-debug
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #128 from Marus/master

Browse source 
Bug fixes from Cortex-Debug extension
This commit is contained in:
Jan Jurzitza 2018-01-24 21:14:28 +01:00 • committed by GitHub
commit a7fd6a7369
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/backend/gdb_expansion.ts
View file

@ -7,7 +7,7 @@ const referenceStringRegex = /^(0x[0-9a-fA-F]+\s*)"/;
const referenceRegex = /^0x[0-9a-fA-F]+/; const referenceRegex = /^0x[0-9a-fA-F]+/;
const nullpointerRegex = /^0x0+\b/; const nullpointerRegex = /^0x0+\b/;
const charRegex = /^(\d+) ['"]/; const charRegex = /^(\d+) ['"]/;
const numberRegex = /^\d+/; const numberRegex = /^\d+(\.\d+)?/;
const pointerCombineChar = "."; const pointerCombineChar = ".";
export function isExpandable(value: string): number { export function isExpandable(value: string): number {

2
src/backend/mi_parse.ts
View file

@ -213,7 +213,7 @@ export function parseMI(output: string): MINode {
let values = []; let values = [];
values.push(value); values.push(value);
let remaining = output; let remaining = output;
while (value = parseCommaValue()) while ((value = parseCommaValue()) !== undefined)
values.push(value); values.push(value);
output = output.substr(1); // ] output = output.substr(1); // ]
return values; return values;

2
src/mibase.ts
View file

@ -342,7 +342,7 @@ export class MI2DebugSession extends DebugSession {
const changelist = changes.result("changelist"); const changelist = changes.result("changelist");
changelist.forEach((change) => { changelist.forEach((change) => {
const name = MINode.valueOf(change, "name"); const name = MINode.valueOf(change, "name");
const vId = this.variableHandlesReverse[varObjName]; const vId = this.variableHandlesReverse[name];
const v = this.variableHandles.get(vId) as any; const v = this.variableHandles.get(vId) as any;
v.applyChanges(change); v.applyChanges(change);
}); });

11
test/gdb_expansion.test.ts
View file

@ -292,4 +292,15 @@ suite("GDB Value Expansion", () => {
} }
]); ]);
}); });
test("float values", () => {
let node = `{ intval1 = 123, floatval1 = 123.456, intval2 = 3, floatval2 = 234.45 }`;
let variables = expandValue(variableCreate, node);
assert.deepEqual(variables, [
{ name: "intval1", value: "123", variablesReference: 0 },
{ name: "floatval1", value: "123.456", variablesReference: 0 },
{ name: "intval2", value: "3", variablesReference: 0 },
{ name: "floatval2", value: "234.45", variablesReference: 0 }
]);
});
}); });

5
test/mi_parse.test.ts
View file

@ -173,4 +173,9 @@ suite("MI Parse", () => {
assert.equal(MINode.valueOf(obj[1], "@frame.fullname"), undefined); assert.equal(MINode.valueOf(obj[1], "@frame.fullname"), undefined);
assert.equal(MINode.valueOf(obj[1], "@frame.line"), undefined); assert.equal(MINode.valueOf(obj[1], "@frame.line"), undefined);
}); });
test("empty string values", () => {
let parsed = parseMI(`15^done,register-names=["r0","pc","","xpsr","","control"]`);
let result = parsed.result('register-names');
assert.deepEqual(result, ["r0", "pc", "", "xpsr", "", "control"]);
});
}); });