// 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 "ln (2)" | calc.exe | grep -q '=> 0\.693147'
+// test: echo "log (10)" | calc.exe | grep -q '=> 1'
// test: echo "2 + 3 - 4" | calc.exe | grep -q '=> 1'
// 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 -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 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)\ntan (0)\nacos (0)\nasin (0)\natan (0)\nlog (1)\nexp (1)\nabs (-1)\nceil (1.2)\nfloor (-1.2)\nans\ne\npi\nsto (1)\nrcl (2)\ndisp\nhelp\nquit' | calc.exe -n -v 3 | grep -q bye
-// test: echo -e '1 +\n1 -\n1 * 1\n1 /\n3%\n2^\nsqrt ()\ncos ()\nsin ()\ntan ()\nacos ()\nasin ()\natan ()\nlog ()\nexp ()\nabs ()\nceil ()\nfloor ()\n1 + (\n1+2(\n1+2cos\n1+2pi' | calc.exe | grep -c error | xargs test 21 =
+// test: echo -e '-cos (1)\n1 + 1\n1 - 1\n1 * 1\n1 / 1\n3%2\n2^2\nsqrt (2)\ncos (0)\nsin (0)\ntan (0)\nacos (0)\nasin (0)\natan (0)\nln (1)\nlog (1)\nexp (1)\nabs (-1)\nceil (1.2)\nfloor (-1.2)\nans\ne\npi\nsto (1)\nrcl (2)\ndisp\nhelp\nquit' | calc.exe -n -v 3 | grep -q bye
+// test: echo -e '1 +\n1 -\n1 * 1\n1 /\n3%\n2^\nsqrt ()\ncos ()\nsin ()\ntan ()\nacos ()\nasin ()\natan ()\nln ()\nlog ()\nexp ()\nabs ()\nceil ()\nfloor ()\n1 + (\n1+2(\n1+2cos\n1+2pi' | calc.exe | grep -c error | xargs test 22 =
// test: echo -e '1 + 1\nans' | calc.exe -p 3 | grep -c 2 | xargs test 2 =
// test: echo -e 'sin (pi / 2)' | calc.exe -p 4 | grep -q 1
// test: echo -e 'e ^ 2' | calc.exe | grep -q '7\.38906'
// test: echo -e 'cos (quit)' | calc.exe | grep -q error
// test: echo -e '(quit)' | calc.exe | grep -q error
// test: echo -e 'cos 3.14\n!\n! 3 4' | calc.exe | grep -c error | xargs test 3 =
-// test: echo -e 'sto (2, 3)\ncond (rcl (2) > 2, log (64), exp (75 / 10))' | calc.exe | grep -q '=> 4\.15888'
-// test: echo -e 'sto (2, 1)\ncond (rcl (2) > 2, log (64), exp (75 / 10))' | calc.exe | grep -q '=> 1808\.04'
-// test: echo -e 'sto (2, 1)\ncond (rcl (2) > 2, log (64))' | calc.exe | grep -q '=> 0'
+// test: echo -e 'sto (2, 3)\ncond (rcl (2) > 2, ln (64), exp (75 / 10))' | calc.exe | grep -q '=> 4\.15888'
+// test: echo -e 'sto (2, 1)\ncond (rcl (2) > 2, ln (64), exp (75 / 10))' | calc.exe | grep -q '=> 1808\.04'
+// test: echo -e 'sto (2, 1)\ncond (rcl (2) > 2, ln (64))' | calc.exe | grep -q '=> 0'
// test: echo -e 'cond (0, 1, 2)\nquit' | calc.exe -v 3 | grep -q Cond
// test: echo -e 'cond\ncond (\ncond (1 >0,'| calc.exe | grep -c error | xargs test 3 =
// test: echo -e 'sto (1, 4)\ninc (1)\ninc (1)\ndec (1)\ninc (1)\nrcl (1) == 6\nquit' | calc.exe -v 3 | grep -q '=> 1'
{ "|", 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},
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;
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);