florian/libdice
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

change API of expression to be consistent with dice API

Browse Source
This commit is contained in:
Florian Stinglmayr
2018-02-22 13:32:59 +01:00
parent 320986d0d5
commit 1a75fb05c9
4 changed files with 44 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/dice.h
View File

@@ -55,9 +55,11 @@ bool dice_get(dice_t d, dice_option_t opt, ...);
int64_t dice_roll(dice_t d);
bool dice_evaluate(dice_t d, dice_result_t **res, size_t *reslen);
dice_expression_t dice_expression_parse(char const *s, int *error);
dice_expression_t dice_expression_new(void);
void dice_expression_free(dice_expression_t e);
bool dice_expression_evaluate(dice_expression_t e, int64_t *result);
bool dice_expression_parse(dice_expression_t d, char const *s, int *error);
bool dice_expression_roll(dice_expression_t e, int64_t *result);
bool dice_expression_print(dice_expression_t e);
#endif

25
lib/diceexpr.c
View File

@@ -729,7 +729,7 @@ void dice_expression_free(dice_expression_t e)
free(e);
}
dice_expression_t dice_expression_parse(char const *n, int *error)
dice_expression_t dice_expression_new(void)
{
dice_expression_t e = NULL;
@@ -738,16 +738,27 @@ dice_expression_t dice_expression_parse(char const *n, int *error)
return NULL;
}
e->expr = te_compile(n, 0, 0, error);
if (e->expr == NULL) {
free(e);
return NULL;
}
e->expr = NULL;
return e;
}
bool dice_expression_evaluate(dice_expression_t e, int64_t *result)
bool dice_expression_parse(dice_expression_t e, char const *n, int *error)
{
if (e->expr != NULL) {
te_free(e->expr);
e->expr = NULL;
}
e->expr = te_compile(n, 0, 0, error);
if (e->expr == NULL) {
return false;
}
return true;
}
bool dice_expression_roll(dice_expression_t e, int64_t *result)
{
double val;
if (e == NULL || e->expr == NULL) {