ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-06 15:48:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove optimizations in tokenizer and default to older code (same logic) (optimize later)

Browse Source
This commit is contained in:
gingerBill
2021-08-03 13:33:01 +01:00
parent 3e961af5f1
commit 545b345eea
1 changed files with 2 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tokenizer.cpp
+2 -45
View File
@@ -757,17 +757,10 @@ void tokenizer_err(Tokenizer *t, TokenPos const &pos, char const *msg, ...) {
} }
void advance_to_next_rune(Tokenizer *t) { void advance_to_next_rune(Tokenizer *t) {
#if 1
if (t->curr_rune == '\n') { if (t->curr_rune == '\n') {
t->column_minus_one = 0; t->column_minus_one = 0;
t->line_count++; t->line_count++;
} }
#else
// NOTE(bill, 2021-08-02): This is branchless but it is slower in practice
i32 is_newline = t->curr_rune == '\n';
t->column_minus_one *= 1-is_newline;
t->line_count += is_newline;
#endif
if (t->read_curr < t->end) { if (t->read_curr < t->end) {
t->curr = t->read_curr; t->curr = t->read_curr;
Rune rune = *t->read_curr; Rune rune = *t->read_curr;
@@ -1070,45 +1063,9 @@ bool scan_escape(Tokenizer *t) {
gb_inline void tokenizer_skip_line(Tokenizer *t) { gb_inline void tokenizer_skip_line(Tokenizer *t) {
#if 1 while (t->curr_rune != '\n' && t->curr_rune != GB_RUNE_EOF) {
while (t->read_curr != t->end && t->curr_rune != '\n' && t->curr_rune != GB_RUNE_EOF) { advance_to_next_rune(t);
t->column_minus_one++;
t->curr = t->read_curr++;
t->curr_rune = *t->curr;
if (t->curr_rune == 0) {
tokenizer_err(t, "Illegal character NUL");
}
} }
#else
loop_start:;
u8 *p = t->read_curr;
for (; p < t->end; p++) {
switch (*p) {
case '\n':
case 0xff:
goto loop_end;
case 0:
goto illegal_nul;
}
}
loop_end:
p = gb_min(p, t->end);
t->column_minus_one += cast(i32)(p - t->read_curr);
t->read_curr = p;
t->curr = p-1;
t->curr_rune = *t->curr;
return;
illegal_nul:;
p = gb_min(p, t->end);
t->column_minus_one += cast(i32)(p - t->read_curr);
t->read_curr = p;
t->curr = p-1;
t->curr_rune = *t->curr;
tokenizer_err(t, "Illegal character NUL");
goto loop_start;
#endif
} }
gb_inline void tokenizer_skip_whitespace(Tokenizer *t, bool on_newline) { gb_inline void tokenizer_skip_whitespace(Tokenizer *t, bool on_newline) {