Skip to content

This should fix the issue in Parser.scan() #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gdamore merged 3 commits into from
Jan 14, 2026
Merged

This should fix the issue in Parser.scan() #66

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c1ecf69
This should fix the issue in Parser.scan()
dejlek Jan 14, 2026
fa4543e
Somehow an extra `q` sneaked in.
dejlek Jan 14, 2026
ee7c51c
I have updated the unit tests in source/dcell/parser.d to more rigoro…
dejlek Jan 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions source/dcell/parser.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,9 +400,15 @@ private:
{
parseState = ParseState.ini;
size_t index = 0;
dchar dch = decode(cast(string) accum, index);
try
{
dchar dch = decode(cast(const(char)[]) accum, index);
postKey(Key.graph, dch, Modifiers.none);
}
catch (UTFException)
{
}
accum = null;
postKey(Key.graph, dch, Modifiers.none);
}
break;
case ParseState.ini:
Expand Down Expand Up @@ -1283,6 +1289,19 @@ private:
assert(ev[0].key.key == Key.graph);
assert(ev[0].key.ch == '€');

// invalid unicode - should not crash, and should preserve subsequent valid input
assert(p.parse("\xE2 A"));
ev = p.events();
assert(ev.length == 1);
assert(ev[0].key.ch == 'A');

// valid multi-byte followed by valid input
assert(p.parse("\xE2\x82\xacB"));
ev = p.events();
assert(ev.length == 2);
assert(ev[0].key.ch == '€');
assert(ev[1].key.ch == 'B');

// SOS (no event)
assert(p.parse(['\x1b', 'X', 'p', '\x1b', '\\']));
assert(p.events().length == 0);
Expand Down