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

[Git][cmucl/cmucl][issue-460-ci-fails-if-unit-tests-do] Don't run float-x86 tests on Darwin
by Raymond Toy (＠rtoy) 19 Dec '25

19 Dec '25

Raymond Toy pushed to branch issue-460-ci-fails-if-unit-tests-do at cmucl / cmucl Commits: a8aa9974 by Raymond Toy at 2025-12-18T19:16:55-08:00 Don't run float-x86 tests on Darwin As hinted by in float-trap.lisp, we don't use x87 FP mode stuff on Darwin. (`floating-point-modes` for Darwin doesn't play with x87 bits.) Hence the test in float-trap.lisp doesn't apply to Darwin so don't run it. Add a comment here too. - - - - - 1 changed file: - tests/float-x86.lisp Changes: ===================================== tests/float-x86.lisp ===================================== @@ -5,6 +5,11 @@ (in-package "FLOAT-X86-TESTS") +;; This tests the floating-point modes for x86. This works only if we +;; have the feature :sse2 but not :darwin since darwin has always used +;; sse2 and not x87. But see also how FLOATING-POINT-MODES is +;; implemented in src/code/float-trap.lisp. +#+(and sse2 (not darwin)) (define-test set-floating-point-modes (let ((old-x87-modes (x86::x87-floating-point-modes)) (old-sse2-modes (x86::sse2-floating-point-modes)) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/a8aa9974fa91b6a51cce7fd… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/a8aa9974fa91b6a51cce7fd… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-460-ci-fails-if-unit-tests-do] Cleanups for Darwin timestamp test
by Raymond Toy (＠rtoy) 19 Dec '25

19 Dec '25

Raymond Toy pushed to branch issue-460-ci-fails-if-unit-tests-do at cmucl / cmucl Commits: ef57f813 by Raymond Toy at 2025-12-18T16:29:42-08:00 Cleanups for Darwin timestamp test In run-unit-tests.sh, only run `touch` if we know (or assume) it will work. This doesn't work on MacOS 10.13. This gets rid of annoying error message on osx. In tests/os.lisp, we forgot to enable the 2106 timestamp test just for Linux. It was erroneously being run on osx. - - - - - 2 changed files: - bin/run-unit-tests.sh - tests/os.lisp Changes: ===================================== bin/run-unit-tests.sh ===================================== @@ -47,12 +47,19 @@ mkdir test-tmp ln -s /bin/ls test-tmp/ls-link # Set the timestamps on 64-bit-timestamp-2038.txt and -# 64-bit-timestamp-2106.txt. The time for the first file is a -# negative value for a 32-bit time_t. The second file won't fit in a -# 32-bit time_t value. It's ok if this doesn't work in general, as -# long as it works on Linux for the stat test in tests/os.lisp. -touch -d "1 April 2038" tests/resources/64-bit-timestamp-2038.txt -touch -d "1 April 2106" tests/resources/64-bit-timestamp-2106.txt +# 64-bit-timestamp-2106.txt, but only for OSes where we know this +# works. (This is so we don't an annoying error message from touch +# that doesn't accept the -d option, like MacOS 10.13.) The time for +# the first file is a negative value for a 32-bit time_t. The second +# file won't fit in a 32-bit time_t value. It's ok if this doesn't +# work in general, as long as it works on Linux for the stat test in +# tests/os.lisp. +case `uname -s` in + Linux) + touch -d "1 April 2038" tests/resources/64-bit-timestamp-2038.txt + touch -d "1 April 2106" tests/resources/64-bit-timestamp-2106.txt + ;; +esac # Cleanup temp files and directories that we created during testing. function cleanup { ===================================== tests/os.lisp ===================================== @@ -51,6 +51,7 @@ (assert-equal 2153718000 st-atime) (assert-equal 2153718000 st-mtime)))) +#+linux (define-test stat.64-bit-timestamp-2106 (:tag :issues) (let ((test-file #.(merge-pathnames "resources/64-bit-timestamp-2106.txt" View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/ef57f81386e5d2ae451b0df… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/ef57f81386e5d2ae451b0df… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-460-ci-fails-if-unit-tests-do] Fix #460: Exit with error if main unit-tests fail
by Raymond Toy (＠rtoy) 18 Dec '25

18 Dec '25

Raymond Toy pushed to branch issue-460-ci-fails-if-unit-tests-do at cmucl / cmucl Commits: d64287c5 by Raymond Toy at 2025-12-18T14:50:31-08:00 Fix #460: Exit with error if main unit-tests fail If the main unit-tests (using lispunit) fail, exit run-unit-tests.sh with a non-zero exit code. Previously, we were continuing on with the package-local-nicknames test which succeeds so it looks like everything passes on CI. - - - - - 1 changed file: - bin/run-unit-tests.sh Changes: ===================================== bin/run-unit-tests.sh ===================================== @@ -9,6 +9,8 @@ usage() { echo "run-tests.sh [-?h] [-d test-dir] [-l lisp] [tests]" echo " -d test-dir Directory containing the unit test files" echo " -l lisp Lisp to use for the tests; defaults to lisp" + echo " -u Skip lisp-unit tests" + echo " -p Skip package-local-nicknames test" echo " -? This help message" echo " -h This help message" echo "" @@ -25,11 +27,13 @@ usage() { } LISP=lisp -while getopts "h?l:d:" arg +while getopts "uph?l:d:" arg do case $arg in l) LISP=$OPTARG ;; d) TESTDIR=$OPTARG ;; + u) SKIP_UNIT=yes ;; + p) SKIP_PLN=yes ;; h|\?) usage ;; esac done @@ -69,39 +73,49 @@ fi # gcc since clang isn't always available. (cd "$TESTDIR" || exit 1 ; gcc -m32 -O3 -c test-return.c) -if [ $# -eq 0 ]; then - # Test directory arg for run-all-tests if a non-default - # No args so run all the tests - $LISP -nositeinit -noinit -load "$TESTDIR"/run-tests.lisp -eval "(cmucl-test-runner:run-all-tests ${TESTDIRARG})" -else - # Run selected files. Convert each file name to uppercase and append "-TESTS" - result="" - for f in "$@" - do - new=$(echo "$f" | tr '[:lower:]' '[:upper:]') - result="$result "\"$new-TESTS\" - done - $LISP -nositeinit -noinit -load "$TESTDIR"/run-tests.lisp -eval "(progn (cmucl-test-runner:load-test-files) (cmucl-test-runner:run-test $result))" +if [ "$SKIP_UNIT" != "yes" ]; then + if [ $# -eq 0 ]; then + # Test directory arg for run-all-tests if a non-default + # No args so run all the tests + $LISP -nositeinit -noinit -load "$TESTDIR"/run-tests.lisp -eval "(cmucl-test-runner:run-all-tests ${TESTDIRARG})" || + exit 1 + else + # Run selected files. Convert each file name to uppercase and append "-TESTS" + result="" + for f in "$@" + do + new=$(echo "$f" | tr '[:lower:]' '[:upper:]') + result="$result "\"$new-TESTS\" + done + # Run unit tests. Exits with a non-zero code if there's a failure. + + $LISP -nositeinit -noinit -load "$TESTDIR"/run-tests.lisp -eval "(progn (cmucl-test-runner:load-test-files) (cmucl-test-runner:run-test $result))" || + exit 1 + fi fi ## Now run tests for trivial-package-local-nicknames -REPO=trivial-package-local-nicknames -BRANCH=cmucl-updates +echo SKIP_PLN = $SKIP_PLN -set -x -if [ -d ../$REPO ]; then - (cd ../$REPO || exit 1; git stash; git checkout $BRANCH; git pull --rebase) -else - (cd ..; git clone https://gitlab.common-lisp.net/cmucl/$REPO.git) -fi +if [ "$SKIP_PLN" != "yes" ]; then + REPO=trivial-package-local-nicknames + BRANCH=cmucl-updates + + set -x + if [ -d ../$REPO ]; then + (cd ../$REPO || exit 1; git stash; git checkout $BRANCH; git pull --rebase) + else + (cd ..; git clone https://gitlab.common-lisp.net/cmucl/$REPO.git) + fi -LISP=$PWD/$LISP -cd ../$REPO || exit 1 -git checkout $BRANCH + LISP=$PWD/$LISP + cd ../$REPO || exit 1 + git checkout $BRANCH -# Run the tests. Exits with a non-zero code if there's a failure. -$LISP -noinit -nositeinit -batch <<'EOF' + # Run the tests. Exits with a non-zero code if there's a failure. + $LISP -noinit -nositeinit -batch <<'EOF' (require :asdf) (push (default-directory) asdf:*central-registry*) (asdf:test-system :trivial-package-local-nicknames) EOF +fi View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/d64287c57788a3070d579a1… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/d64287c57788a3070d579a1… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl] Pushed new branch issue-460-ci-fails-if-unit-tests-do
by Raymond Toy (＠rtoy) 18 Dec '25

18 Dec '25

Raymond Toy pushed new branch issue-460-ci-fails-if-unit-tests-do at cmucl / cmucl -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/tree/issue-460-ci-fails-if-uni… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-425-correctly-rounded-math-functions] Add -std=gnu11 to CFLAGS for x86_linux config
by Raymond Toy (＠rtoy) 18 Dec '25

18 Dec '25

Raymond Toy pushed to branch issue-425-correctly-rounded-math-functions at cmucl / cmucl Commits: 9c16379a by Raymond Toy at 2025-12-18T11:43:32-08:00 Add -std=gnu11 to CFLAGS for x86_linux config Tested this locally with gcc 15.2.1. The core-math routines can compile along with everything else. - - - - - 1 changed file: - src/lisp/Config.x86_linux Changes: ===================================== src/lisp/Config.x86_linux ===================================== @@ -6,6 +6,9 @@ CORE_MATH = -DCORE_MATH_SUPPORT_ERRNO CFLAGS += $(COPT) CPPFLAGS += -m32 +# Gcc 15.2.1 and possibly other version can't compile core-math +# without this option. +CFLAGS += -std=gnu11 CFLAGS += -rdynamic -march=pentium4 -mfpmath=sse -mtune=generic # ANALYZER flag should be set to -fanalyzer when doing the CI builds # for the C static analyzer. View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/9c16379a168976b4d96b245… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/9c16379a168976b4d96b245… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-425-correctly-rounded-math-functions] Workaround or disable tests failing with core-math
by Raymond Toy (＠rtoy) 18 Dec '25

18 Dec '25

Raymond Toy pushed to branch issue-425-correctly-rounded-math-functions at cmucl / cmucl Commits: b35fd453 by Raymond Toy at 2025-12-18T09:16:17-08:00 Workaround or disable tests failing with core-math For some tests core-math signals a different error. For these, update the expected error condition with the actual error condition. For some tests, core-math doesn't signal an error. Disable these. - - - - - 1 changed file: - tests/fdlibm.lisp Changes: ===================================== tests/fdlibm.lisp ===================================== @@ -90,8 +90,12 @@ (define-test %acosh.exceptions (:tag :fdlibm) + ;; Core-math returns infinity instead of signaling overflow. + #-core-math (assert-error 'floating-point-overflow (kernel:%acosh ext:double-float-positive-infinity)) + ;; Core-math currently returns QNaN + #-core-math (assert-error 'floating-point-invalid-operation (kernel:%acosh 0d0)) (ext:with-float-traps-masked (:overflow) @@ -104,8 +108,12 @@ (:tag :fdlibm) (assert-error 'floating-point-invalid-operation (kernel:%asinh *snan*)) + ;; Core-math returns the signed infinity instead of signaling an + ;; overflow. + #-core-math (assert-error 'floating-point-overflow (kernel:%asinh ext:double-float-positive-infinity)) + #-core-math (assert-error 'floating-point-overflow (kernel:%asinh ext:double-float-negative-infinity)) (assert-true (ext:float-nan-p (kernel:%asinh *qnan*))) @@ -172,10 +180,12 @@ (:tag :fdlibm) (assert-error 'floating-point-invalid-operation (kernel:%log1p -2d0)) - (assert-error 'floating-point-overflow + (assert-error #-core-math 'floating-point-overflow + #+core-math 'division-by-zero (kernel:%log1p -1d0)) (assert-true (ext:float-nan-p (kernel:%log1p *qnan*))) - (ext:with-float-traps-masked (:overflow) + (ext:with-float-traps-masked (#-core-math :overflow + #+core-math :divide-by-zero) (assert-equal ext:double-float-negative-infinity (kernel:%log1p -1d0))) (ext:with-float-traps-masked (:invalid) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/b35fd453afc8180c71a53d1… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/b35fd453afc8180c71a53d1… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-425-correctly-rounded-math-functions] 2 commits: Revert "Let's try gcc with -march=haswell"
by Raymond Toy (＠rtoy) 18 Dec '25

18 Dec '25

Raymond Toy pushed to branch issue-425-correctly-rounded-math-functions at cmucl / cmucl Commits: ad844ddd by Raymond Toy at 2025-12-18T06:36:11-08:00 Revert "Let's try gcc with -march=haswell" This reverts commit 07fd3bac2529867a46d9dd610ca4dfaedeb20172. - - - - - 467e0824 by Raymond Toy at 2025-12-18T07:56:25-08:00 Update value for (acosh 4d0) for core-math Core-math returns 2.0634370688955603d0. I'm going to assume that's correct even though (acosh 4w0) is 2.06343706889556054672728117262013w0 And Maxima says: 2.063437068895560546727281172620131871456591449883392499836032693b0 - - - - - 3 changed files: - .gitlab-ci.yml - src/lisp/Config.x86_linux - tests/fdlibm.lisp Changes: ===================================== .gitlab-ci.yml ===================================== @@ -147,7 +147,7 @@ linux:build: - job: linux:install artifacts: true variables: - CONFIG: "x86_linux" + CONFIG: "x86_linux_clang" # These rules is needed so that the static analyzer job can run on a # schedule because this is a prerequisite of the analyzer build. A # regular push or merge request does the normal stuff. @@ -171,7 +171,7 @@ linux:cross-build: - linux-4/lisp variables: # This must match the config used for the linux build! - CONFIG: "x86_linux" + CONFIG: "x86_linux_clang" needs: @@ -346,7 +346,7 @@ ubuntu:build: - job: ubuntu:install artifacts: true variables: - CONFIG: "x86_linux" + CONFIG: "x86_linux_clang" ubuntu:test: <<: *unit_test_configuration ===================================== src/lisp/Config.x86_linux ===================================== @@ -6,8 +6,7 @@ CORE_MATH = -DCORE_MATH_SUPPORT_ERRNO CFLAGS += $(COPT) CPPFLAGS += -m32 -#CFLAGS += -rdynamic -march=pentium4 -mfpmath=sse -mtune=generic -CFLAGS += -rdynamic -march=haswell -mfpmath=sse +CFLAGS += -rdynamic -march=pentium4 -mfpmath=sse -mtune=generic # ANALYZER flag should be set to -fanalyzer when doing the CI builds # for the C static analyzer. CFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(ANALYZER) ===================================== tests/fdlibm.lisp ===================================== @@ -345,7 +345,9 @@ ;; acosh(1.5) = log((sqrt(5)+3)/2, case 1 < x < 2 (assert-eql 0.9624236501192069d0 (acosh 1.5d0)) ;; acosh(4) = log(sqrt(15)+4), case 2 < x < 2^28 - (assert-eql 2.0634370688955608d0 (acosh 4d0)) + (assert-eql #-core-math 2.0634370688955608d0 + #+core-math 2.0634370688955603d0 + (acosh 4d0)) ;; acosh(2^50), case 2^28 < x (assert-eql 35.35050620855721d0 (acosh (scale-float 1d0 50))) ;; No overflow for most positive View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/07fd3bac2529867a46d9dd… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/07fd3bac2529867a46d9dd… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-425-correctly-rounded-math-functions] 4 commits: Adjust threshold for log-consistency test
by Raymond Toy (＠rtoy) 17 Dec '25

17 Dec '25

Raymond Toy pushed to branch issue-425-correctly-rounded-math-functions at cmucl / cmucl Commits: 0996e320 by Raymond Toy at 2025-12-17T13:38:16-08:00 Adjust threshold for log-consistency test Change the threshold for the first test case to 1.42108548d-14 instead of 1.77635684d-15. This worst case value happens for k = 326. - - - - - 53b84f3d by Raymond Toy at 2025-12-17T13:41:47-08:00 Adjust expected value for asinh of most-positive-double-float The expected result has changed by a single bit with core-math. - - - - - 4c8b272e by Raymond Toy at 2025-12-17T13:43:47-08:00 Adjust expected value for acosh of most-positive-double-float The expected result has changed by a single bit with core-math. - - - - - 07fd3bac by Raymond Toy at 2025-12-17T13:45:23-08:00 Let's try gcc with -march=haswell An experiment to see if we can compile the code with gcc if we set -march=hashwell, which is the first processor with the FMA instruction. - - - - - 3 changed files: - .gitlab-ci.yml - src/lisp/Config.x86_linux - tests/fdlibm.lisp Changes: ===================================== .gitlab-ci.yml ===================================== @@ -147,7 +147,7 @@ linux:build: - job: linux:install artifacts: true variables: - CONFIG: "x86_linux_clang" + CONFIG: "x86_linux" # These rules is needed so that the static analyzer job can run on a # schedule because this is a prerequisite of the analyzer build. A # regular push or merge request does the normal stuff. @@ -171,7 +171,7 @@ linux:cross-build: - linux-4/lisp variables: # This must match the config used for the linux build! - CONFIG: "x86_linux_clang" + CONFIG: "x86_linux" needs: @@ -346,7 +346,7 @@ ubuntu:build: - job: ubuntu:install artifacts: true variables: - CONFIG: "x86_linux_clang" + CONFIG: "x86_linux" ubuntu:test: <<: *unit_test_configuration ===================================== src/lisp/Config.x86_linux ===================================== @@ -6,7 +6,8 @@ CORE_MATH = -DCORE_MATH_SUPPORT_ERRNO CFLAGS += $(COPT) CPPFLAGS += -m32 -CFLAGS += -rdynamic -march=pentium4 -mfpmath=sse -mtune=generic +#CFLAGS += -rdynamic -march=pentium4 -mfpmath=sse -mtune=generic +CFLAGS += -rdynamic -march=haswell -mfpmath=sse # ANALYZER flag should be set to -fanalyzer when doing the CI builds # for the C static analyzer. CFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(ANALYZER) ===================================== tests/fdlibm.lisp ===================================== @@ -349,7 +349,9 @@ ;; acosh(2^50), case 2^28 < x (assert-eql 35.35050620855721d0 (acosh (scale-float 1d0 50))) ;; No overflow for most positive - (assert-eql 710.4758600739439d0 (acosh most-positive-double-float))) + (assert-eql #-core-math 710.4758600739439d0 + #+core-math 710.475860073944d0 + (acosh most-positive-double-float))) (define-test asinh-basic-tests (:tag :fdlibm) @@ -378,8 +380,12 @@ (assert-eql -20.101268236238415d0 (asinh (- x)))) (let ((x most-positive-double-float)) ;; No overflow for most-positive-double-float - (assert-eql 710.4758600739439d0 (asinh x)) - (assert-eql -710.4758600739439d0 (asinh (- x))))) + (assert-eql #-core-math 710.4758600739439d0 + #+core-math 710.475860073944d0 + (asinh x)) + (assert-eql #-core-math -710.4758600739439d0 + #+core-math -710.475860073944d0 + (asinh (- x))))) (define-test atanh-basic-tests (:tag :fdlibm) @@ -517,34 +523,52 @@ ;; |log(x) + log(1/x)| < 1.77635684e-15, x = 1.2^k, 0 <= k < 2000 ;; The threshold is experimentally determined (let ((x 1d0) - (max-value -1d0)) + (max-value -1d0) + (worst-x 0d0)) (declare (double-float max-value) (type (double-float 1d0) x)) (dotimes (k 2000) (let ((y (abs (+ (log x) (log (/ x)))))) - (setf max-value (max max-value y)) + (when (> y max-value) + (setf worst-x x + max-value y)) (setf x (* x 1.4d0)))) - (assert-true (< max-value 1.77635684d-15))) + (assert-true (< max-value + #-core-math 1.77635684d-15 + #+core-math 1.42108548d-14) + max-value + worst-x)) ;; |exp(log(x)) - x|/x < 5.6766649d-14, x = 1.4^k, 0 <= k < 2000 (let ((x 1d0) - (max-error 0d0)) - (declare (double-float max-error) + (max-error 0d0) + (worst-x 0d0)) + (declare (double-float max-error worst-x worst-y) (type (double-float 1d0) x)) (dotimes (k 2000) (let ((y (abs (/ (- (exp (log x)) x) x)))) - (setf max-error (max max-error y)) + (when (> y max-error) + (setf worst-x x + max-error y)) (setf x (* x 1.4d0)))) - (assert-true (< max-error 5.6766649d-14))) + (assert-true (< max-error 5.6766649d-14) + max-error + worst-x + worst-y)) ;; |exp(log(x)) - x|/x < 5.68410245d-14, x = 1.4^(-k), 0 <= k < 2000 (let ((x 1d0) - (max-error 0d0)) - (declare (double-float max-error) + (max-error 0d0) + (worst-x 0d0)) + (declare (double-float max-error worst-x worst-y) (type (double-float (0d0)) x)) (dotimes (k 2000) (let ((y (abs (/ (- (exp (log x)) x) x)))) - (setf max-error (max max-error y)) + (when (> y max-error) + (setf worst-x x + max-error y)) (setf x (/ x 1.4d0)))) - (assert-true (< max-error 5.68410245d-14)))) + (assert-true (< max-error 5.68410245d-14) + max-error + worst-x))) (define-test sinh-basic-tests (:tag :fdlibm) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/e174f34db37b0326564054… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/e174f34db37b0326564054… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-456-more-accurate-complex-div] 5 commits: Fix #457: delete-directory signals errors
by Raymond Toy (＠rtoy) 17 Dec '25

17 Dec '25

Raymond Toy pushed to branch issue-456-more-accurate-complex-div at cmucl / cmucl Commits: e65f9f5c by Raymond Toy at 2025-12-17T07:04:10-08:00 Fix #457: delete-directory signals errors - - - - - 6034f935 by Raymond Toy at 2025-12-17T07:04:10-08:00 Merge branch 'issue-457-delete-directory-signals-errors' into 'master' Fix #457: delete-directory signals errors Closes #457 See merge request cmucl/cmucl!336 - - - - - 10efd37c by Raymond Toy at 2025-12-17T07:12:47-08:00 Remove extra blank lines Addresses comment from !337: https://gitlab.common-lisp.net/cmucl/cmucl/-/merge_requests/337#note_18529 Don't need to run CI for this. [skip-ci] - - - - - c6c3c48f by Raymond Toy at 2025-12-17T07:25:38-08:00 Fix up some typos and reorder constants a bit Some of the comments were wrong for the new division algorithm. Also slightly reorder constants for cdiv-double-float and add comment on why `+eps+` has the value it does instead of `double-float-epsilon`. - - - - - c09d2252 by Raymond Toy at 2025-12-17T07:27:33-08:00 Merge branch 'master' into issue-456-more-accurate-complex-div - - - - - 6 changed files: - src/code/exports.lisp - src/code/extensions.lisp - src/code/numbers.lisp - src/i18n/locale/cmucl.pot - tests/float.lisp - tests/pathname.lisp Changes: ===================================== src/code/exports.lisp ===================================== @@ -1213,7 +1213,8 @@ "INVALID-FASL" "WITH-TEMPORARY-DIRECTORY" - "WITH-TEMPORARY-FILE") + "WITH-TEMPORARY-FILE" + "DELETE-DIRECTORY") ;; gencgc features #+gencgc (:export "GET-GC-ASSERTIONS" ===================================== src/code/extensions.lisp ===================================== @@ -673,9 +673,9 @@ (defun delete-directory (dirname &key recursive) _N"Delete the directory Dirname. If the Recursive is non-NIL, recursively delete the directory Dirname including all files and - subdirectories. Dirname must be a pathname to a directory. Any NAME - or TYPE components in Dirname are ignored." - (declare (type pathname dirname)) + subdirectories. Dirname must name a directory. Any NAME or TYPE + components in Dirname are ignored. A FILE-ERROR is signaled if any + directory cannot be deleted." (when recursive ;; Find all the files or directories in DIRNAME. (dolist (path (directory (merge-pathnames "*.*" dirname))) @@ -685,8 +685,15 @@ (delete-directory path :recursive t) (delete-file path)))) ;; Finally delete the directory. - (unix:unix-rmdir (namestring dirname)) - (values)) + (multiple-value-bind (ok errno) + (unix:unix-rmdir (namestring dirname)) + (unless ok + (error 'kernel:simple-file-error + :pathname dirname + :format-control (intl:gettext "Could not remove directory \"~A\": ~A.") + :format-arguments (list dirname + (unix:get-unix-error-msg errno)))) + ok)) ;;; WITH-TEMPORARY-DIRECTORY -- Public ===================================== src/code/numbers.lisp ===================================== @@ -602,16 +602,17 @@ ;; In particular iteration 1 and 3 are added. Iteration 2 and 4 were ;; not added. The test examples from iteration 2 and 4 didn't change ;; with or without changes added. -(let* ((+eps+ (scale-float 1d0 -52)) - (+rmin+ least-positive-normalized-double-float) +(let* ((+rmin+ least-positive-normalized-double-float) (+rbig+ (/ most-positive-double-float 2)) (+rmin2+ (scale-float 1d0 -53)) (+rminscal+ (scale-float 1d0 51)) (+rmax2+ (* +rbig+ +rmin2+)) + ;; The value of %eps in Scilab + (+eps+ (scale-float 1d0 -52)) (+be+ (/ 2 (* +eps+ +eps+))) (+2/eps+ (/ 2 +eps+))) - (declare (double-float +eps+ +rmin+ +rbig+ +rmin2+ - +rminscal+ +rmax2+ +be+ +2/eps+)) + (declare (double-float +rmin+ +rbig+ +rmin2+ +rminscal+ +rmax2+ + +eps+ +be+ +2/eps+)) (defun cdiv-double-float (x y) (declare (type (complex double-float) x y) (optimize (speed 3) (safety 0))) @@ -619,7 +620,7 @@ ((internal-compreal (a b c d r tt) (declare (double-float a b c d r tt)) ;; Compute the real part of the complex division - ;; (a+ib)/(c+id), assuming |c| <= |d|. r = d/c and tt = 1/(c+d*r). + ;; (a+ib)/(c+id), assuming |d| <= |c|. r = d/c and tt = 1/(c+d*r). ;; ;; The realpart is (a*c+b*d)/(c^2+d^2). ;; @@ -713,7 +714,8 @@ (t ;; |d| > |c|. So, instead compute ;; - ;; (b + i*a)/(d + i*c) = ((b*d+a*c) + (a*d-b*c)*i)/(d^2+c^2) + ;; (b + i*a)/(d + i*c) + ;; = ((b*d+a*c) + (a*d-b*c)*i)/(d^2+c^2) ;; ;; Compare this to (a+i*b)/(c+i*d) and we see that ;; realpart of the former is the same, but the @@ -850,7 +852,7 @@ (((complex rational) (complex rational)) ;; We probably don't need to do Smith's algorithm for rationals. - ;; A naive implementation of coplex division has no issues. + ;; A naive implementation of complex division has no issues. (let ((a (realpart x)) (b (imagpart x)) (c (realpart y)) ===================================== src/i18n/locale/cmucl.pot ===================================== @@ -6011,8 +6011,13 @@ msgstr "" msgid "" "Delete the directory Dirname. If the Recursive is non-NIL,\n" " recursively delete the directory Dirname including all files and\n" -" subdirectories. Dirname must be a pathname to a directory. Any NAME\n" -" or TYPE components in Dirname are ignored." +" subdirectories. Dirname must name a directory. Any NAME or TYPE\n" +" components in Dirname are ignored. A FILE-ERROR is signaled if any\n" +" directory cannot be deleted." +msgstr "" + +#: src/code/extensions.lisp +msgid "Could not remove directory \"~A\": ~A." msgstr "" #: src/code/extensions.lisp ===================================== tests/float.lisp ===================================== @@ -343,8 +343,6 @@ (assert-true (typep new-mode 'x86::float-modes)) (assert-equal new-mode (setf (x86::x87-floating-point-modes) new-mode)))) - - ;; Issue #458 (define-test dd-mult-overflow (:tag :issues) ===================================== tests/pathname.lisp ===================================== @@ -144,14 +144,13 @@ (assert-equal dir-tilde dir-home)))) (define-test delete-directory - (let ((dir (ensure-directories-exist "tmp/a/b/c/"))) - ;; Verify that the directories were created. - (assert-equal "tmp/a/b/c/" - dir) - ;; Try to delete the directory. It should fail, which we verify - ;; by noting the directory listing is not empty. - (ext::delete-directory (pathname "tmp/")) - (assert-true (directory "tmp/")) - ;; Now recursively delete the directory. - (ext::delete-directory (pathname "tmp/") :recursive t) - (assert-false (directory "tmp/")))) + (:tag :issues) + (ext:with-temporary-directory (path) + (let ((dir (ensure-directories-exist (merge-pathnames "tmp/a/b/c/" path)))) + ;; Try to delete the directory. It should fail.. + (assert-error 'kernel:simple-file-error + (ext:delete-directory (merge-pathnames "tmp/" path))) + ;; Now recursively delete the directory. + (assert-true (ext:delete-directory (merge-pathnames "tmp/" path) + :recursive t)) + (assert-false (directory "tmp/"))))) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/11f3df65cc2a115fbd8257… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/11f3df65cc2a115fbd8257… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][master] Remove extra blank lines
by Raymond Toy (＠rtoy) 17 Dec '25

17 Dec '25

Raymond Toy pushed to branch master at cmucl / cmucl Commits: 10efd37c by Raymond Toy at 2025-12-17T07:12:47-08:00 Remove extra blank lines Addresses comment from !337: https://gitlab.common-lisp.net/cmucl/cmucl/-/merge_requests/337#note_18529 Don't need to run CI for this. [skip-ci] - - - - - 1 changed file: - tests/float.lisp Changes: ===================================== tests/float.lisp ===================================== @@ -343,8 +343,6 @@ (assert-true (typep new-mode 'x86::float-modes)) (assert-equal new-mode (setf (x86::x87-floating-point-modes) new-mode)))) - - ;; Issue #458 (define-test dd-mult-overflow (:tag :issues) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/10efd37c019d624ebee6a23… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/10efd37c019d624ebee6a23… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0