roland/xo-umbrella2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

xo-reader xo-expression xo-tokenizer xo-jit: comparison + apply

Browse source
This commit is contained in:
Roland Conybeare 2025-07-23 23:19:16 -05:00
commit 93b2daab6c
28 changed files with 720 additions and 171 deletions
Download patch file Download diff file Expand all files Collapse all files

40
xo-tokenizer/include/xo/tokenizer/tokenizer.hpp
View file

@ -211,7 +211,11 @@ namespace xo {
/* can't be 1char punctuation -- can begin assignment token */
return false;
case '=':
return true;
/* can't be 1char punctuation -- can begin comparison token '==' */
return false;
case '!':
/* can't be 1char punctuation -- can begin comparison token '!=' */
return false;
case '-':
/* can't be punctuation
* - can appear inside f64 token: e.g. 1.23e-9.
@ -246,6 +250,12 @@ namespace xo {
case ':':
/* can begin := */
return true;
case '=':
/* can begin == */
return true;
case '!':
/* can begin != */
return true;
}
return false;
@ -446,6 +456,30 @@ namespace xo {
++ix;
}
break;
case '=':
log && log("singleassign or cmpeq token");
if (*(ix + 1) == '=') {
tk_type = tokentype::tk_cmpeq;
++ix;
++ix;
} else {
/* standalone '=' */
tk_type = tokentype::tk_singleassign;
++ix;
}
break;
case '!':
if (*(ix + 1) == '=') {
tk_type = tokentype::tk_cmpne;
++ix;
++ix;
} else {
/* standlone '!' */
// TODO
}
break;
case '"':
{
log && log("recognize string-token");
@ -638,10 +672,6 @@ namespace xo {
}
break;
}
case '=':
tk_type = tokentype::tk_singleassign;
++ix;
break;
default:
break;
}

5
xo-tokenizer/include/xo/tokenizer/tokentype.hpp
View file

@ -126,6 +126,11 @@ namespace xo {
/** operator @c '/' **/
tk_slash,
/** operator @c '==' **/
tk_cmpeq,
/** operator @c '!=' **/
tk_cmpne,
/** keyword @c 'type' **/
tk_type,

3
xo-tokenizer/src/tokenizer/tokentype.cpp
View file

@ -43,6 +43,9 @@ namespace xo {
CASE(tk_star);
CASE(tk_slash);
CASE(tk_cmpeq);
CASE(tk_cmpne);
CASE(tk_type);
CASE(tk_def);
CASE(tk_lambda);