- cmucl-cvs - mailman3.common-lisp.net

[Git][cmucl/cmucl][issue-290-pprint-with-float-traps] Use simpler forms for tests
by Raymond Toy (＠rtoy) 25 Mar '24

25 Mar '24

Raymond Toy pushed to branch issue-290-pprint-with-float-traps at cmucl / cmucl Commits: 83778858 by Raymond Toy at 2024-03-25T07:14:46-07:00 Use simpler forms for tests Don't use a real example for the tests; replace the body with a simple print to reduce the chance of failures due to other pprint changes. - - - - - 1 changed file: - tests/pprint.lisp Changes: ===================================== tests/pprint.lisp ===================================== @@ -10,21 +10,10 @@ (assert-equal " (WITH-FLOAT-TRAPS-MASKED (:UNDERFLOW) - (LET* ((RATIO - (/ (* (EXPT 10 PPRINT-TESTS::EXPONENT) NUMBER) - PPRINT-TESTS::DIVISOR)) - (PPRINT-TESTS::RESULT (COERCE RATIO PPRINT-TESTS::FLOAT-FORMAT))) - (WHEN (AND (ZEROP PPRINT-TESTS::RESULT) (NOT (ZEROP NUMBER))) - (ERROR \"Underflow\")) - PPRINT-TESTS::RESULT))" + (PRINT \"Hello\"))" (with-output-to-string (s) (pprint '(ext:with-float-traps-masked (:underflow) - (let* ((ratio (/ (* (expt 10 exponent) number) - divisor)) - (result (coerce ratio float-format))) - (when (and (zerop result) (not (zerop number))) - (error "Underflow")) - result)) + (print "Hello")) s)))) (define-test pprint.with-float-traps-enabled @@ -32,22 +21,8 @@ (assert-equal " (WITH-FLOAT-TRAPS-ENABLED (:UNDERFLOW) - (LET* ((RATIO - (/ (* (EXPT 10 PPRINT-TESTS::EXPONENT) NUMBER) - PPRINT-TESTS::DIVISOR)) - (PPRINT-TESTS::RESULT (COERCE RATIO PPRINT-TESTS::FLOAT-FORMAT))) - (WHEN (AND (ZEROP PPRINT-TESTS::RESULT) (NOT (ZEROP NUMBER))) - (ERROR \"Underflow\")) - PPRINT-TESTS::RESULT))" + (PRINT \"Hello\"))" (with-output-to-string (s) (pprint '(ext:with-float-traps-enabled (:underflow) - (let* ((ratio (/ (* (expt 10 exponent) number) - divisor)) - (result (coerce ratio float-format))) - (when (and (zerop result) (not (zerop number))) - (error "Underflow")) - result)) + (print "Hello")) s)))) - - - View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/8377885822cc4d08f760b54… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/8377885822cc4d08f760b54… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl] Pushed new branch issue-291-pprint-handler-case
by Raymond Toy (＠rtoy) 25 Mar '24

25 Mar '24

Raymond Toy pushed new branch issue-291-pprint-handler-case at cmucl / cmucl -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/tree/issue-291-pprint-handler-… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][master] 2 commits: Fix #287: Clean up make-float-aux
by Raymond Toy (＠rtoy) 24 Mar '24

24 Mar '24

Raymond Toy pushed to branch master at cmucl / cmucl Commits: 059069f8 by Raymond Toy at 2024-03-24T23:16:11+00:00 Fix #287: Clean up make-float-aux - - - - - ad88cf63 by Raymond Toy at 2024-03-24T23:16:13+00:00 Merge branch 'issue-287-clean-up-make-float-aux' into 'master' Fix #287: Clean up make-float-aux Closes #287 See merge request cmucl/cmucl!196 - - - - - 2 changed files: - src/code/reader.lisp - src/i18n/locale/cmucl.pot Changes: ===================================== src/code/reader.lisp ===================================== @@ -1867,7 +1867,7 @@ the end of the stream." (%reader-error stream _"Number not representable as a ~S: ~S" float-format (read-buffer-to-string))))))) - ;; Otherwise the number might fit, so we carefully compute the result + ;; Otherwise the number might fit, so we carefully compute the result. (handler-case (with-float-traps-masked (:underflow) (let* ((ratio (/ (* (expt 10 exponent) number) @@ -1875,24 +1875,10 @@ the end of the stream." (result (coerce ratio float-format))) (when (and (zerop result) (not (zerop number))) ;; The number we've read is so small that it gets - ;; converted to 0.0, but is not actually zero. In this - ;; case, we want to round such small numbers to - ;; least-positive-foo-float. If it's still too small, we - ;; want to signal an error saying that we can't really - ;; convert it because the exponent is too small. - ;; See CLHS 2.3.1.1. - (let ((float-limit (ecase float-format - ((short-float single-float) - least-positive-single-float) - (double-float - least-positive-double-float) - #+double-double - (double-double-float - ext:least-positive-double-double-float)))) - (if (>= (* 2 ratio) float-limit) - (setf result float-limit) - (error _"Underflow")))) - result)) + ;; converted to 0.0, but is not actually zero. Signal an + ;; error. See CLHS 2.3.1.1. + (error _"Underflow")) + result)) (error () (%reader-error stream _"Number not representable as a ~S: ~S" float-format (read-buffer-to-string))))) ===================================== src/i18n/locale/cmucl.pot ===================================== @@ -8731,10 +8731,6 @@ msgstr "" msgid "Number not representable as a ~S: ~S" msgstr "" -#: src/code/reader.lisp -msgid "Underflow" -msgstr "" - #: src/code/reader.lisp msgid "Invalid ratio: ~S/~S" msgstr "" View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/d82f9b92e9be439d4e4397… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/d82f9b92e9be439d4e4397… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl] Pushed new branch issue-290-pprint-with-float-traps
by Raymond Toy (＠rtoy) 24 Mar '24

24 Mar '24

Raymond Toy pushed new branch issue-290-pprint-with-float-traps at cmucl / cmucl -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/tree/issue-290-pprint-with-flo… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-287-clean-up-make-float-aux] Address nits from review
by Raymond Toy (＠rtoy) 24 Mar '24

24 Mar '24

Raymond Toy pushed to branch issue-287-clean-up-make-float-aux at cmucl / cmucl Commits: b28a0a06 by Raymond Toy at 2024-03-24T15:25:04-07:00 Address nits from review Mostly undoing the whitespace changes due to tabs vs spaces. - - - - - 1 changed file: - src/code/reader.lisp Changes: ===================================== src/code/reader.lisp ===================================== @@ -1870,18 +1870,18 @@ the end of the stream." ;; Otherwise the number might fit, so we carefully compute the result. (handler-case (with-float-traps-masked (:underflow) - (let* ((ratio (/ (* (expt 10 exponent) number) + (let* ((ratio (/ (* (expt 10 exponent) number) divisor)) (result (coerce ratio float-format))) - (when (and (zerop result) (not (zerop number))) + (when (and (zerop result) (not (zerop number))) ;; The number we've read is so small that it gets ;; converted to 0.0, but is not actually zero. Signal an ;; error. See CLHS 2.3.1.1. - (error "Underflow")) + (error _"Underflow")) result)) (error () - (%reader-error stream _"Number not representable as a ~S: ~S" - float-format (read-buffer-to-string))))) + (%reader-error stream _"Number not representable as a ~S: ~S" + float-format (read-buffer-to-string))))) (defun make-ratio (stream) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/b28a0a0600c79123f212e1f… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/b28a0a0600c79123f212e1f… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-287-clean-up-make-float-aux] Apply 1 suggestion(s) to 1 file(s)
by Raymond Toy (＠rtoy) 24 Mar '24

24 Mar '24

Raymond Toy pushed to branch issue-287-clean-up-make-float-aux at cmucl / cmucl Commits: 4a61aa5f by Carl Shapiro at 2024-03-24T21:57:28+00:00 Apply 1 suggestion(s) to 1 file(s) - - - - - 1 changed file: - src/code/reader.lisp Changes: ===================================== src/code/reader.lisp ===================================== @@ -1868,7 +1868,7 @@ the end of the stream." float-format (read-buffer-to-string))))))) ;; Otherwise the number might fit, so we carefully compute the result. - (handler-case + (handler-case (with-float-traps-masked (:underflow) (let* ((ratio (/ (* (expt 10 exponent) number) divisor)) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/4a61aa5f06e409c041754f3… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/4a61aa5f06e409c041754f3… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl] Pushed new branch issue-288-re-enable-deftransform-random-int
by Raymond Toy (＠rtoy) 24 Mar '24

24 Mar '24

Raymond Toy pushed new branch issue-288-re-enable-deftransform-random-int at cmucl / cmucl -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/tree/issue-288-re-enable-deftr… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-275b-signal-float-underflow] Add tests for float underflows in the reader
by Raymond Toy (＠rtoy) 23 Mar '24

23 Mar '24

Raymond Toy pushed to branch issue-275b-signal-float-underflow at cmucl / cmucl Commits: 45532060 by Raymond Toy at 2024-03-23T14:56:58-07:00 Add tests for float underflows in the reader - - - - - 1 changed file: - tests/float.lisp Changes: ===================================== tests/float.lisp ===================================== @@ -212,3 +212,17 @@ ;; most-positive-double-float. And a really big single-float. (assert-error 'reader-error (read-from-string "1.8d308")) (assert-error 'reader-error (read-from-string "1d999999999"))) + +(define-test reader.float-underflow + (:tag :issues) + (lisp::with-float-traps-enabled (:underflow) + ;; A denormal + (assert-error 'floating-point-underflow + (read-from-string "1e-40")) + (assert-error 'floating-point-underflow + (read-from-string (format nil "~A" least-positive-single-float))) + ;; The same for double-floats + (assert-error 'floating-point-underflow + (read-from-string "1d-308")) + (assert-error 'floating-point-underflow + (read-from-string (format nil "~A" least-positive-double-float))))) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/45532060060f711842edbfb… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/45532060060f711842edbfb… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl] Pushed new branch issue-275b-signal-float-underflow
by Raymond Toy (＠rtoy) 23 Mar '24

23 Mar '24

Raymond Toy pushed new branch issue-275b-signal-float-underflow at cmucl / cmucl -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/tree/issue-275b-signal-float-u… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-287-clean-up-make-float-aux] Oops. Need handler-case to catch errors from large numbers.
by Raymond Toy (＠rtoy) 23 Mar '24

23 Mar '24

Raymond Toy pushed to branch issue-287-clean-up-make-float-aux at cmucl / cmucl Commits: 9d01b5ca by Raymond Toy at 2024-03-23T12:38:44-07:00 Oops. Need handler-case to catch errors from large numbers. For large numbers that weren't caught the with the rough check, the conversion of the large ratio to a float signals a `simple-type-error` from `coerce`. We need to catch that and signal a `reader-error`. - - - - - 2 changed files: - src/code/reader.lisp - src/i18n/locale/cmucl.pot Changes: ===================================== src/code/reader.lisp ===================================== @@ -1868,17 +1868,20 @@ the end of the stream." float-format (read-buffer-to-string))))))) ;; Otherwise the number might fit, so we carefully compute the result. - (with-float-traps-masked (:underflow) - (let* ((ratio (/ (* (expt 10 exponent) number) - divisor)) - (result (coerce ratio float-format))) - (when (and (zerop result) (not (zerop number))) - ;; The number we've read is so small that it gets - ;; converted to 0.0, but is not actually zero. Signal an - ;; error. See CLHS 2.3.1.1. - (%reader-error stream _"Number not representable as a ~S: ~S" - float-format (read-buffer-to-string))) - result))) + (handler-case + (with-float-traps-masked (:underflow) + (let* ((ratio (/ (* (expt 10 exponent) number) + divisor)) + (result (coerce ratio float-format))) + (when (and (zerop result) (not (zerop number))) + ;; The number we've read is so small that it gets + ;; converted to 0.0, but is not actually zero. Signal an + ;; error. See CLHS 2.3.1.1. + (error "Underflow")) + result)) + (error () + (%reader-error stream _"Number not representable as a ~S: ~S" + float-format (read-buffer-to-string))))) (defun make-ratio (stream) ===================================== src/i18n/locale/cmucl.pot ===================================== @@ -8731,10 +8731,6 @@ msgstr "" msgid "Number not representable as a ~S: ~S" msgstr "" -#: src/code/reader.lisp -msgid "Underflow" -msgstr "" - #: src/code/reader.lisp msgid "Invalid ratio: ~S/~S" msgstr "" View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/9d01b5ca1b1e93e964f388c… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/9d01b5ca1b1e93e964f388c… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0