correct format

[calc.git] / parser.h

diff --git a/parser.h b/parser.h
index 7d486a330c764bc3aecd2bbe32e01eb79a85b5bf..629b1b49a83272210f7faa1af41a7668506f54c9 100644 (file)
--- a/parser.h
+++ b/parser.h
@@ -4,12 +4,13 @@
 /* function type */
 
 typedef enum {
-    Val = 0, Set,
+    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 */
@@ -19,6 +20,7 @@ typedef struct _keyword_t {
     func_t func;
     int nbops;
     int offset;
+    int prio;
 } keyword_t;
 
 /* calculus element type */
@@ -28,17 +30,22 @@ typedef struct _element_t {
     func_t func;
     int nbops;
     struct _element_t *ops[MAX_OPERANDS];
-    float value;
+    double value;
+    int prio;
 } element_t;
 
 #define ERROR_OP ((element_t *)(-1))
 
 /* parser function */
 
-element_t *parser (char *str, char **next);
+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, char mask);
+
 #endif /* __PARSER_H__ */
 
 /* vim: set ts=4 sw=4 et: */