Skip to content

add support for utf8 expressions #129

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

add support for utf8 expressions #129

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c799aa
add support for utf8 expressions
Aug 16, 2025
ce28672
correct null handling
Aug 17, 2025
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
25 changes: 23 additions & 2 deletions tinyexpr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,27 @@ static double divide(double a, double b) {return a / b;}
static double negate(double a) {return -a;}
static double comma(double a, double b) {(void)a; return b;}

int is_not_special_token(char c)
{
switch (c) {
case '+':
case '-':
case '*':
case '/':
case '^':
case '%':
case '(':
case ')':
case ',':
case ' ':
case '\t':
case '\n':
case '\r':
case '\0':
return 0;
}
return 1;
}

void next_token(state *s) {
s->type = TOK_NULL;
Expand All @@ -252,10 +273,10 @@ void next_token(state *s) {
s->type = TOK_NUMBER;
} else {
/* Look for a variable or builtin function call. */
if (isalpha(s->next[0])) {
if (is_not_special_token(s->next[0])) {
const char *start;
start = s->next;
while (isalpha(s->next[0]) || isdigit(s->next[0]) || (s->next[0] == '_')) s->next++;
while (is_not_special_token(s->next[0]) || isdigit(s->next[0]) || (s->next[0] == '_')) s->next++;

const te_variable *var = find_lookup(s, start, s->next - start);
if (!var) var = find_builtin(start, s->next - start);
Expand Down