X-Git-Url: https://secure.softndesign.org/git/?a=blobdiff_plain;f=parser.h;h=80fbd984ca68fe213910df0496f3a7d112908f74;hb=686c4bc2a512a57b6c672792b6b44e2d61458dfb;hp=ed17452867d4a1014d943f066b2cf685c8408176;hpb=f29271085277e2cfe75796b4156c8339a901211d;p=calc.git

diff --git a/parser.h b/parser.h
index ed17452..80fbd98 100644
--- a/parser.h
+++ b/parser.h
@@ -1,15 +1,24 @@
 #ifndef __PARSER_H__
 #define __PARSER_H__
 
+/* global variables */
+
+extern double answer;
+
 /* function type */
 
 typedef enum {
-    Val = 0,
+    Val = 0, Sig,
     Add, Sub,
-    Mul, Div, Pow,
-    Sqr,
-    Cos, Sin, Atn,
-    Log, Exp
+    Mul, Div, Mod,
+    Pow, Sqr,
+    Cos, Sin, Atan,
+    Log, Exp,
+    Store, Recall, Disp,
+    Quit, Help,
+    Ans, E, Pi,
+    Equal, Diff, Ge, Le, Gt, Lt,
+    And, Or, Not
 } func_t;
 
 /* keyword type */
@@ -19,7 +28,7 @@ typedef struct _keyword_t {
     func_t func;
     int nbops;
     int offset;
-    int prio;
+    float prio;
 } keyword_t;
 
 /* calculus element type */
@@ -29,7 +38,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 +46,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__ */