X-Git-Url: https://secure.softndesign.org/git/?a=blobdiff_plain;f=parser.c;h=24afb116c98f19a4a2d0e2724a4d52b6982984fb;hb=807bdeba16ea9ed816ecf7d3900f601c37ffa204;hp=119733f9afb4e613347558d9db50cc0f367a9f06;hpb=743e93f0edf2c7779d0af4e16e17662994e0caaf;p=calc.git diff --git a/parser.c b/parser.c index 119733f..24afb11 100644 --- a/parser.c +++ b/parser.c @@ -18,6 +18,8 @@ double answer = 0; +double anglefactor = 1; + /* compare codes */ int codecmp (char *ref, char *str) @@ -62,7 +64,7 @@ keyword_t operators[NB_OPERATORS] = { { "|", Or, 2, 1, -2} }; -#define NB_FUNCTIONS 52 +#define NB_FUNCTIONS 55 keyword_t functions[NB_FUNCTIONS] = { { "sqrt", Sqr, 1, 4, 5}, { "pow", Pow, 2, 3, 5}, @@ -115,7 +117,10 @@ keyword_t functions[NB_FUNCTIONS] = { { "sum", Sum, 0, 3, 5}, { "var", Variance, 2, 3, 5}, { "format", Precision, 1, 6, 9}, - { "base", Base, 2, 4, 9} + { "base", Base, 2, 4, 9}, + { "deg", Deg, 0, 3, 9}, + { "grad", Grad, 0, 4, 9}, + { "rad", Rad, 0, 3, 9} }; #define NB_CONSTANTS 3 @@ -448,7 +453,7 @@ void print_element (element_t *root, int level) } for (i = 0; i < level; i++) { - fprintf (stdout, " "); + printf (" "); } switch (root->func) { @@ -523,15 +528,18 @@ void print_element (element_t *root, int level) case Variance: func = "Variance"; break; case Precision: func = "Precision"; break; case Base: func = "Base"; break; + case Deg: func = "Degree"; break; + case Grad: func = "Gradian"; break; + case Rad: func = "Radian"; break; } - fprintf (stdout, "Function: %s\n", func); + printf ("Function: %s\n", func); if ((root->func == Val) && (root->ops[0] == NULL)) { for (i = 0; i < level; i++) { - fprintf (stdout, " "); + printf (" "); } - fprintf (stdout, "value: %f\n", root->value); + printf ("value: %f\n", root->value); } else { for (i = 0; i < root->nbops; i++) { print_element (root->ops[i], level + 1); @@ -584,7 +592,7 @@ double execute_code (element_t **prog, int nbcalls) void quit (void) { - fprintf (stdout, "bye\n"); + printf ("bye\n"); exit (0); } @@ -592,35 +600,35 @@ void quit (void) void help (void) { - fprintf (stdout, "calc is a simple calculator\n\n"); - fprintf (stdout, "arithmetic op.:"); - fprintf (stdout, " + - * / %% ^\n"); - fprintf (stdout, "comparison op.:"); - fprintf (stdout, " == != >= <= > <\n"); - fprintf (stdout, "logical op.:"); - fprintf (stdout, " & | !\n"); - fprintf (stdout, "mathematic func.:"); - fprintf (stdout, " exp ln log pow sqrt\n"); - fprintf (stdout, "trigonometric func.:"); - fprintf (stdout, " acos asin atan cos sin tan\n"); - fprintf (stdout, "error functions:"); - fprintf (stdout, " erf erfc\n"); - fprintf (stdout, "miscellaneous func.:"); - fprintf (stdout, " abs ceil floor\n"); - fprintf (stdout, "storage func.:"); - fprintf (stdout, " clear dec disp inc mem rcl sto\n"); - fprintf (stdout, "control flow prim.:"); - fprintf (stdout, " cond print while {} ;\n"); - fprintf (stdout, "program management:"); - fprintf (stdout, " arg call del edit ls prog\n"); - fprintf (stdout, "stack management:"); - fprintf (stdout, " get len pop push put set show\n"); - fprintf (stdout, "stack func.:"); - fprintf (stdout, " max mean med min ord prod sum var\n"); - fprintf (stdout, "control management:"); - fprintf (stdout, " base format help quit\n"); - fprintf (stdout, "constants:"); - fprintf (stdout, " ans e pi\n"); + printf ("calc is a simple calculator\n\n"); + printf ("arithmetic op.:"); + printf (" + - * / %% ^\n"); + printf ("comparison op.:"); + printf (" == != >= <= > <\n"); + printf ("logical op.:"); + printf (" & | !\n"); + printf ("mathematic func.:"); + printf (" exp ln log pow sqrt\n"); + printf ("trigonometric func.:"); + printf (" acos asin atan cos sin tan\n"); + printf ("error functions:"); + printf (" erf erfc\n"); + printf ("miscellaneous func.:"); + printf (" abs ceil floor\n"); + printf ("storage func.:"); + printf (" clear dec disp inc mem rcl sto\n"); + printf ("control flow prim.:"); + printf (" cond print while {} ;\n"); + printf ("program management:"); + printf (" arg call del edit ls prog\n"); + printf ("stack management:"); + printf (" get len pop push put set show\n"); + printf ("stack func.:"); + printf (" max mean med min ord prod sum var\n"); + printf ("control management:"); + printf (" base deg format grad help quit rad\n"); + printf ("constants:"); + printf (" ans e pi\n"); } /* format function */ @@ -641,9 +649,9 @@ int format (int precision) void base (int in, int out) { - if (in > 0) { + if ((in > 0) && (in < 37)) { set_base (in, in); - if (out > 0) { + if ((out > 0) && (out < 37)) { set_base (in, out); } else if (out != - 1) { VERBOSE (WARNING, fprintf (stdout, "error incorrect output base (%d)\n", out)); @@ -767,6 +775,9 @@ double evaluate_element (element_t *root, char mask) case Order: case Prod: case Sum: + case Deg: + case Grad: + case Rad: break; case While: if (root->ops[0] == NULL) { @@ -827,12 +838,12 @@ double evaluate_element (element_t *root, char mask) case Mod: return fmod (op0, op1); case Pow: return pow (op0, op1); 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 Cos: return cos (op0 / anglefactor); + case Sin: return sin (op0 / anglefactor); + case Tan: return tan (op0 / anglefactor); + case Acos: return acos (op0) * anglefactor; + case Asin: return asin (op0) * anglefactor; + case Atan: return atan (op0) * anglefactor; case Ln: return log (op0); case Log: return log10 (op0); case Exp: return exp (op0); @@ -931,7 +942,16 @@ double evaluate_element (element_t *root, char mask) case Precision: return format ((int)op0); case Base: - base (op0, op1); + base ((int)op0, (int)op1); + break; + case Deg: + anglefactor = 180 / M_PI; + break; + case Grad: + anglefactor = 200 / M_PI; + break; + case Rad: + anglefactor = 1; break; }