Skip to content

z65 - Fix separator handling in tokenizer #266

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
davidgiven merged 1 commit into from
Feb 14, 2026
Merged

z65 - Fix separator handling in tokenizer #266

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 18 additions & 9 deletions third_party/z65/z65.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,7 @@ static uint8_t encode_a2(char c)
{
for (uint8_t i = 0; zalph[2][i]; i++) {
if (zalph[2][i] == c)
return i;
return i+6;
}
return 0;
}
Expand Down Expand Up @@ -666,8 +666,9 @@ static uint8_t tokenize(char *in, uint16_t parse_buf, uint16_t text_buf)
max_tok = MAX_TOKENS;

while (in[i] && count < max_tok) {
while (is_sep(in[i]))
while (in[i] == ' ')
i++;

if (!in[i])
break;

Expand All @@ -676,13 +677,21 @@ static uint8_t tokenize(char *in, uint16_t parse_buf, uint16_t text_buf)
uint8_t dict_len = 0;
uint8_t word_len = 0;

while (in[i] && !is_sep(in[i])) {
if (dict_len < 7)
word[dict_len++] = in[i];
word_len++;
i++;
}

if(is_sep(in[i])) {
word[0] = in[i];
word_len = 1;
i++;
} else {
while (in[i] && in[i] != ' ') {
if(is_sep(in[i]))
break;

if (dict_len < 7)
word[dict_len++] = in[i];
word_len++;
i++;
}
}
uint16_t dict = dict_lookup(word);

uint16_t entry = parse_buf + 2 + (count << 2);
Expand Down