ambroisie/evalexpr
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

evalexpr: parse: clean-up character conversion

Browse source 
Differentiate the postfix and prefix cases to allow overlap in operators
used for each kind of operation
This commit is contained in:
Bruno BELANYI 2020-10-30 19:44:49 +01:00
parent 44bf3d98af
commit 3b51111ff5
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/parse/climbing_parse.c
View file

@ -46,11 +46,19 @@ static enum op_kind char_to_binop(char c)
UNREACHABLE(); UNREACHABLE();
} }
// Only works because no overlap between prefix and postfix operators static enum op_kind char_to_prefix(char c)
static enum op_kind char_to_unop(char c)
{ {
for (size_t i = 0; i < ARR_SIZE(ops); ++i) for (size_t i = 0; i < ARR_SIZE(ops); ++i)
if (ops[i].fix != OP_INFIX && c == ops[i].op[0]) if (ops[i].fix == OP_PREFIX && c == ops[i].op[0])
return ops[i].kind;
UNREACHABLE();
}
static enum op_kind char_to_postfix(char c)
{
for (size_t i = 0; i < ARR_SIZE(ops); ++i)
if (ops[i].fix == OP_POSTFIX && c == ops[i].op[0])
return ops[i].kind; return ops[i].kind;
UNREACHABLE(); UNREACHABLE();
@ -159,7 +167,7 @@ static bool update_op(enum op_kind *op, const char **input)
} }
if (is_postfix(c)) if (is_postfix(c))
{ {
*op = char_to_unop(c); *op = char_to_postfix(c);
return true; return true;
} }
@ -231,8 +239,8 @@ static struct ast_node *parse_operand(const char **input)
int val = 0; int val = 0;
if (is_prefix(*input[0])) if (is_prefix(*input[0]))
{ {
enum op_kind op = char_to_unop(*input[0]); enum op_kind op = char_to_prefix(*input[0]);
// Remove the parenthesis // Remove the operator
eat_char(input); eat_char(input);
ast = climbing_parse_internal(input, next_prec(op)); ast = climbing_parse_internal(input, next_prec(op));