void *callocordie (size_t count, size_t size)
{
+ if (count * size == 0) {
+ return NULL;
+ }
void *new = calloc (count, size);
if (new == NULL) {
VERBOSE (ERROR, fprintf (stderr, "can't allocate memory\n"));
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);
{ "|", Or, 2, 1, -2}
};
-#define NB_FUNCTIONS 31
+#define NB_FUNCTIONS 32
keyword_t functions[NB_FUNCTIONS] = {
{ "sqrt", Sqr, 1, 4, 5},
{ "pow", Pow, 2, 3, 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},
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"));
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);
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 != '}') {
*next = str;
}
+ /* save string */
+ if (root != NULL) {
+ root->string = string;
+ }
+
return root;
}
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;
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);
+ delelement (temp);
}
}
int i;
for (i = 0; i < nbcalls; i++) {
ret = evaluate_element (prog[i], 0);
- prog[i] = NULL;
}
return ret;
}
if ((programs + n)->root) {
delelement ((programs + n)->root);
}
+ if ((programs + n)->string) {
+ free ((programs + n)->string);
+ (programs + n)->string = NULL;
+ }
}
}
break;
}
}
- if (n == -1) {
- VERBOSE (WARNING, fprintf (stdout, "error unknown program (%d)\n", id));
- return 0;
- }
+ }
+ if (n == -1) {
+ VERBOSE (WARNING, fprintf (stdout, "error unknown program (%d)\n", id));
+ return 0;
+ }
- /* store context */
- tmp.answer = answer;
- tmp.storage = storage;
- tmp.storage_size = storage_size;
-
- /* change context */
- answer = 0;
- storage = (programs + n)->storage;
- storage_size = (programs + n)->storage_size;
- if (nbops > storage_size) {
- double *tmp = (double *) callocordie (nbops, sizeof (double));
- memcpy (tmp, storage, storage_size * sizeof (double));
- free (storage);
- storage = tmp;
- storage_size = nbops;
- }
- for (i = 0; i < nbops; i++) {
- double val = evaluate_element (ops[i], 0);
- store (i + 1, val);
- }
+ /* store context */
+ tmp.answer = answer;
+ tmp.storage = storage;
+ tmp.storage_size = storage_size;
+
+ /* change context */
+ answer = 0;
+ storage = (programs + n)->storage;
+ storage_size = (programs + n)->storage_size;
+ if (nbops > storage_size) {
+ double *tmp = (double *) callocordie (nbops, sizeof (double));
+ memcpy (tmp, storage, storage_size * sizeof (double));
+ free (storage);
+ (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);
+ store (i + 1, val);
+ }
- /* 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;
- storage = tmp.storage;
- storage_size = tmp.storage_size;
- }
+ /* restore context */
+ answer = tmp.answer;
+ storage = tmp.storage;
+ storage_size = tmp.storage_size;
return ret;
}
void list ()
{
int i;
- if (programs != NULL) {
- fprintf (stdout, "programs:");
+ fprintf (stdout, "programs:");
+ for (i = 0; i < nb_programs; i++) {
+ fprintf (stdout, " %d", (programs + i)->id);
+ }
+ fprintf (stdout, "\n");
+}
+
+void edit (int id)
+{
+ int i, n = -1;
+
+ if (programs) {
+
+ /* look for program */
for (i = 0; i < nb_programs; i++) {
- fprintf (stdout, " %d", (programs + i)->id);
+ if ((programs + i)->id == id) {
+ n = i;
+ break;
+ }
}
- fprintf (stdout, "\n");
}
+ if (n == -1) {
+ VERBOSE (WARNING, fprintf (stdout, "error unknown program (%d)\n", id));
+ return;
+ }
+
+ /* set string program */
+ fprintf (stdout, "edit: %s\n", (programs + n)->string);
}
-void edit (int id)
-{ }
+void savestring (int id, char *string)
+{
+ int i, n = -1;
+
+ if (programs) {
+
+ /* look for program */
+ for (i = 0; i < nb_programs; i++) {
+ if ((programs + i)->id == id) {
+ n = i;
+ break;
+ }
+ }
+ }
+
+ /* 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);
+}
void del (int id)
-{ }
+{
+ int i, j, n = -1;
+
+ if (programs) {
+
+ /* look for program */
+ for (i = 0; i < nb_programs; i++) {
+ if ((programs + i)->id == id) {
+ n = i;
+ break;
+ }
+ }
+ }
+ if (n == -1) {
+ VERBOSE (WARNING, fprintf (stdout, "error unknown program (%d)\n", id));
+ return;
+ }
+
+ /* clean program */
+ if ((programs + n)->storage) {
+ free ((programs + n)->storage);
+ }
+ if ((programs + n)->root) {
+ delelement ((programs + n)->root);
+ }
+ if ((programs + n)->string) {
+ free ((programs + n)->string);
+ }
+
+ /* remove entry */
+ workspace_t *tmp = (workspace_t *) callocordie (nb_programs - 1, sizeof (workspace_t));
+ for (i = 0, j = 0; i < nb_programs; i++) {
+ if (i != n) {
+ memcpy (tmp + j, programs + i, sizeof (workspace_t));
+ j++;
+ }
+ }
+ free (programs);
+ programs = tmp;
+ nb_programs--;
+}
/* help message */
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, " cos sin tan acos asin atan\n");
+ fprintf (stdout, " acos asin atan cos sin tan\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, " cond while print {} ;\n");
+ fprintf (stdout, " call del edit ls prog\n");
fprintf (stdout, "misc. functions:");
- fprintf (stdout, " quit help\n");
+ fprintf (stdout, " help quit\n");
fprintf (stdout, "supported constants:");
- fprintf (stdout, " e pi\n");
+ fprintf (stdout, " ans e pi\n");
}
/* evaluate element tree */
case Acos:
case Asin:
case Atan:
+ case Ln:
case Log:
case Exp:
case Abs:
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 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]) {
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]);
}