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

[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