X-Git-Url: https://secure.softndesign.org/git/?a=blobdiff_plain;f=parser.h;h=629b1b49a83272210f7faa1af41a7668506f54c9;hb=5fe6254a8974dbe1fa199b5e3cc010af9bee87b3;hp=ed17452867d4a1014d943f066b2cf685c8408176;hpb=f29271085277e2cfe75796b4156c8339a901211d;p=calc.git diff --git a/parser.h b/parser.h index ed17452..629b1b4 100644 --- a/parser.h +++ b/parser.h @@ -4,12 +4,13 @@ /* function type */ typedef enum { - Val = 0, + Val = 0, Sig, Add, Sub, - Mul, Div, Pow, - Sqr, + Mul, Div, Mod, + Pow, Sqr, Cos, Sin, Atn, - Log, Exp + Log, Exp, + Qui, Hel } func_t; /* keyword type */ @@ -29,7 +30,7 @@ typedef struct _element_t { func_t func; int nbops; struct _element_t *ops[MAX_OPERANDS]; - float value; + double value; int prio; } element_t; @@ -37,11 +38,13 @@ typedef struct _element_t { /* parser function */ +void delelement (element_t *root); + element_t *parser (char *str, char **next, int prio); void print_element (element_t *root, int level); -double evaluate_element (element_t *root); +double evaluate_element (element_t *root, char mask); #endif /* __PARSER_H__ */