diff options
Diffstat (limited to 'src/syntax.c')
| -rw-r--r-- | src/syntax.c | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/src/syntax.c b/src/syntax.c index d01496e..400f6e1 100644 --- a/src/syntax.c +++ b/src/syntax.c @@ -11,8 +11,13 @@ struct pos { static void syntax_highlight_line(struct pos *pos, char *str, u32 size) { + /* printf("Got size %d '", size); */ + /* for (u32 i = 0; i < size; i++) { */ + /* printf("%c", str[i]); */ + /* } */ + /* printf("'\n"); */ + while (1) { - /* printf("%d:%d\n", pos->y, pos->x); */ struct token tok = token_resolve(str + pos->x, size - pos->x); if (tok.type == NEWLINE) { @@ -29,13 +34,13 @@ static void syntax_highlight_line(struct pos *pos, char *str, u32 size) continue; } - token_print(&tok); + /* token_print(&tok); */ - /* if (tok.type > INSTR_START && tok.type < INSTR_END) */ - /* gui_highlight(pos->x, pos->y, tok.length, "instr"); */ - /* else if (tok.type > REGS_START && tok.type < REGS_END) { */ - /* gui_highlight(pos->x, pos->y, tok.length, "regs"); */ - /* } */ + if (tok.type > INSTR_START && tok.type < INSTR_END) + gui_highlight(pos->x, pos->y, tok.length, "instr"); + else if (tok.type > REGS_START && tok.type < REGS_END) { + gui_highlight(pos->x, pos->y, tok.length, "regs"); + } pos->x += tok.length; } @@ -43,18 +48,22 @@ static void syntax_highlight_line(struct pos *pos, char *str, u32 size) void syntax_highlight(char *buf, u32 size) { - return; // TODO: Fix some stuff struct pos pos = { 0 }; + u32 diff = 0; char *start = buf; for (u32 i = 0; i < size; i++) { + // TODO: Fix highlighting of last line without \n if (buf[i] == '\0') break; if (buf[i] == '\n') { pos.x = 0; - syntax_highlight_line(&pos, start, i); - start += i; + syntax_highlight_line(&pos, start, diff); + start += diff + 1; + diff = 0; + } else { + diff++; } } } |