Soft'N'Design Software
/
projects
/
calc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix percent printing
[calc.git]
/
parser.h
diff --git
a/parser.h
b/parser.h
index 46500073105fd206140e36f2c53979a0309f69d5..629b1b49a83272210f7faa1af41a7668506f54c9 100644
(file)
--- a/
parser.h
+++ b/
parser.h
@@
-4,12
+4,13
@@
/* function type */
typedef enum {
/* function type */
typedef enum {
- Val = 0,
+ Val = 0,
Sig,
Add, Sub,
Add, Sub,
- Mul, Div,
Pow
,
- Sqr,
+ Mul, Div,
Mod
,
+
Pow,
Sqr,
Cos, Sin, Atn,
Cos, Sin, Atn,
- Log, Exp
+ Log, Exp,
+ Qui, Hel
} func_t;
/* keyword type */
} func_t;
/* keyword type */
@@
-19,24
+20,32
@@
typedef struct _keyword_t {
func_t func;
int nbops;
int offset;
func_t func;
int nbops;
int offset;
+ int prio;
} keyword_t;
/* calculus element type */
} keyword_t;
/* calculus element type */
-#define MAX_OPERANDS
2
+#define MAX_OPERANDS
10
typedef struct _element_t {
func_t func;
int nbops;
struct _element_t *ops[MAX_OPERANDS];
typedef struct _element_t {
func_t func;
int nbops;
struct _element_t *ops[MAX_OPERANDS];
- float value;
+ double value;
+ int prio;
} element_t;
} element_t;
+#define ERROR_OP ((element_t *)(-1))
+
/* parser function */
/* parser function */
-element_t *parser (char *str);
+void delelement (element_t *root);
+
+element_t *parser (char *str, char **next, int prio);
void print_element (element_t *root, int level);
void print_element (element_t *root, int level);
+double evaluate_element (element_t *root, char mask);
+
#endif /* __PARSER_H__ */
/* vim: set ts=4 sw=4 et: */
#endif /* __PARSER_H__ */
/* vim: set ts=4 sw=4 et: */