Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-07-15 16:26:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

terminal: add missing anywhere states to ground, get rid of real state

Browse Source
This commit is contained in:
Mitchell Hashimoto
2023-03-17 13:46:22 -07:00
parent f5e49e2989
commit 38cd496c82
2 changed files with 34 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/terminal/Parser.zig
View File

@ -15,7 +15,6 @@ const log = std.log.scoped(.parser);
/// States for the state machine
pub const State = enum {
anywhere,
ground,
escape,
escape_intermediate,
@ -225,14 +224,7 @@ pub fn next(self: *Parser, c: u8) [3]?Action {
return .{ self.next_utf8(c), null, null };
}
const effect = effect: {
// First look up the transition in the anywhere table.
const anywhere = table[c][@enumToInt(State.anywhere)];
if (anywhere.state != .anywhere) break :effect anywhere;
// If we don't have any transition from anywhere, use our state.
break :effect table[c][@enumToInt(self.state)];
};
const effect = table[c][@enumToInt(self.state)];
// log.info("next: {x}", .{c});
@ -242,16 +234,6 @@ pub fn next(self: *Parser, c: u8) [3]?Action {
// After generating the actions, we set our next state.
defer self.state = next_state;
// In debug mode, we log bad state transitions.
if (builtin.mode == .Debug) {
if (next_state == .anywhere) {
log.debug(
"state transition to 'anywhere' from '{}', likely binary input: {x}",
.{ self.state, c },
);
}
}
// When going from one state to another, the actions take place in this order:
//
// 1. exit action from old state

68
src/terminal/parse_table.zig
View File

@ -51,19 +51,46 @@ fn genTable() Table {
while (i < result.len) : (i += 1) {
var j: usize = 0;
while (j < result[0].len) : (j += 1) {
result[i][j] = transition(.anywhere, .none);
result[i][j] = transition(@intToEnum(State, j), .none);
}
}
// anywhere transitions
const stateInfo = @typeInfo(State);
inline for (stateInfo.Enum.fields) |field| {
const source = @intToEnum(State, field.value);
// anywhere => ground
single(&result, 0x18, source, .ground, .execute);
single(&result, 0x1A, source, .ground, .execute);
range(&result, 0x80, 0x8F, source, .ground, .execute);
range(&result, 0x91, 0x97, source, .ground, .execute);
single(&result, 0x99, source, .ground, .execute);
single(&result, 0x9A, source, .ground, .execute);
single(&result, 0x9C, source, .ground, .none);
// anywhere => escape
single(&result, 0x1B, source, .escape, .none);
// anywhere => sos_pm_apc_string
single(&result, 0x98, source, .sos_pm_apc_string, .none);
single(&result, 0x9E, source, .sos_pm_apc_string, .none);
single(&result, 0x9F, source, .sos_pm_apc_string, .none);
// anywhere => csi_entry
single(&result, 0x9B, source, .csi_entry, .none);
// anywhere => dcs_entry
single(&result, 0x90, source, .dcs_entry, .none);
// anywhere => osc_string
single(&result, 0x9D, source, .osc_string, .none);
}
// ground
{
const source = State.ground;
// anywhere =>
single(&result, 0x18, .anywhere, .ground, .execute);
single(&result, 0x1A, .anywhere, .ground, .execute);
single(&result, 0x9C, .anywhere, .ground, .none);
// events
single(&result, 0x19, .ground, .ground, .execute);
range(&result, 0, 0x17, .ground, .ground, .execute);
@ -94,11 +121,6 @@ fn genTable() Table {
{
const source = State.sos_pm_apc_string;
// anywhere =>
single(&result, 0x98, .anywhere, source, .none);
single(&result, 0x9E, .anywhere, source, .none);
single(&result, 0x9F, .anywhere, source, .none);
// events
single(&result, 0x19, source, source, .ignore);
range(&result, 0, 0x17, source, source, .ignore);
@ -113,9 +135,6 @@ fn genTable() Table {
{
const source = State.escape;
// anywhere =>
single(&result, 0x1B, .anywhere, source, .none);
// events
single(&result, 0x19, source, source, .execute);
range(&result, 0, 0x17, source, source, .execute);
@ -152,9 +171,6 @@ fn genTable() Table {
{
const source = State.dcs_entry;
// anywhere =>
single(&result, 0x90, .anywhere, source, .ignore);
// events
single(&result, 0x19, source, source, .ignore);
range(&result, 0, 0x17, source, source, .ignore);
@ -305,9 +321,6 @@ fn genTable() Table {
{
const source = State.csi_entry;
// anywhere =>
single(&result, 0x9B, .anywhere, source, .none);
// events
single(&result, 0x19, source, source, .execute);
range(&result, 0, 0x17, source, source, .execute);
@ -333,9 +346,6 @@ fn genTable() Table {
{
const source = State.osc_string;
// anywhere =>
single(&result, 0x9D, .anywhere, source, .none);
// events
single(&result, 0x19, source, source, .ignore);
range(&result, 0, 0x06, source, source, .ignore);
@ -352,18 +362,6 @@ fn genTable() Table {
}
fn single(t: *Table, c: u8, s0: State, s1: State, a: Action) void {
// In debug mode, we want to verify that every state is marked
// exactly once.
if (builtin.mode == .Debug) {
const existing = t[c][@enumToInt(s0)];
if (existing.state != .anywhere) {
std.debug.print("transition set multiple times c={} s0={} existing={}", .{
c, s0, existing,
});
unreachable;
}
}
t[c][@enumToInt(s0)] = transition(s1, a);
}