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
very partial program functions
[calc.git]
/
parser.c
diff --git
a/parser.c
b/parser.c
index 20f507d014446d92f63cd2bf73dba65f4fda2930..395e2aea1e90642757ab4cf6fb2d891058d479a1 100644
(file)
--- a/
parser.c
+++ b/
parser.c
@@
-2,6
+2,7
@@
#include <math.h>
#include <stdio.h>
#include <stdlib.h>
#include <math.h>
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include "debug.h"
#include "debug.h"
@@
-11,8
+12,16
@@
double answer = 0;
double answer = 0;
-#define STORAGE_SIZE 10
-double storage[STORAGE_SIZE] = {0};
+#define DEFAULT_STORAGE_SIZE 10
+int storage_size = -1;
+
+double *storage = NULL;
+
+#define DEFAULT_FORMAT "=> %.6g\n"
+char *format = NULL;
+char *minform = NULL;
+
+workspace_t *programs = NULL;
/* compare codes */
/* compare codes */
@@
-43,7
+52,14
@@
element_t *newelement (func_t function, int nbops, int prio)
element_t *new = (element_t *) calloc (1, sizeof (element_t));
if (new == NULL) {
VERBOSE (ERROR, fprintf (stderr, "can't allocate memory\n"));
element_t *new = (element_t *) calloc (1, sizeof (element_t));
if (new == NULL) {
VERBOSE (ERROR, fprintf (stderr, "can't allocate memory\n"));
- return NULL;
+ exit (1);
+ }
+ if (nbops) {
+ new->ops = (element_t **) calloc (nbops, sizeof (element_t *));
+ if (new->ops == NULL) {
+ VERBOSE (ERROR, fprintf (stderr, "can't allocate memory\n"));
+ exit (1);
+ }
}
new->func = function;
new->nbops = nbops;
}
new->func = function;
new->nbops = nbops;
@@
-56,13
+72,16
@@
element_t *newelement (func_t function, int nbops, int prio)
void delelement (element_t *root)
{
void delelement (element_t *root)
{
- int i;
if ((root != NULL) && (root != ERROR_OP)) {
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]);
}
}
for (i = 0; i < root->nbops; i++) {
if ((root->ops[i] != NULL) && (root->ops[i] != ERROR_OP)) {
delelement (root->ops[i]);
}
}
+ if (root->nbops) {
+ free (root->ops);
+ }
free (root);
}
}
free (root);
}
}
@@
-78,16
+97,9
@@
element_t *dupelement (element_t *root)
return root;
}
tmp = newelement (root->func, root->nbops, root->prio);
return root;
}
tmp = newelement (root->func, root->nbops, root->prio);
- if (tmp == NULL) {
- return ERROR_OP;
- }
tmp->value = root->value;
for (i = 0; i < root->nbops; i++) {
tmp->ops[i] = dupelement (root->ops[i]);
tmp->value = root->value;
for (i = 0; i < root->nbops; i++) {
tmp->ops[i] = dupelement (root->ops[i]);
- if (tmp->ops[i] == ERROR_OP) {
- delelement (tmp);
- return ERROR_OP;
- }
}
return tmp;
}
}
return tmp;
}
@@
-112,25
+124,39
@@
keyword_t operators[NB_OPERATORS] = {
{ "|", Or, 2, 1, -2}
};
{ "|", Or, 2, 1, -2}
};
-#define NB_FUNCTIONS
17
+#define NB_FUNCTIONS
31
keyword_t functions[NB_FUNCTIONS] = {
{ "sqrt", Sqr, 1, 4, 5},
{ "pow", Pow, 2, 3, 5},
{ "cos", Cos, 1, 3, 5},
{ "sin", Sin, 1, 3, 5},
keyword_t functions[NB_FUNCTIONS] = {
{ "sqrt", Sqr, 1, 4, 5},
{ "pow", Pow, 2, 3, 5},
{ "cos", Cos, 1, 3, 5},
{ "sin", Sin, 1, 3, 5},
+ { "tan", Tan, 1, 3, 5},
+ { "acos", Acos, 1, 4, 5},
+ { "asin", Asin, 1, 4, 5},
{ "atan", Atan, 1, 4, 5},
{ "atan", Atan, 1, 4, 5},
- { "exp", Exp, 1, 3, 5},
{ "log", Log, 1, 3, 5},
{ "log", Log, 1, 3, 5},
+ { "exp", Exp, 1, 3, 5},
+ { "abs", Abs, 1, 3, 5},
+ { "floor", Floor, 1, 5, 5},
+ { "ceil", Ceil, 1, 4, 5},
{ "sto", Store, 2, 3, 5},
{ "rcl", Recall, 1, 3, 5},
{ "inc", Inc, 1, 3, 5},
{ "dec", Dec, 1, 3, 5},
{ "disp", Disp, 0, 4, 9},
{ "sto", Store, 2, 3, 5},
{ "rcl", Recall, 1, 3, 5},
{ "inc", Inc, 1, 3, 5},
{ "dec", Dec, 1, 3, 5},
{ "disp", Disp, 0, 4, 9},
+ { "mem", Mem, 1, 3, 9},
+ { "clr", Clear, 0, 3, 9},
{ "quit", Quit, 0, 4, 9},
{ "help", Help, 0, 4, 9},
{ "!", Not, 1, 1, 6},
{ "cond", Cond, 3, 4, 5},
{ "quit", Quit, 0, 4, 9},
{ "help", Help, 0, 4, 9},
{ "!", Not, 1, 1, 6},
{ "cond", Cond, 3, 4, 5},
- { "whl", While, 2, 3, 5}
+ { "while", While, 2, 5, 5},
+ { "print", Print, 1, 5, 5},
+ { "prog", Prog, 3, 4, 9},
+ { "call", Call, 10, 4, 5},
+ { "ls", List, 0, 2, 9},
+ { "edit", Edit, 1, 4, 9},
+ { "del", Del, 1, 3, 9}
};
#define NB_CONSTANTS 3
};
#define NB_CONSTANTS 3
@@
-140,14
+166,16
@@
keyword_t constants[NB_CONSTANTS] = {
{ "pi", Pi, 0, 2, 5}
};
{ "pi", Pi, 0, 2, 5}
};
+#define NB_SYMBOLS 4
+char *symbols[NB_SYMBOLS] = {
+ "(", ")", "{", "}"
+};
+
/* subparser function */
element_t *subparser (element_t **proot, char **pstr, func_t func, int nbops, int prio)
{
element_t *new = newelement (func, nbops, prio);
/* subparser function */
element_t *subparser (element_t **proot, char **pstr, func_t func, int nbops, int prio)
{
element_t *new = newelement (func, nbops, prio);
- if (new == NULL) {
- return ERROR_OP;
- }
new->ops[0] = *proot;
new->ops[1] = parser (*pstr, pstr, new->prio);
if ((new->ops[1] == NULL) || ((new->ops[1] != ERROR_OP) && (new->ops[1]->prio == 9))) {
new->ops[0] = *proot;
new->ops[1] = parser (*pstr, pstr, new->prio);
if ((new->ops[1] == NULL) || ((new->ops[1] != ERROR_OP) && (new->ops[1]->prio == 9))) {
@@
-160,10
+188,6
@@
element_t *subparser (element_t **proot, char **pstr, func_t func, int nbops, in
return ERROR_OP;
}
*proot = newelement (Val, 1, 5);
return ERROR_OP;
}
*proot = newelement (Val, 1, 5);
- if (*proot == NULL) {
- delelement (new);
- return ERROR_OP;
- }
(*proot)->ops[0] = new;
return *proot;
(*proot)->ops[0] = new;
return *proot;
@@
-184,6
+208,15
@@
element_t *parser (char *str, char **next, int prio)
element_t *new = NULL;
VERBOSE (INFO, fprintf (stdout, "Processing: %s\n", str));
element_t *new = NULL;
VERBOSE (INFO, fprintf (stdout, "Processing: %s\n", str));
+ /* end without printing */
+
+ if (*str == ';') {
+ if (root) {
+ root->hidden = 1;
+ }
+ break;
+ }
+
/* skip spaces and tabs */
if ((*str == ' ') || (*str == '\t')) {
/* skip spaces and tabs */
if ((*str == ' ') || (*str == '\t')) {
@@
-191,6
+224,48
@@
element_t *parser (char *str, char **next, int prio)
continue;
}
continue;
}
+ /* check for open brace */
+
+ if (*str == '{') {
+ VERBOSE (DEBUG, fprintf (stdout, "start processing brace\n"));
+ if (root != NULL) {
+ delelement (root);
+ return ERROR_OP;
+ }
+ element_t **prog = NULL;
+ new = newelement (Prog, 0, 5);
+ root = new;
+ prog = &root;
+
+ do {
+ new = parser (str + 1, &str, 0);
+ if ((new == NULL) || ((new != ERROR_OP) && (new->prio == 9))) {
+ delelement (new);
+ new = ERROR_OP;
+ }
+ if (new == ERROR_OP) {
+ delelement (root);
+ return ERROR_OP;
+ }
+ element_t *newprog = newelement (Prog, (*prog)->nbops + 1, 5);
+ for (i = 0; i < (*prog)->nbops; i++) {
+ newprog->ops[i] = (*prog)->ops[i];
+ (*prog)->ops[i] = NULL;
+ }
+ newprog->ops[(*prog)->nbops] = new;
+ delelement (*prog);
+ (*prog) = newprog;
+ } while (*str == ',');
+
+ if (*str != '}') {
+ delelement (root);
+ return ERROR_OP;
+ }
+ str++;
+ VERBOSE (DEBUG, fprintf (stdout, "stop processing brace\n"));
+ continue;
+ }
+
/* check for open bracket */
if (*str == '(') {
/* check for open bracket */
if (*str == '(') {
@@
-222,9
+297,6
@@
element_t *parser (char *str, char **next, int prio)
} while (*str == ',');
} else {
root = newelement (Val, 1, 5);
} while (*str == ',');
} else {
root = newelement (Val, 1, 5);
- if (root == NULL) {
- return ERROR_OP;
- }
new = parser (str + 1, &str, 0);
if ((new == NULL) || ((new != ERROR_OP) && (new->prio == 9))) {
delelement (new);
new = parser (str + 1, &str, 0);
if ((new == NULL) || ((new != ERROR_OP) && (new->prio == 9))) {
delelement (new);
@@
-246,9
+318,13
@@
element_t *parser (char *str, char **next, int prio)
continue;
}
continue;
}
- /* check for closing bracket or koma */
+ /* check for closing bracket
, closing brace
or koma */
- if ((*str == ')') || (*str == ',')) {
+ if ((*str == ')') || (*str == '}') || (*str == ',')) {
+ if (prio == -9) {
+ delelement (root);
+ return ERROR_OP;
+ }
if (next != NULL) {
*next = str;
}
if (next != NULL) {
*next = str;
}
@@
-274,11
+350,7
@@
element_t *parser (char *str, char **next, int prio)
return ERROR_OP;
}
} else if (*str == '-') {
return ERROR_OP;
}
} else if (*str == '-') {
- new = newelement (Sig, 1, 9);
- if (new == NULL) {
- return ERROR_OP;
- }
- root = new;
+ root = newelement (Sig, 1, 9);
} else {
return ERROR_OP;
}
} else {
return ERROR_OP;
}
@@
-299,11
+371,7
@@
element_t *parser (char *str, char **next, int prio)
VERBOSE (DEBUG, fprintf (stdout, "start processing function\n"));
if (root == NULL) {
VERBOSE (INFO, fprintf (stdout, "Func: %d\n", function->func));
VERBOSE (DEBUG, fprintf (stdout, "start processing function\n"));
if (root == NULL) {
VERBOSE (INFO, fprintf (stdout, "Func: %d\n", function->func));
- new = newelement (function->func, function->nbops, function->prio);
- if (new == NULL) {
- return ERROR_OP;
- }
- root = new;
+ root = newelement (function->func, function->nbops, function->prio);
} else {
delelement (root);
return ERROR_OP;
} else {
delelement (root);
return ERROR_OP;
@@
-326,11
+394,7
@@
element_t *parser (char *str, char **next, int prio)
VERBOSE (DEBUG, fprintf (stdout, "start processing constant\n"));
if (root == NULL) {
VERBOSE (INFO, fprintf (stdout, "Const: %d\n", constant->func));
VERBOSE (DEBUG, fprintf (stdout, "start processing constant\n"));
if (root == NULL) {
VERBOSE (INFO, fprintf (stdout, "Const: %d\n", constant->func));
- new = newelement (constant->func, constant->nbops, constant->prio);
- if (new == NULL) {
- return ERROR_OP;
- }
- root = new;
+ root = newelement (constant->func, constant->nbops, constant->prio);
} else {
delelement (root);
return ERROR_OP;
} else {
delelement (root);
return ERROR_OP;
@@
-356,9
+420,6
@@
element_t *parser (char *str, char **next, int prio)
if (str != pt) {
if ((root == NULL) || (root->prio == 6)) {
new = newelement (Val, 1, 5);
if (str != pt) {
if ((root == NULL) || (root->prio == 6)) {
new = newelement (Val, 1, 5);
- if (new == NULL) {
- return ERROR_OP;
- }
new->value = value;
if (root == NULL) {
root = new;
new->value = value;
if (root == NULL) {
root = new;
@@
-439,14
+500,22
@@
void print_element (element_t *root, int level)
case Sqr: func = "Square Root"; break;
case Cos: func = "Cosine"; break;
case Sin: func = "Sine"; break;
case Sqr: func = "Square Root"; break;
case Cos: func = "Cosine"; break;
case Sin: func = "Sine"; break;
+ case Tan: func = "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 Exp: func = "Exponantial"; break;
case Atan: func = "Arc Tangent"; break;
case Log: func = "Logarithm"; break;
case Exp: func = "Exponantial"; break;
+ case Abs: func = "Absolute value"; break;
+ case Ceil: func = "Ceil value"; break;
+ case Floor: func = "Floor value"; break;
case Store: func = "Store"; break;
case Recall: func = "Recall"; break;
case Inc: func = "Increase"; break;
case Dec: func = "Decrease"; break;
case Disp: func = "Display"; break;
case Store: func = "Store"; break;
case Recall: func = "Recall"; break;
case Inc: func = "Increase"; break;
case Dec: func = "Decrease"; break;
case Disp: func = "Display"; break;
+ case Mem: func = "Memory"; break;
+ case Clear: func = "Clear"; break;
case Quit: func = "Quit"; break;
case Help: func = "Help"; break;
case Ans: func = "Ans"; break;
case Quit: func = "Quit"; break;
case Help: func = "Help"; break;
case Ans: func = "Ans"; break;
@@
-463,6
+532,13
@@
void print_element (element_t *root, int level)
case Not: func = "Not"; break;
case Cond: func = "Condition"; break;
case While: func = "While"; break;
case Not: func = "Not"; break;
case Cond: func = "Condition"; break;
case While: func = "While"; break;
+ case Prog: func = "Program"; break;
+ case Print: func = "Print"; break;
+ case Prog: func = "Program"; break;
+ case Call: func = "Call"; break;
+ case List: func = "List"; break;
+ case Edit: func = "Edit"; break;
+ case Del: func = "Del"; break;
}
fprintf (stdout, "Function: %s\n", func);
}
fprintf (stdout, "Function: %s\n", func);
@@
-481,42
+557,76
@@
void print_element (element_t *root, int level)
/* storage functions */
/* storage functions */
+void memory (int nb)
+{
+ int i, l;
+ double *tmp = NULL;
+ if (nb != storage_size) {
+ l = (nb < storage_size) ? nb : storage_size;
+ tmp = (double *) calloc (nb, sizeof (double));
+ if (tmp == NULL) {
+ VERBOSE (ERROR, fprintf (stderr, "can't allocate memory\n"));
+ exit (1);
+ }
+ for (i = 0; i < l; i++) {
+ tmp[i] = storage[i];
+ }
+ if (storage != NULL) {
+ free (storage);
+ }
+ storage = tmp;
+ storage_size = nb;
+ }
+}
+
double store (int index, double value)
{
double store (int index, double value)
{
- if ((index > 0) && (index <= STORAGE_SIZE)) {
+ if (storage_size == -1) {
+ memory (DEFAULT_STORAGE_SIZE);
+ }
+ if ((index > 0) && (index <= storage_size)) {
storage[index - 1] = value;
} else {
storage[index - 1] = value;
} else {
- VERBOSE (WARNING, fprintf (stdout, "invalid index (%d) [
1, %d]\n", index, STORAGE_SIZE
));
+ VERBOSE (WARNING, fprintf (stdout, "invalid index (%d) [
%d, %d]\n", index, (storage_size) ? 1 : 0, storage_size
));
}
return value;
}
double recall (int index)
{
}
return value;
}
double recall (int index)
{
- if ((index > 0) && (index <= STORAGE_SIZE)) {
+ if (storage_size == -1) {
+ memory (DEFAULT_STORAGE_SIZE);
+ }
+ if ((index > 0) && (index <= storage_size)) {
return storage[index - 1];
} else {
return storage[index - 1];
} else {
- VERBOSE (WARNING, fprintf (stdout, "invalid index (%d) [
1, %d]\n", index, STORAGE_SIZE
));
+ VERBOSE (WARNING, fprintf (stdout, "invalid index (%d) [
%d, %d]\n", index, (storage_size) ? 1 : 0, storage_size
));
}
return 0;
}
double increase (int index)
{
}
return 0;
}
double increase (int index)
{
- if ((index > 0) && (index <= STORAGE_SIZE)) {
+ if (storage_size == -1) {
+ memory (DEFAULT_STORAGE_SIZE);
+ }
+ if ((index > 0) && (index <= storage_size)) {
return storage[index - 1]++;
} else {
return storage[index - 1]++;
} else {
- VERBOSE (WARNING, fprintf (stdout, "invalid index (%d) [
1, %d]\n", index, STORAGE_SIZE
));
+ VERBOSE (WARNING, fprintf (stdout, "invalid index (%d) [
%d, %d]\n", index, (storage_size) ? 1 : 0, storage_size
));
}
return 0;
}
double decrease (int index)
{
}
return 0;
}
double decrease (int index)
{
- if ((index > 0) && (index <= STORAGE_SIZE)) {
+ if (storage_size == -1) {
+ memory (DEFAULT_STORAGE_SIZE);
+ }
+ if ((index > 0) && (index <= storage_size)) {
return storage[index - 1]--;
} else {
return storage[index - 1]--;
} else {
- VERBOSE (WARNING, fprintf (stdout, "invalid index (%d) [
1, %d]\n", index, STORAGE_SIZE
));
+ VERBOSE (WARNING, fprintf (stdout, "invalid index (%d) [
%d, %d]\n", index, (storage_size) ? 1 : 0, storage_size
));
}
return 0;
}
}
return 0;
}
@@
-524,13
+634,25
@@
double decrease (int index)
void display (void)
{
int i;
void display (void)
{
int i;
+ if (storage_size == -1) {
+ memory (DEFAULT_STORAGE_SIZE);
+ }
fprintf (stdout, "storage:");
fprintf (stdout, "storage:");
- for (i = 0; i < STORAGE_SIZE; i++) {
- fprintf (stdout, " %g", storage[i]);
+ for (i = 0; i < storage_size; i++) {
+ fprintf (stdout, " ");
+ fprintf (stdout, minform, storage[i]);
}
fprintf (stdout, "\n");
}
}
fprintf (stdout, "\n");
}
+void clear ()
+{
+ int i;
+ for (i = 0; i < storage_size; i++) {
+ storage[i] = 0;
+ }
+}
+
/* While do function */
double while_do (element_t *cond, element_t *action)
/* While do function */
double while_do (element_t *cond, element_t *action)
@@
-539,9
+661,6
@@
double while_do (element_t *cond, element_t *action)
element_t *temp = NULL;
VERBOSE (DEBUG, fprintf (stdout, "starting while loop\n"));
element_t *temp = NULL;
VERBOSE (DEBUG, fprintf (stdout, "starting while loop\n"));
- if (cond == NULL) {
- return ret;
- }
while (1) {
VERBOSE (DEBUG, fprintf (stdout, "loop...\n"));
while (1) {
VERBOSE (DEBUG, fprintf (stdout, "loop...\n"));
@@
-560,6
+679,50
@@
double while_do (element_t *cond, element_t *action)
return ret;
}
return ret;
}
+/* program function */
+
+double program_do (element_t **prog, int nbcalls)
+{
+ double ret = 0;
+ int i;
+ for (i = 0; i < nbcalls; i++) {
+ ret = evaluate_element (prog[i], 0);
+ prog[i] = NULL;
+ }
+ return ret;
+}
+
+/* print function */
+
+void set_format (char *prompt, int precision)
+{
+ char buffer[128] = {0};
+ free_format ();
+ sprintf (buffer, "%s%%.%dg\n", prompt, precision);
+ format = strdup (buffer);
+ sprintf (buffer, "%%.%dg", precision);
+ minform = strdup (buffer);
+}
+
+void free_format ()
+{
+ if (format) {
+ free (format);
+ format = NULL;
+ }
+ if (minform) {
+ free (minform);
+ minform = NULL;
+ }
+}
+
+double print (double value)
+{
+ fprintf (stdout, format ? format : DEFAULT_FORMAT, value);
+ fflush (stdout);
+ return value;
+}
+
/* quit function */
void quit (void)
/* quit function */
void quit (void)
@@
-568,6
+731,25
@@
void quit (void)
exit (0);
}
exit (0);
}
+/* program function */
+
+void prog (int id, int nbmems, element_t *root)
+{ }
+
+double call (int id, int nbobs, element_t **ops)
+{
+ return 0;
+}
+
+void list ()
+{ }
+
+void edit (int id)
+{ }
+
+void del (int id)
+{ }
+
/* help message */
void help (void)
/* help message */
void help (void)
@@
-579,13
+761,17
@@
void help (void)
fprintf (stdout, " == != >= <= > <\n");
fprintf (stdout, "logical operators:");
fprintf (stdout, " & | !\n");
fprintf (stdout, " == != >= <= > <\n");
fprintf (stdout, "logical operators:");
fprintf (stdout, " & | !\n");
+ fprintf (stdout, "mathematic functions:");
+ fprintf (stdout, " pow sqrt log exp\n");
+ fprintf (stdout, "trig. func.:");
+ fprintf (stdout, " cos sin tan acos asin atan\n");
fprintf (stdout, "supported functions:");
fprintf (stdout, "supported functions:");
- fprintf (stdout, "
pow sqrt cos sin atan log exp
\n");
+ fprintf (stdout, "
abs ceil floor
\n");
fprintf (stdout, "storage functions:");
fprintf (stdout, "storage functions:");
- fprintf (stdout, "
sto rcl inc dec
\n");
- fprintf (stdout, "
conditional
functions:");
- fprintf (stdout, " cond\n");
- fprintf (stdout, "misc
ellaneous
functions:");
+ fprintf (stdout, "
mem sto rcl inc dec disp
\n");
+ fprintf (stdout, "
prog.
functions:");
+ fprintf (stdout, " cond
while print {} ;
\n");
+ fprintf (stdout, "misc
.
functions:");
fprintf (stdout, " quit help\n");
fprintf (stdout, "supported constants:");
fprintf (stdout, " e pi\n");
fprintf (stdout, " quit help\n");
fprintf (stdout, "supported constants:");
fprintf (stdout, " e pi\n");
@@
-646,6
+832,7
@@
double evaluate_element (element_t *root, char mask)
case Lt:
case And:
case Or:
case Lt:
case And:
case Or:
+ case Prog:
if (root->ops[1]) {
op1 = evaluate_element (root->ops[1], nextmask);
} else if (root->func != Store) {
if (root->ops[1]) {
op1 = evaluate_element (root->ops[1], nextmask);
} else if (root->func != Store) {
@@
-656,14
+843,25
@@
double evaluate_element (element_t *root, char mask)
case Sqr:
case Cos:
case Sin:
case Sqr:
case Cos:
case Sin:
+ case Tan:
+ case Acos:
+ case Asin:
case Atan:
case Log:
case Exp:
case Atan:
case Log:
case Exp:
+ case Abs:
+ case Ceil:
+ case Floor:
case Recall:
case Inc:
case Dec:
case Not:
case Recall:
case Inc:
case Dec:
case Not:
+ case Mem:
case Cond:
case Cond:
+ case Call:
+ case List:
+ case Edit:
+ case Del:
if (root->ops[0]) {
op0 = evaluate_element (root->ops[0], 0);
} else {
if (root->ops[0]) {
op0 = evaluate_element (root->ops[0], 0);
} else {
@@
-672,11
+870,13
@@
double evaluate_element (element_t *root, char mask)
}
break;
case Disp:
}
break;
case Disp:
+ case Clear:
case Quit:
case Help:
case Ans:
case Pi:
case E:
case Quit:
case Help:
case Ans:
case Pi:
case E:
+ case Prog:
break;
case While:
if (root->ops[0] == NULL) {
break;
case While:
if (root->ops[0] == NULL) {
@@
-684,6
+884,9
@@
double evaluate_element (element_t *root, char mask)
return 0;
}
break;
return 0;
}
break;
+ case Print:
+ op0 = (root->ops[0]) ? evaluate_element (root->ops[0], 0) : answer;
+ break;
}
switch (root->func) {
}
switch (root->func) {
@@
-698,14
+901,22
@@
double evaluate_element (element_t *root, char mask)
case Sqr: return sqrt (op0);
case Cos: return cos (op0);
case Sin: return sin (op0);
case Sqr: return sqrt (op0);
case Cos: return cos (op0);
case Sin: return sin (op0);
+ case Tan: return tan (op0);
+ case Acos: return acos (op0);
+ case Asin: return asin (op0);
case Atan: return atan (op0);
case Log: return log (op0);
case Exp: return exp (op0);
case Atan: return atan (op0);
case Log: return log (op0);
case Exp: return exp (op0);
+ case Abs: return fabs (op0);
+ case Ceil: return ceil (op0);
+ case Floor: return floor (op0);
case Store: return store ((int)op0, (op1) ? op1 : answer);
case Recall: return recall ((int)op0);
case Inc: return increase ((int)op0);
case Dec: return decrease ((int)op0);
case Disp: display (); break;
case Store: return store ((int)op0, (op1) ? op1 : answer);
case Recall: return recall ((int)op0);
case Inc: return increase ((int)op0);
case Dec: return decrease ((int)op0);
case Disp: display (); break;
+ case Mem: memory ((int)op0); break;
+ case Clear: clear (); break;
case Quit: quit (); break;
case Help: help (); break;
case Ans: return answer;
case Quit: quit (); break;
case Help: help (); break;
case Ans: return answer;
@@
-729,9
+940,76
@@
double evaluate_element (element_t *root, char mask)
return 0;
}
case While: return while_do (root->ops[0], root->ops[1]);
return 0;
}
case While: return while_do (root->ops[0], root->ops[1]);
+ case Prog: return program_do (root->ops, root->nbops);
+ case Print: return print (op0);
+ case Prog: prog ((int)op0, (int)op1, root->ops[2]); break;
+ case Call: return call ((int)op0, root->nbops + 1, root->ops + 1);
+ case List: list (); break;
+ case Edit: edit ((int)op0); break;
+ case Del: del (int (op0)); break;
}
return 0;
}
}
return 0;
}
+char **generate_completion_list ()
+{
+ int i, j, l = 0;
+ char **list = (char **) calloc (NB_OPERATORS + NB_FUNCTIONS + NB_CONSTANTS + NB_SYMBOLS + 1, sizeof (char *));
+ if (list == NULL) {
+ VERBOSE (ERROR, fprintf (stderr, "can't allocate memory\n"));
+ exit (1);
+ }
+
+ for (i = 0; i < NB_OPERATORS; i++) {
+ list[l] = strdup ((operators + i)->keyword);
+ for (j = 0; j < (int)strlen (list[l]); j++) {
+ if (list[i][j] == '\t') {
+ list[i][j] = '\0';
+ }
+ }
+ if (list[l] != NULL) {
+ l++;
+ }
+ }
+
+ for (i = 0; i < NB_FUNCTIONS; i++) {
+ list[l] = strdup ((functions + i)->keyword);
+ if (list[l] != NULL) {
+ l++;
+ }
+ }
+
+ for (i = 0; i < NB_CONSTANTS; i++) {
+ list[l] = strdup ((constants + i)->keyword);
+ if (list[l] != NULL) {
+ l++;
+ }
+ }
+
+ for (i = 0; i < NB_SYMBOLS; i++) {
+ list[l] = strdup (symbols[i]);
+ if (list[l] != NULL) {
+ l++;
+ }
+ }
+
+ return (list);
+}
+
+void free_completion_list (char **list)
+{
+ int i;
+
+ if (list) {
+ for (i = 0; i < NB_FUNCTIONS + NB_CONSTANTS; i++) {
+ if (list[i] != NULL) {
+ free (list[i]);
+ }
+ }
+ free (list);
+ }
+}
+
+
/* vim: set ts=4 sw=4 et: */
/* vim: set ts=4 sw=4 et: */