embellish usage display

[calc.git] / program.h

diff --git a/program.h b/program.h
index 8fdca142c58a6085e4ede4503354fa56e7fc05ed..f3f5369981795ba5e49c87e607c960c92d2a44d8 100644 (file)
--- a/program.h
+++ b/program.h
@@ -2,34 +2,17 @@
 #define __PROGRAM_H__
 
 #include "element.h"
+#include "tabular.h"
+#include "workspace.h"
 
 /* global variables */
 
-extern int argument_size;
-extern double *argument;
-
-/* workspace type */
-
-typedef struct _workspace_t {
-    int id;
-    double answer;
-    double *storage;
-    int storage_size;
-    double *argument;
-    int argument_size;
-    element_t *root;
-    double *stack;
-    int stack_size;
-    char *string;
-} workspace_t;
-
-extern workspace_t *programs;
+extern workspace_t **programs;
 extern int nb_programs;
 
 /* program function */
 
 void prog (int id, element_t *root);
-double arg (int id);
 double call (int id, int nbargs, element_t **args);
 void list ();
 void edit (int id);