fix bracket evaluation

[calc.git] / parser.h

diff --git a/parser.h b/parser.h
index 8038a9db00c8549bcd2e137d7b7eaed1754c8ca9..bf28113c83ae94be6923d3e1a233db7fbb3a3436 100644 (file)
--- a/parser.h
+++ b/parser.h
@@ -1,47 +1,21 @@
 #ifndef __PARSER_H__
 #define __PARSER_H__
 
-/* function type */
-
-typedef enum {
-    Val = 0,
-    Add, Sub,
-    Mul, Div, Mod,
-    Pow, Sqr,
-    Cos, Sin, Atn,
-    Log, Exp
-} func_t;
-
-/* keyword type */
-
-typedef struct _keyword_t {
-    char *keyword;
-    func_t func;
-    int nbops;
-    int offset;
-    int prio;
-} keyword_t;
-
-/* calculus element type */
-
-#define MAX_OPERANDS 10
-typedef struct _element_t {
-    func_t func;
-    int nbops;
-    struct _element_t *ops[MAX_OPERANDS];
-    float value;
-    int prio;
-} element_t;
-
-#define ERROR_OP ((element_t *)(-1))
+#include "element.h"
+
+/* global variables */
+
+extern double answer;
 
 /* 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__ */