use NON_ASCII_PRINTABLE, cleanup ERROR action
This commit is contained in:
@@ -976,9 +976,9 @@ describe('EscapeSequenceParser', function (): void {
|
|||||||
], null);
|
], null);
|
||||||
});
|
});
|
||||||
it('single DCS', function (): void {
|
it('single DCS', function (): void {
|
||||||
test('\x1bP1;2;3+$abc;de\x9c', [
|
test('\x1bP1;2;3+$aäbc;däe\x9c', [
|
||||||
['dcs hook', '+$', [1, 2, 3], 'a'],
|
['dcs hook', '+$', [1, 2, 3], 'a'],
|
||||||
['dcs put', 'bc;de'],
|
['dcs put', 'äbc;däe'],
|
||||||
['dcs unhook']
|
['dcs unhook']
|
||||||
], null);
|
], null);
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -189,7 +189,12 @@ export const VT500_TRANSITION_TABLE = (function (): TransitionTable {
|
|||||||
table.addMany(PRINTABLES, ParserState.DCS_PASSTHROUGH, ParserAction.DCS_PUT, ParserState.DCS_PASSTHROUGH);
|
table.addMany(PRINTABLES, ParserState.DCS_PASSTHROUGH, ParserAction.DCS_PUT, ParserState.DCS_PASSTHROUGH);
|
||||||
table.add(0x7f, ParserState.DCS_PASSTHROUGH, ParserAction.IGNORE, ParserState.DCS_PASSTHROUGH);
|
table.add(0x7f, ParserState.DCS_PASSTHROUGH, ParserAction.IGNORE, ParserState.DCS_PASSTHROUGH);
|
||||||
table.addMany([0x1b, 0x9c], ParserState.DCS_PASSTHROUGH, ParserAction.DCS_UNHOOK, ParserState.GROUND);
|
table.addMany([0x1b, 0x9c], ParserState.DCS_PASSTHROUGH, ParserAction.DCS_UNHOOK, ParserState.GROUND);
|
||||||
|
// special handling of unicode chars
|
||||||
|
table.add(NON_ASCII_PRINTABLE, ParserState.GROUND, ParserAction.PRINT, ParserState.GROUND);
|
||||||
table.add(NON_ASCII_PRINTABLE, ParserState.OSC_STRING, ParserAction.OSC_PUT, ParserState.OSC_STRING);
|
table.add(NON_ASCII_PRINTABLE, ParserState.OSC_STRING, ParserAction.OSC_PUT, ParserState.OSC_STRING);
|
||||||
|
table.add(NON_ASCII_PRINTABLE, ParserState.CSI_IGNORE, ParserAction.IGNORE, ParserState.CSI_IGNORE);
|
||||||
|
table.add(NON_ASCII_PRINTABLE, ParserState.DCS_IGNORE, ParserAction.IGNORE, ParserState.DCS_IGNORE);
|
||||||
|
table.add(NON_ASCII_PRINTABLE, ParserState.DCS_PASSTHROUGH, ParserAction.DCS_PUT, ParserState.DCS_PASSTHROUGH);
|
||||||
return table;
|
return table;
|
||||||
})();
|
})();
|
||||||
|
|
||||||
@@ -385,7 +390,6 @@ export class EscapeSequenceParser extends Disposable implements IEscapeSequenceP
|
|||||||
parse(data: Uint32Array, length: number): void {
|
parse(data: Uint32Array, length: number): void {
|
||||||
let code = 0;
|
let code = 0;
|
||||||
let transition = 0;
|
let transition = 0;
|
||||||
let error = false;
|
|
||||||
let currentState = this.currentState;
|
let currentState = this.currentState;
|
||||||
let print = -1;
|
let print = -1;
|
||||||
let dcs = -1;
|
let dcs = -1;
|
||||||
@@ -443,47 +447,20 @@ export class EscapeSequenceParser extends Disposable implements IEscapeSequenceP
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case ParserAction.ERROR:
|
case ParserAction.ERROR:
|
||||||
// chars higher than 0x9f are handled by this action
|
const inject: IParsingState = this._errorHandler(
|
||||||
// to keep the transition table small
|
{
|
||||||
if (code > 0x9f) {
|
position: i,
|
||||||
switch (currentState) {
|
code,
|
||||||
case ParserState.GROUND:
|
currentState,
|
||||||
print = (~print) ? print : i;
|
print,
|
||||||
break;
|
dcs,
|
||||||
case ParserState.CSI_IGNORE:
|
osc,
|
||||||
transition |= ParserState.CSI_IGNORE;
|
collect,
|
||||||
break;
|
params,
|
||||||
case ParserState.DCS_IGNORE:
|
abort: false
|
||||||
transition |= ParserState.DCS_IGNORE;
|
});
|
||||||
break;
|
if (inject.abort) return;
|
||||||
case ParserState.DCS_PASSTHROUGH:
|
// inject values: currently not implemented
|
||||||
dcs = (~dcs) ? dcs : i;
|
|
||||||
transition |= ParserState.DCS_PASSTHROUGH;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
error = true;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
error = true;
|
|
||||||
}
|
|
||||||
// if we end up here a real error happened
|
|
||||||
if (error) {
|
|
||||||
const inject: IParsingState = this._errorHandler(
|
|
||||||
{
|
|
||||||
position: i,
|
|
||||||
code,
|
|
||||||
currentState,
|
|
||||||
print,
|
|
||||||
dcs,
|
|
||||||
osc,
|
|
||||||
collect,
|
|
||||||
params,
|
|
||||||
abort: false
|
|
||||||
});
|
|
||||||
if (inject.abort) return;
|
|
||||||
// TODO: inject return values
|
|
||||||
error = false;
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
case ParserAction.CSI_DISPATCH:
|
case ParserAction.CSI_DISPATCH:
|
||||||
// Trigger CSI Handler
|
// Trigger CSI Handler
|
||||||
|
|||||||
Reference in New Issue
Block a user