X-Git-Url: https://secure.softndesign.org/git/?a=blobdiff_plain;f=parser.h;h=7d486a330c764bc3aecd2bbe32e01eb79a85b5bf;hb=c04d8fdf9259e5e303c8b30120649aafd68a5a52;hp=46500073105fd206140e36f2c53979a0309f69d5;hpb=bc97a98979c3378e4f0e962b9c2667fc27239a4d;p=calc.git diff --git a/parser.h b/parser.h index 4650007..7d486a3 100644 --- a/parser.h +++ b/parser.h @@ -4,7 +4,7 @@ /* function type */ typedef enum { - Val = 0, + Val = 0, Set, Add, Sub, Mul, Div, Pow, Sqr, @@ -23,7 +23,7 @@ typedef struct _keyword_t { /* calculus element type */ -#define MAX_OPERANDS 2 +#define MAX_OPERANDS 10 typedef struct _element_t { func_t func; int nbops; @@ -31,9 +31,11 @@ typedef struct _element_t { float value; } element_t; +#define ERROR_OP ((element_t *)(-1)) + /* parser function */ -element_t *parser (char *str); +element_t *parser (char *str, char **next); void print_element (element_t *root, int level);