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

[Git][cmucl/cmucl][issue-156-take-2-nan-comparison] 32 commits: Address #158: Filename encoding for Darwin
by Raymond Toy (＠rtoy) 03 May '23

03 May '23

Raymond Toy pushed to branch issue-156-take-2-nan-comparison at cmucl / cmucl Commits: 5dc0d7bf by Raymond Toy at 2023-03-24T14:31:40+00:00 Address #158: Filename encoding for Darwin - - - - - 3578e015 by Raymond Toy at 2023-03-24T14:31:42+00:00 Merge branch 'issue-158-darwin-pathnames-utf8' into 'master' Address #158: Filename encoding for Darwin Closes #166 and #159 See merge request cmucl/cmucl!113 - - - - - ce823be4 by Raymond Toy at 2023-03-24T08:17:30-07:00 Update release notes with recently closed issues We left out a few issues that probably aren't relevant to users like #175 and #170. We also added #158 which isn't closed, but explains we support utf-8 on Darwin. - - - - - b9b145ab by Raymond Toy at 2023-03-24T08:23:42-07:00 Add period at the end of each bug item - - - - - 72cdab53 by Raymond Toy at 2023-03-29T11:33:08-07:00 Fix warning about lack of prototype in os_get_locale_codeset. Clang produces a warning for `char * os_get_locale_codeset()` because we don't give a prototype for the arg of `os_get_locale_codeset`. So just make it `void`. - - - - - bbfff3c0 by Raymond Toy at 2023-04-10T15:11:59+00:00 Fix #170: Move get-system-info to C - - - - - 5196072a by Raymond Toy at 2023-04-10T15:12:01+00:00 Merge branch 'issue-179-get-system-info-in-c' into 'master' Fix #170: Move get-system-info to C Closes #170 See merge request cmucl/cmucl!137 - - - - - b2aee0f7 by Raymond Toy at 2023-04-17T08:14:29-07:00 Update cmucl.pot with latest source Some docstrings have changed, so update cmucl.pot - - - - - fbb742ae by Raymond Toy at 2023-04-19T14:14:39+00:00 Fix #120: software-version in C - - - - - 501ca837 by Raymond Toy at 2023-04-19T14:14:40+00:00 Merge branch 'issue-120-software-type-in-c' into 'master' Fix #120: software-version in C Closes #120, #130, #146, #136, #142, #134, and #132 See merge request cmucl/cmucl!93 - - - - - 2556df76 by Raymond Toy at 2023-04-19T07:38:34-07:00 Update pot files Forgot to update these in the merges, so let's do them all now. - - - - - 38daa5e2 by Raymond Toy at 2023-04-19T15:13:28+00:00 Add missing colon after "Version" - - - - - de972bb3 by Raymond Toy at 2023-04-19T15:32:14+00:00 Merge branch 'rtoy-master-patch-80206' into 'master' Add missing colon after "Version" See merge request cmucl/cmucl!140 - - - - - f52fcecb by Raymond Toy at 2023-04-21T13:35:02+00:00 Fix #180: Move get-page-size to C - - - - - 412d6523 by Raymond Toy at 2023-04-21T13:35:02+00:00 Merge branch 'issue-180-get-page-size-in-c' into 'master' Fix #180: Move get-page-size to C Closes #180 See merge request cmucl/cmucl!136 - - - - - 31825793 by Raymond Toy at 2023-04-25T20:49:36+00:00 Fix #189: Move get-system-info from unix.lisp to os.lisp - - - - - 90a5e569 by Raymond Toy at 2023-04-25T20:49:36+00:00 Merge branch 'issue-189-move-get-system-info' into 'master' Fix #189: Move get-system-info from unix.lisp to os.lisp Closes #189 See merge request cmucl/cmucl!141 - - - - - c2a99381 by Raymond Toy at 2023-04-26T21:38:42+00:00 Fix #131: Move unix-uname to contrib/unix - - - - - acb29d8f by Raymond Toy at 2023-04-26T21:38:42+00:00 Merge branch 'issue-131-move-unix-uname' into 'master' Fix #131: Move unix-uname to contrib/unix Closes #131 See merge request cmucl/cmucl!142 - - - - - 677c3ccf by Raymond Toy at 2023-04-27T22:55:29+00:00 Fix #185: Use shorter instructions on x86 - - - - - 8826d962 by Raymond Toy at 2023-04-27T22:55:39+00:00 Merge branch 'issue-185-x86-shorter-insts' into 'master' Fix #185: Use shorter instructions on x86 Closes #185 See merge request cmucl/cmucl!138 - - - - - 784a143b by Raymond Toy at 2023-04-29T03:54:43+00:00 Fix #192: Print radix marker in disassemblies; adjust note column - - - - - ce57a9f2 by Raymond Toy at 2023-04-29T03:55:21+00:00 Merge branch 'issue-192-disassemble-prints-radix-marker' into 'master' Fix #192: Print radix marker in disassemblies; adjust note column Closes #192 See merge request cmucl/cmucl!143 - - - - - 48aa21e0 by Raymond Toy at 2023-04-28T20:59:32-07:00 Update release notes for issue #192 - - - - - 3154df47 by Raymond Toy at 2023-04-30T13:54:45+00:00 Fix #193: Treat NIL and :UNSPECIFIC as equivalent in pathnames - - - - - 9eec4ee5 by Raymond Toy at 2023-04-30T13:55:56+00:00 Merge branch 'issue-193-nil-unspecific-equivalent' into 'master' Fix #193: Treat NIL and :UNSPECIFIC as equivalent in pathnames Closes #193 See merge request cmucl/cmucl!144 - - - - - a0c4c593 by Raymond Toy at 2023-04-30T07:17:53-07:00 Update pot file - - - - - 95f592f0 by Raymond Toy at 2023-04-30T07:18:08-07:00 Update release notes for #193 - - - - - 65bf9fa5 by Raymond Toy at 2023-04-30T07:59:16-07:00 Update pot files for Darwin - - - - - 89bdabd4 by Raymond Toy at 2023-04-30T15:08:48-07:00 More pot file updates on linux. - - - - - fa4edacb by Raymond Toy at 2023-05-01T13:09:03-07:00 Update CI to use latest snapshot (2023-04) - - - - - d07b8de1 by Raymond Toy at 2023-05-03T15:50:36-07:00 Merge branch 'master' into issue-156-take-2-nan-comparison - - - - - 30 changed files: - .gitlab-ci.yml - .gitlab/issue_templates/Bug.md - src/code/bsd-os.lisp - src/code/exports.lisp - src/code/hpux-os.lisp - src/code/irix-os.lisp - src/code/linux-os.lisp - src/code/misc.lisp - + src/code/os.lisp - src/code/osf1-os.lisp - src/code/pathname.lisp - src/code/save.lisp - src/code/string.lisp - src/code/sunos-os.lisp - src/code/unicode.lisp - src/code/unix.lisp - src/compiler/disassem.lisp - src/compiler/x86/insts.lisp - src/contrib/unix/unix-glibc2.lisp - src/contrib/unix/unix.lisp - src/general-info/release-21e.md - src/i18n/locale/cmucl-bsd-os.pot - src/i18n/locale/cmucl-linux-os.pot - + src/i18n/locale/cmucl-os.pot - src/i18n/locale/cmucl-unix.pot - src/i18n/locale/cmucl-x86-vm.pot - src/i18n/locale/cmucl.pot - src/lisp/os-common.c - src/pcl/simple-streams/internal.lisp - src/tools/worldbuild.lisp The diff was not included because it is too large. View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/b84c734965e4abdf14b6ac… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/b84c734965e4abdf14b6ac… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-143-ansi-compliance-failure-listen-extra-argument] Fix #143 - adds missing progn
by Jon Boone (＠jboone) 03 May '23

03 May '23

Jon Boone pushed to branch issue-143-ansi-compliance-failure-listen-extra-argument at cmucl / cmucl Commits: 931c28b8 by Jon Boone at 2023-05-03T17:54:04-04:00 Fix #143 - adds missing progn - - - - - 1 changed file: - src/code/stream.lisp Changes: ===================================== src/code/stream.lisp ===================================== @@ -612,14 +612,15 @@ ;; simple-stream (stream::%listen stream width) ;; lisp-stream - ((when width-p - (error 'kernel:simple-program-error - :function-name 'listen - :format-control (intl:gettext "Invalid number of arguments: ~S") - :format-arguments (list 3))) - (or (/= (the fixnum (lisp-stream-in-index stream)) in-buffer-length) - ;; Test for t explicitly since misc methods return :eof sometimes. - (eq (funcall (lisp-stream-misc stream) stream :listen) t))) + (progn + (when width-p + (error 'kernel:simple-program-error + :function-name 'listen + :format-control (intl:gettext "Invalid number of arguments: ~S") + :format-arguments (list 3))) + (or (/= (the fixnum (lisp-stream-in-index stream)) in-buffer-length) + ;; Test for t explicitly since misc methods return :eof sometimes. + (eq (funcall (lisp-stream-misc stream) stream :listen) t))) ;; fundamental-stream (stream-listen stream)))) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/931c28b8924dcb08009d405… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/931c28b8924dcb08009d405… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-143-ansi-compliance-failure-listen-extra-argument] Fix #143 - grouping multiple forms together
by Jon Boone (＠jboone) 03 May '23

03 May '23

Jon Boone pushed to branch issue-143-ansi-compliance-failure-listen-extra-argument at cmucl / cmucl Commits: bdaed959 by Jon Boone at 2023-05-03T16:01:32-04:00 Fix #143 - grouping multiple forms together - - - - - 1 changed file: - src/code/stream.lisp Changes: ===================================== src/code/stream.lisp ===================================== @@ -612,14 +612,14 @@ ;; simple-stream (stream::%listen stream width) ;; lisp-stream - (when width-p - (error 'kernel:simple-program-error - :function-name 'listen - :format-control (intl:gettext "Invalid number of arguments: ~S") - :format-arguments (list 3))) - (or (/= (the fixnum (lisp-stream-in-index stream)) in-buffer-length) - ;; Test for t explicitly since misc methods return :eof sometimes. - (eq (funcall (lisp-stream-misc stream) stream :listen) t)) + ((when width-p + (error 'kernel:simple-program-error + :function-name 'listen + :format-control (intl:gettext "Invalid number of arguments: ~S") + :format-arguments (list 3))) + (or (/= (the fixnum (lisp-stream-in-index stream)) in-buffer-length) + ;; Test for t explicitly since misc methods return :eof sometimes. + (eq (funcall (lisp-stream-misc stream) stream :listen) t))) ;; fundamental-stream (stream-listen stream)))) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/bdaed959dae7fd7dd2f4820… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/bdaed959dae7fd7dd2f4820… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-143-ansi-compliance-failure-listen-extra-argument] simplifies case where stream is of type lisp-stream and width provided
by Jon Boone (＠jboone) 03 May '23

03 May '23

Jon Boone pushed to branch issue-143-ansi-compliance-failure-listen-extra-argument at cmucl / cmucl Commits: ee8dae4c by Jon Boone at 2023-05-02T20:00:15-04:00 simplifies case where stream is of type lisp-stream and width provided - - - - - 1 changed file: - src/code/stream.lisp Changes: ===================================== src/code/stream.lisp ===================================== @@ -604,7 +604,7 @@ :skipped-char-form () :eof-detected-form (eof-or-lose stream eof-errorp eof-value)))))) -(defun listen (&optional (stream *standard-input* stream-p) (width 1 width-p)) +(defun listen (&optional (stream *standard-input*) (width 1 width-p)) "Returns T if a character is available on the given Stream." (declare (type streamlike stream)) (let ((stream (in-synonym-of stream))) @@ -612,26 +612,14 @@ ;; simple-stream (stream::%listen stream width) ;; lisp-stream - (let ((error-type 'simple-program-error) - (function-name 'listen) - (format-control ()) - (format-arguments ())) - (if width-p - ;; since width provided, two possible cases: - (progn - (if stream-p - ;; stream also provided, so too many arguments - (setf format-control (intl:gettext "Invalid number of arguments: ~S") - format-arguments (list 3)) - ;; stream init-form used, so invalid argument - (setf format-control (intl:gettext "Invalid argument: ~D") - format-arguments (list 'width))) - (error error-type :function-name function-name - :format-control format-control :format-arguments format-arguments)) - ;; width not provided, so return expected value - (or (/= (the fixnum (lisp-stream-in-index stream)) in-buffer-length) - ;; Test for t explicitly since misc methods return :eof sometimes. - (eq (funcall (lisp-stream-misc stream) stream :listen) t)))) + (when width-p + (error 'kernel:simple-program-error + :function-name 'listen + :format-control (intl:gettext "Invalid number of arguments: ~S") + :format-arguments (list 3))) + (or (/= (the fixnum (lisp-stream-in-index stream)) in-buffer-length) + ;; Test for t explicitly since misc methods return :eof sometimes. + (eq (funcall (lisp-stream-misc stream) stream :listen) t)) ;; fundamental-stream (stream-listen stream)))) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/ee8dae4c3134419b3266363… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/ee8dae4c3134419b3266363… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-143-ansi-compliance-failure-listen-extra-argument] adds argument checking for lisp-streams
by Jon Boone (＠jboone) 02 May '23

02 May '23

Jon Boone pushed to branch issue-143-ansi-compliance-failure-listen-extra-argument at cmucl / cmucl Commits: 41bbfcd6 by Jon Boone at 2023-05-02T02:14:01-04:00 adds argument checking for lisp-streams - - - - - 1 changed file: - src/code/stream.lisp Changes: ===================================== src/code/stream.lisp ===================================== @@ -604,7 +604,7 @@ :skipped-char-form () :eof-detected-form (eof-or-lose stream eof-errorp eof-value)))))) -(defun listen (&optional (stream *standard-input*) (width 1)) +(defun listen (&optional (stream *standard-input* stream-p) (width 1 width-p)) "Returns T if a character is available on the given Stream." (declare (type streamlike stream)) (let ((stream (in-synonym-of stream))) @@ -612,9 +612,26 @@ ;; simple-stream (stream::%listen stream width) ;; lisp-stream - (or (/= (the fixnum (lisp-stream-in-index stream)) in-buffer-length) - ;; Test for t explicitly since misc methods return :eof sometimes. - (eq (funcall (lisp-stream-misc stream) stream :listen) t)) + (let ((error-type 'simple-program-error) + (function-name 'listen) + (format-control ()) + (format-arguments ())) + (if width-p + ;; since width provided, two possible cases: + (progn + (if stream-p + ;; stream also provided, so too many arguments + (setf format-control (intl:gettext "Invalid number of arguments: ~S") + format-arguments (list 3)) + ;; stream init-form used, so invalid argument + (setf format-control (intl:gettext "Invalid argument: ~D") + format-arguments (list 'width))) + (error error-type :function-name function-name + :format-control format-control :format-arguments format-arguments)) + ;; width not provided, so return expected value + (or (/= (the fixnum (lisp-stream-in-index stream)) in-buffer-length) + ;; Test for t explicitly since misc methods return :eof sometimes. + (eq (funcall (lisp-stream-misc stream) stream :listen) t)))) ;; fundamental-stream (stream-listen stream)))) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/41bbfcd64ccf2d21f9f1498… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/41bbfcd64ccf2d21f9f1498… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][master] Update CI to use latest snapshot (2023-04)
by Raymond Toy (＠rtoy) 01 May '23

01 May '23

Raymond Toy pushed to branch master at cmucl / cmucl Commits: fa4edacb by Raymond Toy at 2023-05-01T13:09:03-07:00 Update CI to use latest snapshot (2023-04) - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -1,7 +1,7 @@ variables: - download_url: "https://common-lisp.net/project/cmucl/downloads/snapshots/2021/07" - version: "2021-07-x86" - bootstrap: "-B boot-2021-07-1 -B boot-2021-07-2" + download_url: "https://common-lisp.net/project/cmucl/downloads/snapshots/2023/04" + version: "2023-04-x86" + bootstrap: "" stages: - install View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/fa4edacbea17140c0e869ac… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/fa4edacbea17140c0e869ac… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][master] More pot file updates on linux.
by Raymond Toy (＠rtoy) 30 Apr '23

30 Apr '23

Raymond Toy pushed to branch master at cmucl / cmucl Commits: 89bdabd4 by Raymond Toy at 2023-04-30T15:08:48-07:00 More pot file updates on linux. - - - - - 2 changed files: - src/i18n/locale/cmucl-unix.pot - src/i18n/locale/cmucl.pot Changes: ===================================== src/i18n/locale/cmucl-unix.pot ===================================== @@ -1356,6 +1356,14 @@ msgid "" "found." msgstr "" +#: src/code/unix.lisp +msgid "" +"Return a USER-INFO structure for the user identified by UID. If\n" +" not found, NIL is returned with a second value indicating the cause\n" +" of the failure. In particular, if the second value is 0 (or\n" +" ENONENT, ESRCH, EBADF, etc.), then the uid was not found." +msgstr "" + #: src/code/unix.lisp msgid "" "Unix-times returns information about the cpu time usage of the process\n" ===================================== src/i18n/locale/cmucl.pot ===================================== @@ -9591,15 +9591,6 @@ msgid "" " an otherwise undefined logical host." msgstr "" -#: src/code/pathname.lisp -msgid "" -"When non-NIL, pathnames are on Darwin are normalized when created.\n" -" Otherwise, the pathnames are unchanged.\n" -"\n" -" This must be NIL during bootstrapping because Unicode is not yet\n" -" available." -msgstr "" - #: src/code/pathname.lisp msgid "A path specification, either a string, file-stream or pathname." msgstr "" View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/89bdabd46d7958eb6692b96… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/89bdabd46d7958eb6692b96… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][master] More pot file updates on linux.
by Raymond Toy (＠rtoy) 30 Apr '23

30 Apr '23

Raymond Toy pushed to branch master at cmucl / cmucl Commits: 89bdabd4 by Raymond Toy at 2023-04-30T15:08:48-07:00 More pot file updates on linux. - - - - - 2 changed files: - src/i18n/locale/cmucl-unix.pot - src/i18n/locale/cmucl.pot Changes: ===================================== src/i18n/locale/cmucl-unix.pot ===================================== @@ -1356,6 +1356,14 @@ msgid "" "found." msgstr "" +#: src/code/unix.lisp +msgid "" +"Return a USER-INFO structure for the user identified by UID. If\n" +" not found, NIL is returned with a second value indicating the cause\n" +" of the failure. In particular, if the second value is 0 (or\n" +" ENONENT, ESRCH, EBADF, etc.), then the uid was not found." +msgstr "" + #: src/code/unix.lisp msgid "" "Unix-times returns information about the cpu time usage of the process\n" ===================================== src/i18n/locale/cmucl.pot ===================================== @@ -9591,15 +9591,6 @@ msgid "" " an otherwise undefined logical host." msgstr "" -#: src/code/pathname.lisp -msgid "" -"When non-NIL, pathnames are on Darwin are normalized when created.\n" -" Otherwise, the pathnames are unchanged.\n" -"\n" -" This must be NIL during bootstrapping because Unicode is not yet\n" -" available." -msgstr "" - #: src/code/pathname.lisp msgid "A path specification, either a string, file-stream or pathname." msgstr "" View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/89bdabd46d7958eb6692b96… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/89bdabd46d7958eb6692b96… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][master] Update pot files for Darwin
by Raymond Toy (＠rtoy) 30 Apr '23

30 Apr '23

Raymond Toy pushed to branch master at cmucl / cmucl Commits: 65bf9fa5 by Raymond Toy at 2023-04-30T07:59:16-07:00 Update pot files for Darwin - - - - - 3 changed files: - src/i18n/locale/cmucl-bsd-os.pot - src/i18n/locale/cmucl-unix.pot - src/i18n/locale/cmucl.pot Changes: ===================================== src/i18n/locale/cmucl-bsd-os.pot ===================================== @@ -15,22 +15,10 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/code/bsd-os.lisp -msgid "Version string for supporting software" -msgstr "" - -#: src/code/bsd-os.lisp -msgid "Returns a string describing version of the supporting software." -msgstr "" - #: src/code/bsd-os.lisp msgid "Unix system call getrusage failed: ~A." msgstr "" -#: src/code/bsd-os.lisp -msgid "Getpagesize failed: ~A" -msgstr "" - #: src/code/signal.lisp msgid "Emt instruction" msgstr "" ===================================== src/i18n/locale/cmucl-unix.pot ===================================== @@ -1356,14 +1356,6 @@ msgid "" "found." msgstr "" -#: src/code/unix.lisp -msgid "" -"Return a USER-INFO structure for the user identified by UID. If\n" -" not found, NIL is returned with a second value indicating the cause\n" -" of the failure. In particular, if the second value is 0 (or\n" -" ENONENT, ESRCH, EBADF, etc.), then the uid was not found." -msgstr "" - #: src/code/unix.lisp msgid "" "Unix-times returns information about the cpu time usage of the process\n" ===================================== src/i18n/locale/cmucl.pot ===================================== @@ -9591,6 +9591,15 @@ msgid "" " an otherwise undefined logical host." msgstr "" +#: src/code/pathname.lisp +msgid "" +"When non-NIL, pathnames are on Darwin are normalized when created.\n" +" Otherwise, the pathnames are unchanged.\n" +"\n" +" This must be NIL during bootstrapping because Unicode is not yet\n" +" available." +msgstr "" + #: src/code/pathname.lisp msgid "A path specification, either a string, file-stream or pathname." msgstr "" View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/65bf9fa57e161241ac528f1… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/65bf9fa57e161241ac528f1… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][master] 2 commits: Fix #193: Treat NIL and :UNSPECIFIC as equivalent in pathnames
by Raymond Toy (＠rtoy) 30 Apr '23

30 Apr '23

Raymond Toy pushed to branch master at cmucl / cmucl Commits: 3154df47 by Raymond Toy at 2023-04-30T13:54:45+00:00 Fix #193: Treat NIL and :UNSPECIFIC as equivalent in pathnames - - - - - 9eec4ee5 by Raymond Toy at 2023-04-30T13:55:56+00:00 Merge branch 'issue-193-nil-unspecific-equivalent' into 'master' Fix #193: Treat NIL and :UNSPECIFIC as equivalent in pathnames Closes #193 See merge request cmucl/cmucl!144 - - - - - 2 changed files: - src/code/pathname.lisp - tests/issues.lisp Changes: ===================================== src/code/pathname.lisp ===================================== @@ -496,14 +496,22 @@ (cons (and (consp that) (compare-component (car this) (car that)) - (compare-component (cdr this) (cdr that))))))) + (compare-component (cdr this) (cdr that)))) + (symbol + ;; Handle NIL and :UNSPECIFIC as being equivalent + (or (and (eq this :unspecific) + (null that)) + (and (null this) + (eq that :unspecific))))))) ;; Compare the version component. We treat NIL to be EQUAL to -;; :NEWEST. +;; :NEWEST or :UNSPECIFIC. (defun compare-version-component (this that) (or (eql this that) - (and (null this) (eq that :newest)) - (and (null that) (eq this :newest)))) + (if (and (member this '(nil :newest :unspecific) :test #'eq) + (member that '(nil :newest :unspecific) :test #'eq)) + t + nil))) ;;;; Pathname functions. ===================================== tests/issues.lisp ===================================== @@ -944,3 +944,36 @@ (assert-true (typep idf-max-expo 'kernel:double-float-int-exponent)) (assert-true (typep (1- idf-max-expo) 'kernel:double-float-int-exponent)) (assert-false (typep (1+ idf-max-expo) 'kernel:double-float-int-exponent)))) + +(define-test issue.192.device + (assert-true (equal (make-pathname :device :unspecific) + (make-pathname :device nil))) + (assert-true (equal (make-pathname :device nil) + (make-pathname :device :unspecific)))) + +(define-test issue.192.name + (assert-true (equal (make-pathname :name :unspecific) + (make-pathname :name nil))) + (assert-true (equal (make-pathname :name nil) + (make-pathname :name :unspecific)))) + +(define-test issue.192.type + (assert-true (equal (make-pathname :type :unspecific) + (make-pathname :type nil))) + (assert-true (equal (make-pathname :type nil) + (make-pathname :type :unspecific)))) + +(define-test issue.192.version + (assert-true (equal (make-pathname :version :newest) + (make-pathname :version nil))) + (assert-true (equal (make-pathname :version nil) + (make-pathname :version :newest))) + (assert-true (equal (make-pathname :version :unspecific) + (make-pathname :version nil))) + (assert-true (equal (make-pathname :version nil) + (make-pathname :version :unspecific))) + (assert-true (equal (make-pathname :version :unspecific) + (make-pathname :version :newest))) + (assert-true (equal (make-pathname :version :newest) + (make-pathname :version :unspecific))) +) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/48aa21e0b2ff64c1db1688… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/48aa21e0b2ff64c1db1688… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0