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
extend a test
[calc.git]
/
parser.c
diff --git
a/parser.c
b/parser.c
index dcaa55b0d09e8d9b8adc32498a06eb4d7e8a7790..38b7c2692fad24c3a4c9422caa92d3214ad70c3c 100644
(file)
--- a/
parser.c
+++ b/
parser.c
@@
-19,6
+19,7
@@
double *storage = NULL;
#define DEFAULT_FORMAT "=> %.6g\n"
char *format = NULL;
#define DEFAULT_FORMAT "=> %.6g\n"
char *format = NULL;
+char *minform = NULL;
/* compare codes */
/* compare codes */
@@
-121,7
+122,7
@@
keyword_t operators[NB_OPERATORS] = {
{ "|", Or, 2, 1, -2}
};
{ "|", Or, 2, 1, -2}
};
-#define NB_FUNCTIONS 2
5
+#define NB_FUNCTIONS 2
6
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
+143,7
@@
keyword_t functions[NB_FUNCTIONS] = {
{ "dec", Dec, 1, 3, 5},
{ "disp", Disp, 0, 4, 9},
{ "mem", Mem, 1, 3, 9},
{ "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},
{ "quit", Quit, 0, 4, 9},
{ "help", Help, 0, 4, 9},
{ "!", Not, 1, 1, 6},
@@
-506,6
+508,7
@@
void print_element (element_t *root, int level)
case Dec: func = "Decrease"; break;
case Disp: func = "Display"; break;
case Mem: func = "Memory"; 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;
@@
-572,7
+575,7
@@
double store (int index, double value)
if ((index > 0) && (index <= storage_size)) {
storage[index - 1] = value;
} else {
if ((index > 0) && (index <= storage_size)) {
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;
}
}
return value;
}
@@
-585,7
+588,7
@@
double recall (int index)
if ((index > 0) && (index <= storage_size)) {
return storage[index - 1];
} else {
if ((index > 0) && (index <= storage_size)) {
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;
}
@@
-598,7
+601,7
@@
double increase (int index)
if ((index > 0) && (index <= storage_size)) {
return storage[index - 1]++;
} else {
if ((index > 0) && (index <= storage_size)) {
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;
}
@@
-611,7
+614,7
@@
double decrease (int index)
if ((index > 0) && (index <= storage_size)) {
return storage[index - 1]--;
} else {
if ((index > 0) && (index <= storage_size)) {
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;
}
@@
-624,11
+627,20
@@
void display (void)
}
fprintf (stdout, "storage:");
for (i = 0; i < storage_size; i++) {
}
fprintf (stdout, "storage:");
for (i = 0; i < storage_size; i++) {
- fprintf (stdout, " %g", storage[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)
@@
-673,9
+685,11
@@
double program_do (element_t **prog, int nbcalls)
void set_format (char *prompt, int precision)
{
char buffer[128] = {0};
void set_format (char *prompt, int precision)
{
char buffer[128] = {0};
- sprintf (buffer, "%s%%.%dg\n", prompt, precision);
free_format ();
free_format ();
+ sprintf (buffer, "%s%%.%dg\n", prompt, precision);
format = strdup (buffer);
format = strdup (buffer);
+ sprintf (buffer, "%%.%dg", precision);
+ minform = strdup (buffer);
}
void free_format ()
}
void free_format ()
@@
-684,6
+698,10
@@
void free_format ()
free (format);
format = NULL;
}
free (format);
format = NULL;
}
+ if (minform) {
+ free (minform);
+ minform = NULL;
+ }
}
double print (double value)
}
double print (double value)
@@
-816,6
+834,7
@@
double evaluate_element (element_t *root, char mask)
}
break;
case Disp:
}
break;
case Disp:
+ case Clear:
case Quit:
case Help:
case Ans:
case Quit:
case Help:
case Ans:
@@
-861,6
+880,7
@@
double evaluate_element (element_t *root, char mask)
case Dec: return decrease ((int)op0);
case Disp: display (); break;
case Mem: memory ((int)op0); break;
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;