X-Git-Url: https://secure.softndesign.org/git/?a=blobdiff_plain;f=parser.h;h=9ce4fd098695f8b0b3f497a82eec664ed375ec66;hb=e2a309f921968691af1566000dd694f191eca857;hp=9fbde3a13c32d34f15105d85b77c59d1f4cf416d;hpb=2e34899a2fff5d5a6414b8f6a0a2c7c207c35923;p=calc.git

diff --git a/parser.h b/parser.h
index 9fbde3a..9ce4fd0 100644
--- a/parser.h
+++ b/parser.h
@@ -1,62 +1,17 @@
 #ifndef __PARSER_H__
 #define __PARSER_H__
 
+#include "element.h"
+
 /* global variables */
 
 extern double answer;
 
-/* function type */
-
-typedef enum {
-    Val = 0, Sig,
-    Add, Sub,
-    Mul, Div, Mod,
-    Pow, Sqr,
-    Cos, Sin, Tan, Acos, Asin, Atan,
-    Log, Exp,
-    Abs, Ceil, Floor,
-    Store, Recall, Inc, Dec, Disp, Mem, Clear,
-    Quit, Help,
-    Ans, E, Pi,
-    Equal, Diff, Ge, Le, Gt, Lt,
-    And, Or, Not,
-    Cond, While, Code, Print,
-    Prog, Call, List, Edit, Del
-} func_t;
-
-/* keyword type */
-
-typedef struct _keyword_t {
-    char *keyword;
-    func_t func;
-    int nbops;
-    int offset;
-    float prio;
-} keyword_t;
-
-/* calculus element type */
-
-typedef struct _element_t {
-    func_t func;
-    int nbops;
-    struct _element_t **ops;
-    double value;
-    int prio;
-    int hidden;
-} element_t;
-
-#define ERROR_OP ((element_t *)(-1))
+/* completion functions */
 
-/* workspace type */
+char **generate_completion_list ();
 
-typedef struct _workspace_t {
-    int id;
-    double answer;
-    double *storage;
-    int storage_size;
-    element_t *root;
-    char *string;
-} workspace_t;
+void free_completion_list (char **list);
 
 /* parser function */
 
@@ -68,22 +23,6 @@ void print_element (element_t *root, int level);
 
 double evaluate_element (element_t *root, char mask);
 
-void save_string (int id, char *string);
-
-/* completion functions */
-
-char **generate_completion_list ();
-
-void free_completion_list (char **list);
-
-/* print function */
-
-void set_format (char *prompt, int precision);
-
-void free_format ();
-
-double print (double value);
-
 #endif /* __PARSER_H__ */
 
 /* vim: set ts=4 sw=4 et: */