github-mirror/fish-shell
github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-03-11 04:51:41 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

tinyexpr: Unfiddle the bits

Browse Source 
Mainly this removes the "TYPE_MASK" macro that just masks off the
higher bits, which I don't think were ever actually used.

Much of this seems like anticipation of future direction, but we're
going somewhere else.
This commit is contained in:
Fabian Homborg 2018-11-02 12:45:06 +01:00
parent 61e7f84e29
commit 84ca265b48
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/tinyexpr.cpp
View File

@ -42,9 +42,12 @@ enum {
TE_FUNCTION0 = 8, TE_FUNCTION1, TE_FUNCTION2, TE_FUNCTION3 TE_FUNCTION0 = 8, TE_FUNCTION1, TE_FUNCTION2, TE_FUNCTION3
}; };
// TODO: This is crappy bit-fiddling that should not be done. int get_arity(const int type) {
#define TYPE_MASK(TYPE) ((TYPE)&0x0000001F) if (type == TE_FUNCTION3) return 3;
#define ARITY(TYPE) ( ((TYPE) & TE_FUNCTION0) ? ((TYPE) & 0x00000007) : 0 ) if (type == TE_FUNCTION2) return 2;
if (type == TE_FUNCTION1) return 1;
return 0;
}
// TODO: Is it actually used that these share a space? // TODO: Is it actually used that these share a space?
enum { enum {
@ -90,7 +93,7 @@ void te_free(te_expr *n);
#define NEW_EXPR(type, ...) new_expr((type), std::move((const te_expr*[]){__VA_ARGS__})) #define NEW_EXPR(type, ...) new_expr((type), std::move((const te_expr*[]){__VA_ARGS__}))
static te_expr *new_expr(const int type, const te_expr *parameters[]) { static te_expr *new_expr(const int type, const te_expr *parameters[]) {
const int arity = ARITY(type); const int arity = get_arity(type);
const int psize = sizeof(void*) * arity; const int psize = sizeof(void*) * arity;
const int size = (sizeof(te_expr) - sizeof(void*)) + psize; const int size = (sizeof(te_expr) - sizeof(void*)) + psize;
te_expr *ret = (te_expr *)malloc(size); te_expr *ret = (te_expr *)malloc(size);
@ -107,11 +110,8 @@ static te_expr *new_expr(const int type, const te_expr *parameters[]) {
void te_free_parameters(te_expr *n) { void te_free_parameters(te_expr *n) {
if (!n) return; if (!n) return;
switch (TYPE_MASK(n->type)) { const int arity = get_arity(n->type);
case TE_FUNCTION3: te_free((te_expr *)n->parameters[2]); if (arity > 0) te_free((te_expr *)n->parameters[arity - 1]);
case TE_FUNCTION2: te_free((te_expr *)n->parameters[1]);
case TE_FUNCTION1: te_free((te_expr *)n->parameters[0]);
}
} }
@ -236,7 +236,7 @@ void next_token(state *s) {
const te_variable *var = find_builtin(start, s->next - start); const te_variable *var = find_builtin(start, s->next - start);
if (var) { if (var) {
switch(TYPE_MASK(var->type)) { switch(var->type) {
case TE_FUNCTION0: case TE_FUNCTION1: case TE_FUNCTION2: case TE_FUNCTION3: case TE_FUNCTION0: case TE_FUNCTION1: case TE_FUNCTION2: case TE_FUNCTION3:
s->type = var->type; s->type = var->type;
s->function = var->address; s->function = var->address;
@ -277,7 +277,7 @@ static te_expr *base(state *s) {
te_expr *ret; te_expr *ret;
int arity; int arity;
switch (TYPE_MASK(s->type)) { switch (s->type) {
case TOK_NUMBER: case TOK_NUMBER:
ret = new_expr(TE_CONSTANT, 0); ret = new_expr(TE_CONSTANT, 0);
ret->value = s->value; ret->value = s->value;
@ -302,7 +302,7 @@ static te_expr *base(state *s) {
case TE_FUNCTION1: case TE_FUNCTION1:
case TE_FUNCTION2: case TE_FUNCTION3: case TE_FUNCTION2: case TE_FUNCTION3:
arity = ARITY(s->type); arity = get_arity(s->type);
ret = new_expr(s->type, 0); ret = new_expr(s->type, 0);
ret->function = s->function; ret->function = s->function;
@ -440,7 +440,7 @@ static te_expr *expr(state *s) {
double te_eval(const te_expr *n) { double te_eval(const te_expr *n) {
if (!n) return NAN; if (!n) return NAN;
switch(TYPE_MASK(n->type)) { switch(n->type) {
case TE_CONSTANT: return n->value; case TE_CONSTANT: return n->value;
case TE_FUNCTION0: case TE_FUNCTION0:
return TE_FUN(void)(); return TE_FUN(void)();
@ -463,7 +463,7 @@ static void optimize(te_expr *n) {
if (n->type == TE_CONSTANT) return; if (n->type == TE_CONSTANT) return;
if (n->type == TE_VARIABLE) return; if (n->type == TE_VARIABLE) return;
const int arity = ARITY(n->type); const int arity = get_arity(n->type);
bool known = true; bool known = true;
for (int i = 0; i < arity; ++i) { for (int i = 0; i < arity; ++i) {
optimize((te_expr *)n->parameters[i]); optimize((te_expr *)n->parameters[i]);