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
add log10 function
[calc.git]
/
parser.c
diff --git
a/parser.c
b/parser.c
index b3f370d0c059f6715fdf0b7141027809ec643f3e..e20427cb0135215912ae9498ee4a5bb8e7f0c18d 100644
(file)
--- a/
parser.c
+++ b/
parser.c
@@
-83,9
+83,7
@@
void delelement (element_t *root)
if ((root != NULL) && (root != ERROR_OP)) {
int i;
for (i = 0; i < root->nbops; i++) {
if ((root != NULL) && (root != ERROR_OP)) {
int i;
for (i = 0; i < root->nbops; i++) {
- if ((root->ops[i] != NULL) && (root->ops[i] != ERROR_OP)) {
- delelement (root->ops[i]);
- }
+ delelement (root->ops[i]);
}
if (root->nbops) {
free (root->ops);
}
if (root->nbops) {
free (root->ops);
@@
-132,7
+130,7
@@
keyword_t operators[NB_OPERATORS] = {
{ "|", Or, 2, 1, -2}
};
{ "|", Or, 2, 1, -2}
};
-#define NB_FUNCTIONS 3
1
+#define NB_FUNCTIONS 3
2
keyword_t functions[NB_FUNCTIONS] = {
{ "sqrt", Sqr, 1, 4, 5},
{ "pow", Pow, 2, 3, 5},
keyword_t functions[NB_FUNCTIONS] = {
{ "sqrt", Sqr, 1, 4, 5},
{ "pow", Pow, 2, 3, 5},
@@
-142,6
+140,7
@@
keyword_t functions[NB_FUNCTIONS] = {
{ "acos", Acos, 1, 4, 5},
{ "asin", Asin, 1, 4, 5},
{ "atan", Atan, 1, 4, 5},
{ "acos", Acos, 1, 4, 5},
{ "asin", Asin, 1, 4, 5},
{ "atan", Atan, 1, 4, 5},
+ { "ln", Ln, 1, 2, 5},
{ "log", Log, 1, 3, 5},
{ "exp", Exp, 1, 3, 5},
{ "abs", Abs, 1, 3, 5},
{ "log", Log, 1, 3, 5},
{ "exp", Exp, 1, 3, 5},
{ "abs", Abs, 1, 3, 5},
@@
-206,6
+205,7
@@
element_t *subparser (element_t **proot, char **pstr, func_t func, int nbops, in
element_t *parser (char *str, char **next, int prio)
{
element_t *root = NULL;
element_t *parser (char *str, char **next, int prio)
{
element_t *root = NULL;
+ char *string = str;
int i;
VERBOSE (DEBUG, fprintf (stdout, "Starting parsing\n"));
int i;
VERBOSE (DEBUG, fprintf (stdout, "Starting parsing\n"));
@@
-240,10
+240,7
@@
element_t *parser (char *str, char **next, int prio)
delelement (root);
return ERROR_OP;
}
delelement (root);
return ERROR_OP;
}
- element_t **prog = NULL;
- new = newelement (Code, 0, 5);
- root = new;
- prog = &root;
+ root = newelement (Code, 0, 5);
do {
new = parser (str + 1, &str, 0);
do {
new = parser (str + 1, &str, 0);
@@
-255,14
+252,14
@@
element_t *parser (char *str, char **next, int prio)
delelement (root);
return ERROR_OP;
}
delelement (root);
return ERROR_OP;
}
- element_t *newprog = newelement (Code,
(*prog)
->nbops + 1, 5);
- for (i = 0; i <
(*prog)
->nbops; i++) {
- newprog->ops[i] =
(*prog)
->ops[i];
-
(*prog)
->ops[i] = NULL;
+ element_t *newprog = newelement (Code,
root
->nbops + 1, 5);
+ for (i = 0; i <
root
->nbops; i++) {
+ newprog->ops[i] =
root
->ops[i];
+
root
->ops[i] = NULL;
}
}
- newprog->ops[
(*prog)
->nbops] = new;
- delelement (
*prog
);
-
(*prog)
= newprog;
+ newprog->ops[
root
->nbops] = new;
+ delelement (
root
);
+
root
= newprog;
} while (*str == ',');
if (*str != '}') {
} while (*str == ',');
if (*str != '}') {
@@
-478,6
+475,11
@@
element_t *parser (char *str, char **next, int prio)
*next = str;
}
*next = str;
}
+ /* save string */
+ if (root != NULL) {
+ root->string = string;
+ }
+
return root;
}
return root;
}
@@
-512,7
+514,8
@@
void print_element (element_t *root, int level)
case Acos: func = "Arc Cosine"; break;
case Asin: func = "Arc Sine"; break;
case Atan: func = "Arc Tangent"; break;
case Acos: func = "Arc Cosine"; break;
case Asin: func = "Arc Sine"; break;
case Atan: func = "Arc Tangent"; break;
- case Log: func = "Logarithm"; break;
+ case Ln: func = "Logarithm (e base)"; break;
+ case Log: func = "Logarithm (10 base)"; break;
case Exp: func = "Exponantial"; break;
case Abs: func = "Absolute value"; break;
case Ceil: func = "Ceil value"; break;
case Exp: func = "Exponantial"; break;
case Abs: func = "Absolute value"; break;
case Ceil: func = "Ceil value"; break;
@@
-669,12
+672,15
@@
double while_do (element_t *cond, element_t *action)
VERBOSE (DEBUG, fprintf (stdout, "loop...\n"));
temp = dupelement (cond);
VERBOSE (DEBUG, fprintf (stdout, "loop...\n"));
temp = dupelement (cond);
- if (!evaluate_element (temp, 0)) {
+ double test = evaluate_element (temp, 0);
+ delelement (temp);
+ if (!test) {
break;
}
if (action) {
temp = dupelement (action);
ret = evaluate_element (temp, 0);
break;
}
if (action) {
temp = dupelement (action);
ret = evaluate_element (temp, 0);
+ delelement (temp);
}
}
}
}
@@
-691,7
+697,6
@@
double execute_code (element_t **prog, int nbcalls)
int i;
for (i = 0; i < nbcalls; i++) {
ret = evaluate_element (prog[i], 0);
int i;
for (i = 0; i < nbcalls; i++) {
ret = evaluate_element (prog[i], 0);
- prog[i] = NULL;
}
return ret;
}
}
return ret;
}
@@
-776,6
+781,7
@@
void prog (int id, int nbmems, element_t *root)
}
if ((programs + n)->string) {
free ((programs + n)->string);
}
if ((programs + n)->string) {
free ((programs + n)->string);
+ (programs + n)->string = NULL;
}
}
}
}
}
}
@@
-822,8
+828,8
@@
double call (int id, int nbops, element_t **ops)
double *tmp = (double *) callocordie (nbops, sizeof (double));
memcpy (tmp, storage, storage_size * sizeof (double));
free (storage);
double *tmp = (double *) callocordie (nbops, sizeof (double));
memcpy (tmp, storage, storage_size * sizeof (double));
free (storage);
- storage = tmp;
- storage_size = nbops;
+
(programs + n)->storage =
storage = tmp;
+
(programs + n)->storage_size =
storage_size = nbops;
}
for (i = 0; i < nbops; i++) {
double val = evaluate_element (ops[i], 0);
}
for (i = 0; i < nbops; i++) {
double val = evaluate_element (ops[i], 0);
@@
-833,6
+839,7
@@
double call (int id, int nbops, element_t **ops)
/* evaluate program */
element_t *elements = dupelement ((programs + n)->root);
ret = evaluate_element (elements, 0);
/* evaluate program */
element_t *elements = dupelement ((programs + n)->root);
ret = evaluate_element (elements, 0);
+ delelement (elements);
/* restore context */
answer = tmp.answer;
/* restore context */
answer = tmp.answer;
@@
-872,11
+879,10
@@
void edit (int id)
}
/* set string program */
}
/* set string program */
- //rl_insert_text ((programs + n)->string);
- VERBOSE (INFO, fprintf (stdout, "edit: %s\n", (programs + n)->string));
+ fprintf (stdout, "edit: %s\n", (programs + n)->string);
}
}
-void save
_
string (int id, char *string)
+void savestring (int id, char *string)
{
int i, n = -1;
{
int i, n = -1;
@@
-890,15
+896,16
@@
void save_string (int id, char *string)
}
}
}
}
}
}
- if (n == -1) {
- VERBOSE (WARNING, fprintf (stdout, "error unknown program (%d)\n", id));
- return;
- }
- /* save program */
- if ((programs + n)->string) {
- free ((programs + n)->string);
- }
+ /* unnecesary code */
+ //if (n == -1) {
+ // VERBOSE (WARNING, fprintf (stdout, "error unknown program (%d)\n", id));
+ // return;
+ //}
+ //if ((programs + n)->string) {
+ // free ((programs + n)->string);
+ //}
+
(programs + n)->string = strdup (string);
}
(programs + n)->string = strdup (string);
}
@@
-957,19
+964,21
@@
void help (void)
fprintf (stdout, "logical operators:");
fprintf (stdout, " & | !\n");
fprintf (stdout, "mathematic functions:");
fprintf (stdout, "logical operators:");
fprintf (stdout, " & | !\n");
fprintf (stdout, "mathematic functions:");
- fprintf (stdout, "
pow sqrt log exp
\n");
+ fprintf (stdout, "
exp ln log pow sqrt
\n");
fprintf (stdout, "trig. func.:");
fprintf (stdout, "trig. func.:");
- fprintf (stdout, "
cos sin tan acos asin a
tan\n");
+ fprintf (stdout, "
acos asin atan cos sin
tan\n");
fprintf (stdout, "supported functions:");
fprintf (stdout, " abs ceil floor\n");
fprintf (stdout, "supported functions:");
fprintf (stdout, " abs ceil floor\n");
- fprintf (stdout, "storage functions:");
- fprintf (stdout, " mem sto rcl inc dec disp\n");
+ fprintf (stdout, "stor. functions:");
+ fprintf (stdout, " clear dec disp inc mem rcl sto\n");
+ fprintf (stdout, "cond. functions:");
+ fprintf (stdout, " cond print while {} ;\n");
fprintf (stdout, "prog. functions:");
fprintf (stdout, "prog. functions:");
- fprintf (stdout, " c
ond while print {} ;
\n");
+ fprintf (stdout, " c
all del edit ls prog
\n");
fprintf (stdout, "misc. functions:");
fprintf (stdout, "misc. functions:");
- fprintf (stdout, "
quit help
\n");
+ fprintf (stdout, "
help quit
\n");
fprintf (stdout, "supported constants:");
fprintf (stdout, "supported constants:");
- fprintf (stdout, " e pi\n");
+ fprintf (stdout, "
ans
e pi\n");
}
/* evaluate element tree */
}
/* evaluate element tree */
@@
-1043,6
+1052,7
@@
double evaluate_element (element_t *root, char mask)
case Acos:
case Asin:
case Atan:
case Acos:
case Asin:
case Atan:
+ case Ln:
case Log:
case Exp:
case Abs:
case Log:
case Exp:
case Abs:
@@
-1101,7
+1111,8
@@
double evaluate_element (element_t *root, char mask)
case Acos: return acos (op0);
case Asin: return asin (op0);
case Atan: return atan (op0);
case Acos: return acos (op0);
case Asin: return asin (op0);
case Atan: return atan (op0);
- case Log: return log (op0);
+ case Ln: return log (op0);
+ case Log: return log10 (op0);
case Exp: return exp (op0);
case Abs: return fabs (op0);
case Ceil: return ceil (op0);
case Exp: return exp (op0);
case Abs: return fabs (op0);
case Ceil: return ceil (op0);
@@
-1138,7
+1149,10
@@
double evaluate_element (element_t *root, char mask)
case While: return while_do (root->ops[0], root->ops[1]);
case Code: return execute_code (root->ops, root->nbops);
case Print: return print (op0);
case While: return while_do (root->ops[0], root->ops[1]);
case Code: return execute_code (root->ops, root->nbops);
case Print: return print (op0);
- case Prog: prog ((int)op0, (int)op1, root->ops[2]); break;
+ case Prog:
+ prog ((int)op0, (int)op1, root->ops[2]);
+ savestring ((int)op0, root->string);
+ break;
case Call:
for (i = 1, nb =0; i < root->nbops; i++) {
if (root->ops[i]) {
case Call:
for (i = 1, nb =0; i < root->nbops; i++) {
if (root->ops[i]) {
@@
-1200,7
+1214,7
@@
void free_completion_list (char **list)
int i;
if (list) {
int i;
if (list) {
- for (i = 0; i < NB_
FUNCTIONS + NB_CONSTANTS
; i++) {
+ for (i = 0; i < NB_
OPERATORS + NB_FUNCTIONS + NB_CONSTANTS + NB_SYMBOLS + 1
; i++) {
if (list[i] != NULL) {
free (list[i]);
}
if (list[i] != NULL) {
free (list[i]);
}