diff options
| author | Mattias Engdegård <mattiase@acm.org> | 2019-07-10 19:24:58 +0200 |
|---|---|---|
| committer | Mattias Engdegård <mattiase@acm.org> | 2019-07-10 19:28:35 +0200 |
| commit | 83ed722c8d9d4d9d4143062584b89f79f3b8104a (patch) | |
| tree | f3198328e2c76888dff61833ba1ebad8440a9ce5 /test/lisp/calc/calc-tests.el | |
| parent | ff5dd4ed76c9854ad8a566cea8ddcdf5c8ffabd6 (diff) | |
| download | emacs-83ed722c8d9d4d9d4143062584b89f79f3b8104a.tar.gz emacs-83ed722c8d9d4d9d4143062584b89f79f3b8104a.tar.bz2 emacs-83ed722c8d9d4d9d4143062584b89f79f3b8104a.zip | |
Fix trig simplification crash (bug#33052)
* lisp/calc/calc-alg.el (calcFunc-sec, calcFunc-csc, calcFunc-cot):
Check that `math-known-sin' and `math-known-tan' succeeded before
using their value in arithmetic.
* test/lisp/calc/calc-tests.el (calc-test-trig): Add regression tests.
Diffstat (limited to 'test/lisp/calc/calc-tests.el')
| -rw-r--r-- | test/lisp/calc/calc-tests.el | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/test/lisp/calc/calc-tests.el b/test/lisp/calc/calc-tests.el index 96c75119c9c..92f74976b00 100644 --- a/test/lisp/calc/calc-tests.el +++ b/test/lisp/calc/calc-tests.el @@ -138,6 +138,36 @@ An existing calc stack is reused, otherwise a new one is created." (nth 1 (calcFunc-cos 1))) 0 4)))))) +(ert-deftest calc-test-trig () + "Trigonometric simplification; bug#33052." + (let ((calc-angle-mode 'rad)) + (let ((calc-symbolic-mode t)) + (should (equal (math-simplify '(calcFunc-sin (/ (var pi var-pi) 4))) + '(/ (calcFunc-sqrt 2) 2))) + (should (equal (math-simplify '(calcFunc-cos (/ (var pi var-pi) 4))) + '(/ (calcFunc-sqrt 2) 2))) + (should (equal (math-simplify '(calcFunc-sec (/ (var pi var-pi) 4))) + '(calcFunc-sqrt 2))) + (should (equal (math-simplify '(calcFunc-csc (/ (var pi var-pi) 4))) + '(calcFunc-sqrt 2))) + (should (equal (math-simplify '(calcFunc-tan (/ (var pi var-pi) 3))) + '(calcFunc-sqrt 3))) + (should (equal (math-simplify '(calcFunc-cot (/ (var pi var-pi) 3))) + '(/ (calcFunc-sqrt 3) 3)))) + (let ((calc-symbolic-mode nil)) + (should (equal (math-simplify '(calcFunc-sin (/ (var pi var-pi) 4))) + '(calcFunc-sin (/ (var pi var-pi) 4)))) + (should (equal (math-simplify '(calcFunc-cos (/ (var pi var-pi) 4))) + '(calcFunc-cos (/ (var pi var-pi) 4)))) + (should (equal (math-simplify '(calcFunc-sec (/ (var pi var-pi) 4))) + '(calcFunc-sec (/ (var pi var-pi) 4)))) + (should (equal (math-simplify '(calcFunc-csc (/ (var pi var-pi) 4))) + '(calcFunc-csc (/ (var pi var-pi) 4)))) + (should (equal (math-simplify '(calcFunc-tan (/ (var pi var-pi) 3))) + '(calcFunc-tan (/ (var pi var-pi) 3)))) + (should (equal (math-simplify '(calcFunc-cot (/ (var pi var-pi) 3))) + '(calcFunc-cot (/ (var pi var-pi) 3))))))) + (provide 'calc-tests) ;;; calc-tests.el ends here |