From e1243473e810c823075f3ed2fbcef5222d8e7b93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Breitbart?= <jerch@rockborn.de>
Date: Mon, 3 Jun 2019 00:28:32 +0200
Subject: [PATCH] use NON_ASCII_PRINTABLE, cleanup ERROR action

---
 src/core/parser/EscapeSequenceParser.test.ts |  4 +-
 src/core/parser/EscapeSequenceParser.ts      | 61 ++++++--------------
 2 files changed, 21 insertions(+), 44 deletions(-)

diff --git a/src/core/parser/EscapeSequenceParser.test.ts b/src/core/parser/EscapeSequenceParser.test.ts
index d550b1d5..6f789343 100644
--- a/src/core/parser/EscapeSequenceParser.test.ts
+++ b/src/core/parser/EscapeSequenceParser.test.ts
@@ -976,9 +976,9 @@ describe('EscapeSequenceParser', function (): void {
       ], null);
     });
     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 put', 'bc;de'],
+        ['dcs put', 'äbc;däe'],
         ['dcs unhook']
       ], null);
     });
diff --git a/src/core/parser/EscapeSequenceParser.ts b/src/core/parser/EscapeSequenceParser.ts
index e7612925..d62ccaa7 100644
--- a/src/core/parser/EscapeSequenceParser.ts
+++ b/src/core/parser/EscapeSequenceParser.ts
@@ -189,7 +189,12 @@ export const VT500_TRANSITION_TABLE = (function (): TransitionTable {
   table.addMany(PRINTABLES, ParserState.DCS_PASSTHROUGH, ParserAction.DCS_PUT, 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);
+  // 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.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;
 })();
 
@@ -385,7 +390,6 @@ export class EscapeSequenceParser extends Disposable implements IEscapeSequenceP
   parse(data: Uint32Array, length: number): void {
     let code = 0;
     let transition = 0;
-    let error = false;
     let currentState = this.currentState;
     let print = -1;
     let dcs = -1;
@@ -443,47 +447,20 @@ export class EscapeSequenceParser extends Disposable implements IEscapeSequenceP
           }
           break;
         case ParserAction.ERROR:
-          // chars higher than 0x9f are handled by this action
-          // to keep the transition table small
-          if (code > 0x9f) {
-            switch (currentState) {
-              case ParserState.GROUND:
-                print = (~print) ? print : i;
-                break;
-              case ParserState.CSI_IGNORE:
-                transition |= ParserState.CSI_IGNORE;
-                break;
-              case ParserState.DCS_IGNORE:
-                transition |= ParserState.DCS_IGNORE;
-                break;
-              case ParserState.DCS_PASSTHROUGH:
-                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;
-          }
+          const inject: IParsingState = this._errorHandler(
+            {
+              position: i,
+              code,
+              currentState,
+              print,
+              dcs,
+              osc,
+              collect,
+              params,
+              abort: false
+            });
+          if (inject.abort) return;
+          // inject values: currently not implemented
           break;
         case ParserAction.CSI_DISPATCH:
           // Trigger CSI Handler