correct format

diff --git a/calc.c b/calc.c
index 3012267d7eb0f5a18c925f82122d787d5949dc77..66cfe4479831985a8435f0973c0406487bd952ec 100644 (file)
--- a/calc.c
+++ b/calc.c
@@ -103,8 +103,8 @@ int main (int argc, char *argv[])
     }
 
     /* format */
-    char format[8] = "=> %.f\n";
-    format[4] = '0' + precision;
+    char format[5] = "%..g";
+    format[2] = '0' + precision;
 
     /* read from input stream */
 
@@ -124,6 +124,7 @@ int main (int argc, char *argv[])
                 break;
             }
             line[0] = buffer;
+            nb = 1;
 
             /* add line into history */
             add_history (buffer);
@@ -151,7 +152,7 @@ int main (int argc, char *argv[])
         }
 
         /* look for end of line */
-        for (i = 0; (i < nb) && (ret != 1); i++) {
+        for (i = 0; i < nb; i++) {
             if (*line[i] == '\0') {
                 continue;
             }
@@ -161,7 +162,10 @@ int main (int argc, char *argv[])
                 ret = 1;
             } else {
                 VERBOSE (INFO, print_element (element, 0));
-                fprintf (stdout, format, evaluate_element (element, 0));
+                double value = evaluate_element (element, 0);
+                char number[256] = {0};
+                sprintf (number, format, value);
+                fprintf (stdout, "=> %s\n", number);
                 delelement (element);
                 ret = 0;
             }
@@ -188,37 +192,37 @@ int main (int argc, char *argv[])
 // test: echo "1 + 2" | calc.exe | grep -q '=> 3'
 // test: echo "1 - 2" | calc.exe | grep -q '=> -1'
 // test: echo "2 * 3" | calc.exe | grep -q '=> 6'
-// test: echo "1 / 2" | calc.exe | grep -q '=> 5e-1'
+// test: echo "1 / 2" | calc.exe | grep -q '=> 0\.5'
 // test: echo "8 % 3" | calc.exe | grep -q '=> 2'
-// test: echo "-9 % 3.1" | calc.exe | grep -q '=> -2.8'
+// test: echo "-9 % 3.1" | calc.exe | grep -q '=> -2\.8'
 // test: echo "2 ^ 3" | calc.exe | grep -q '=> 8'
-// test: echo "1e-1 + 2.34e3" | calc.exe | grep -q '=> 2.3401'
-// test: echo "sqrt (2)" | calc.exe | grep -q '=> 1.414213'
+// test: echo "1e-1 + 2.34e3" | calc.exe | grep -q '=> 2340\.1'
+// test: echo "sqrt (2)" | calc.exe | grep -q '=> 1\.41421'
 // test: echo "pow (2, 3)" | calc.exe | grep -q '=> 8'
-// test: echo "cos (2)" | calc.exe | grep -q '=> -4.161468e-1'
-// test: echo "sin (2)" | calc.exe | grep -q '=> 9.092974e-1'
-// test: echo "atan (2)" | calc.exe | grep -q '=> 1.107148'
-// test: echo "exp (2)" | calc.exe | grep -q '=> 7.389056'
-// test: echo "log (2)" | calc.exe | grep -q '=> 6.931471e-1'
+// test: echo "cos (2)" | calc.exe | grep -q '=> -0\.416147'
+// test: echo "sin (2)" | calc.exe | grep -q '=> 0\.909297'
+// test: echo "atan (2)" | calc.exe | grep -q '=> 1\.10715'
+// test: echo "exp (2)" | calc.exe | grep -q '=> 7\.38906'
+// test: echo "log (2)" | calc.exe | grep -q '=> 0\.693147'
 // test: echo "2 + 3 - 4" | calc.exe | grep -q '=> 1'
-// test: echo "1 + cos (2 - 3)" | calc.exe | grep -q '=> 1.54030'
-// test: echo "cos (1 / 2) * 3" | calc.exe | grep -q '=> 2.63274'
+// test: echo "1 + cos (2 - 3)" | calc.exe | grep -q '=> 1\.5403'
+// test: echo "cos (1 / 2) * 3" | calc.exe | grep -q '=> 2\.63275'
 // test: echo "1 + 4 * (2 - 3)" | calc.exe | grep -q '=> -3'
-// test: echo "(2 - 3) / 4" | calc.exe | grep -q '=> -2.5e-1'
-// test: echo "pow (8 - 3, 4 / 3)" | calc.exe | grep -q '=> 8.549879'
+// test: echo "(2 - 3) / 4" | calc.exe | grep -q '=> -0\.25'
+// test: echo "pow (8 - 3, 4 / 3)" | calc.exe | grep -q '=> 8\.54988'
 // test: echo "1 + -2" | calc.exe | grep -q '=> -1'
 // test: echo "1 - +2" | calc.exe | grep -q '=> -1'
 // test: echo "-1 + +2" | calc.exe | grep -q '=> 1'
 // test: echo "-1+2" | calc.exe | grep -q '=> 1'
 // test: echo "1-2" | calc.exe | grep -q '=> -1'
-// test: echo "1 * 2 / 3 + 4" | calc.exe | grep -q '=> 4.666666'
-// test: echo "2 ^ 3 * 4 + 5" | calc.exe | grep -q '=> 3.7e1'
-// test: echo "2 + 3 * 4 ^ 5" | calc.exe | grep -q '=> 3.074e3'
-// test: echo "2 ^ 3 * 4 + cos(5/6)" | calc.exe | grep -q '=> 3.267241e1'
-// test: echo "95-6.3*15-1" | calc.exe | grep -q '=> -5e-1'
-// test: echo "95 - 6.3 * 15 - 1" | calc.exe | grep -q '=> -5e-1'
-// test: echo "95-6.3+15" | calc.exe | grep -q '=> 1.037e2'
-// test: echo "-cos (0) + 1" | calc.exe | grep -q '=> 0'
+// test: echo "1 * 2 / 3 + 4" | calc.exe | grep -q '=> 4\.66667'
+// test: echo "2 ^ 3 * 4 + 5" | calc.exe | grep -q '=> 37'
+// test: echo "2 + 3 * 4 ^ 5" | calc.exe | grep -q '=> 3074'
+// test: echo "2 ^ 3 * 4 + cos(5/6)" | calc.exe | grep -q '=> 32\.6724'
+// test: echo "95-6.3*15-1" | calc.exe | grep -q '=> -0.5'
+// test: echo "95 - 6.3 * 15 - 1" | calc.exe | grep -q '=> -0\.5'
+// test: echo "95-6.3+15" | calc.exe | grep -q '=> 103.7'
+// test: echo "-cos (0) + 1" | calc.exe | grep -q '=> -0'
 // test: echo "quit" | calc.exe | grep -q 'bye'
 // test: echo "help" | calc.exe | grep -q 'miscellaneous'
 // test: echo "1 + 2 *" | calc.exe | grep -q 'error'
@@ -228,9 +232,9 @@ int main (int argc, char *argv[])
 // test: echo "pow (2)" | calc.exe | grep -q 'error'
 // test: echo "1.23456789" | calc.exe -p 3 | grep -q '1\.234'
 // test: echo . | calc.exe
-// test: echo -e '1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1\n1 + 1' | calc.exe -n | grep -q 6.4e1
+// test: echo -e '1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1\n1 + 1' | calc.exe -n | grep -q 64
 // test: echo -e '1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1\n1 + 1' | calc.exe -n | grep -q 2
-// test: echo -e '1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1\n1 + 1' | calc.exe | grep -q 6.4e1
+// test: echo -e '1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1\n1 + 1' | calc.exe | grep -q 64
 // test: echo -e '1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1\n1 + 1' | calc.exe | grep -q 2
 // test: echo -e '-cos (1)\n1 + 1\n1 - 1\n1 * 1\n1 / 1\n3%2\n2^2\nsqrt (2)\ncos (0)\nsin (0)\natan (0)\nlog (1)\nexp (1)\nhelp\nquit' | calc.exe -v 3 | grep -q bye
 // test: echo -e '1 +\n1 -\n1 * 1\n1 /\n3%\n2^\nsqrt ()\ncos ()\nsin ()\natan ()\nlog ()\nexp ()\n1 + (' | calc.exe |grep -c error |xargs test 11 =