From a87840fffbf471d53eba17ea683728125d2d4767 Mon Sep 17 00:00:00 2001 From: Mattias Engdegård Date: Tue, 16 Jul 2019 17:18:32 +0200 Subject: Fix calc number formatting with digit grouping (bug#36689) The functions math-format-hex and math-format-octal were not implemented, yet called, leading to a crash when using hex or octal radix with digit grouping. * test/lisp/calc/calc-tests.el (calc-test-format-radix): New test. * lisp/calc/calc-ext.el: Don't declare non-existing functions. (math--format-integer-fancy): Don't call non-existing functions. * lisp/calc/calc-bin.el (math-format-binary, math-binary-digits): Simplify, fixing 0-padding bug. --- test/lisp/calc/calc-tests.el | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'test/lisp/calc') diff --git a/test/lisp/calc/calc-tests.el b/test/lisp/calc/calc-tests.el index 92f74976b00..77d939eb406 100644 --- a/test/lisp/calc/calc-tests.el +++ b/test/lisp/calc/calc-tests.el @@ -168,6 +168,32 @@ An existing calc stack is reused, otherwise a new one is created." (should (equal (math-simplify '(calcFunc-cot (/ (var pi var-pi) 3))) '(calcFunc-cot (/ (var pi var-pi) 3))))))) +(ert-deftest calc-test-format-radix () + "Test integer formatting (bug#36689)." + (let ((calc-group-digits nil)) + (let ((calc-number-radix 10)) + (should (equal (math-format-number 12345678901) "12345678901"))) + (let ((calc-number-radix 2)) + (should (equal (math-format-number 12345) "2#11000000111001"))) + (let ((calc-number-radix 8)) + (should (equal (math-format-number 12345678901) "8#133767016065"))) + (let ((calc-number-radix 16)) + (should (equal (math-format-number 12345678901) "16#2DFDC1C35"))) + (let ((calc-number-radix 36)) + (should (equal (math-format-number 12345678901) "36#5O6AQT1")))) + (let ((calc-group-digits t)) + (let ((calc-number-radix 10)) + (should (equal (math-format-number 12345678901) "12,345,678,901"))) + (let ((calc-number-radix 2)) + (should (equal (math-format-number 12345) "2#11,0000,0011,1001"))) + (let ((calc-number-radix 8)) + (should (equal (math-format-number 12345678901) "8#133,767,016,065"))) + (let ((calc-number-radix 16)) + (should (equal (math-format-number 12345678901) "16#2,DFDC,1C35"))) + (let ((calc-number-radix 36)) + (should (equal (math-format-number 12345678901) "36#5,O6A,QT1"))))) + + (provide 'calc-tests) ;;; calc-tests.el ends here -- cgit v1.2.3