valgrinds rule depends on all

[calc.git] / parser.h

diff --git a/parser.h b/parser.h
index 26022e5e585a469c67b824484a86912be28bf5f4..bf28113c83ae94be6923d3e1a233db7fbb3a3436 100644 (file)
--- a/parser.h
+++ b/parser.h
@@ -1,43 +1,16 @@
 #ifndef __PARSER_H__
 #define __PARSER_H__
 
-/* function type */
-
-typedef enum {
-    Val = 0, Sig,
-    Add, Sub,
-    Mul, Div, Mod,
-    Pow, Sqr,
-    Cos, Sin, Atn,
-    Log, Exp,
-    Qui, Hel
-} 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);