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

Unicode fix #77

Browse source
This commit is contained in:
WebFreak001 2016-12-06 23:53:34 +01:00
commit e43bec9f07
2 changed files with 60 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

54
src/backend/mi_parse.ts
View file

@ -4,6 +4,57 @@ export interface MIInfo {
resultRecords: { resultClass: string, results: [string, any][] };
}
var octalMatch = /^[0-7]{3}/;
function parseString(str: string): string {
var ret = new Buffer(str.length * 4);
var bufIndex = 0;
if (str[0] != '"' || str[str.length - 1] != '"')
throw new Error("Not a valid string");
str = str.slice(1, -1);
var escaped = false;
for (var i = 0; i < str.length; i++) {
if (escaped) {
var m;
if (str[i] == '\\')
bufIndex += ret.write('\\', bufIndex);
else if (str[i] == '"')
bufIndex += ret.write('"', bufIndex);
else if (str[i] == '\'')
bufIndex += ret.write('\'', bufIndex);
else if (str[i] == 'n')
bufIndex += ret.write('\n', bufIndex);
else if (str[i] == 'r')
bufIndex += ret.write('\r', bufIndex);
else if (str[i] == 't')
bufIndex += ret.write('\t', bufIndex);
else if (str[i] == 'b')
bufIndex += ret.write('\b', bufIndex);
else if (str[i] == 'f')
bufIndex += ret.write('\f', bufIndex);
else if (str[i] == 'v')
bufIndex += ret.write('\v', bufIndex);
else if (str[i] == '0')
bufIndex += ret.write('\0', bufIndex);
else if (m = octalMatch.exec(str.substr(i))) {
ret.writeUInt8(parseInt(m[0], 8), bufIndex++);
i += 2;
}
else
bufIndex += ret.write(str[i], bufIndex);
escaped = false;
} else {
if (str[i] == '\\')
escaped = true;
else if (str[i] == '"')
throw new Error("Not a valid string");
else
bufIndex += ret.write(str[i], bufIndex);
}
}
return ret.slice(0, bufIndex).toString("utf8");
}
export class MINode implements MIInfo {
token: number;
outOfBandRecord: { isStream: boolean, type: string, asyncClass: string, output: [string, any][], content: string }[];
@ -135,10 +186,9 @@ export function parseMI(output: string): MINode {
remaining = remaining.substr(1);
stringEnd++;
}
// hax
let str;
try {
str = JSON.parse(output.substr(0, stringEnd));
str = parseString(output.substr(0, stringEnd));
}
catch (e) {
str = output.substr(0, stringEnd);

12
test/mi_parse.test.ts
View file

@ -29,10 +29,14 @@ suite("MI Parse", () => {
assert.equal(parsed.token, undefined);
assert.equal(parsed.outOfBandRecord.length, 1);
assert.equal(parsed.outOfBandRecord[0].isStream, true);
// Hack
assert.equal(parsed.outOfBandRecord[0].content, `"[Depuraci\\303\\263n de hilo usando libthread_db enabled]\\n"`);
// Better Goal:
//assert.equal(parsed.outOfBandRecord[0].content, "[Depuración de hilo usando libthread_db enabled]\n");
assert.equal(parsed.outOfBandRecord[0].content, "[Depuración de hilo usando libthread_db enabled]\n");
assert.equal(parsed.resultRecords, undefined);
parsed = parseMI(`~"4\\t std::cout << \\"\\345\\245\\275\\345\\245\\275\\345\\255\\246\\344\\271\\240\\357\\274\\214\\345\\244\\251\\345\\244\\251\\345\\220\\221\\344\\270\\212\\" << std::endl;\\n"`);
assert.ok(parsed);
assert.equal(parsed.token, undefined);
assert.equal(parsed.outOfBandRecord.length, 1);
assert.equal(parsed.outOfBandRecord[0].isStream, true);
assert.equal(parsed.outOfBandRecord[0].content, `4\t std::cout << "好好学习，天天向上" << std::endl;\n`);
assert.equal(parsed.resultRecords, undefined);
});
test("Empty line", () => {