diff options
| author | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2024-12-22 18:16:17 +0300 |
|---|---|---|
| committer | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2024-12-22 19:33:48 +0300 |
| commit | 6cd143f86d3c39be633c1dcf5a4165f2f06a04f6 (patch) | |
| tree | f922eb2d979042c7a89da1a3dfc8851c90776d2d /src/lexer.c | |
| parent | f4fd6de46a8d66032efd6fa86a5674edd0ec839f (diff) | |
| download | sciteco-6cd143f86d3c39be633c1dcf5a4165f2f06a04f6.tar.gz | |
fixed lexing (syntax highlighting) of the null-character (^@) in SciTECO code
* Apparently g_utf8_get_char_validated() sometimes(!) returns -2 for null-characters,
so it was considered an invalid byte sequence.
* What's strange and unexplainable is that other uses of the function, as are behind nA and nQq,
did not cause problems and returned 0 for null-bytes.
* This also fixes syntax higlighting of .teco_session files which use the null-byte as the
string terminator.
(.teco_session files are not highlighted automatically, though.)
Diffstat (limited to 'src/lexer.c')
| -rw-r--r-- | src/lexer.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/lexer.c b/src/lexer.c index 4fbc313..ff43c1b 100644 --- a/src/lexer.c +++ b/src/lexer.c @@ -104,8 +104,12 @@ teco_lexer_step(teco_view_t *view, teco_machine_main_t *machine, teco_style_t style = SCE_SCITECO_DEFAULT; - gint32 chr = g_utf8_get_char_validated(macro+machine->macro_pc, - max_len-machine->macro_pc); + /* + * g_utf8_get_char_validated() sometimes(?) returns -2 for "\0". + */ + gint32 chr = macro[machine->macro_pc] + ? g_utf8_get_char_validated(macro+machine->macro_pc, + max_len-machine->macro_pc) : 0; if (chr < 0) { /* * Invalid UTF-8 byte sequence: |