Raymond Toy pushed to branch master at cmucl / cmucl
Commits:
8f05a7db by Raymond Toy at 2024-06-17T03:51:47+00:00
Fix #327: Fix files that have both CRLF and LF line terminators
- - - - -
d48a5813 by Raymond Toy at 2024-06-17T03:51:49+00:00
Merge branch 'issue-327-fix-crlf-lf-eol' into 'master'
Fix #327: Fix files that have both CRLF and LF line terminators
Closes #327
See merge request cmucl/cmucl!227
- - - - -
10 changed files:
- src/benchmarks/gabriel/bmarks.lisp
- src/benchmarks/soar/default.soar
- src/benchmarks/soar/soar.lisp
- src/hemlock/command.lisp
- src/hemlock/linimage.lisp
- src/hemlock/netnews.lisp
- src/hemlock/ring.lisp
- src/hemlock/search1.lisp
- src/hemlock/search2.lisp
- src/hemlock/winimage.lisp
Changes:
=====================================
src/benchmarks/gabriel/bmarks.lisp
=====================================
@@ -444,7 +444,7 @@
(equal (times x (add1 y))
(if (numberp y)
(plus x (times x y))
- (fix x)))
+ (fix x)))
(equal (nth (nil)
i)
(if (zerop i)
@@ -1375,7 +1375,7 @@ Why, pray tell?
(t (puzzle-remove i j))))))))))
(defun definepiece (iclass ii jj kk)
- (declare (fixnum ii jj kk))
+ (declare (fixnum ii jj kk))
(let ((index 0))
(declare (fixnum index))
(do ((i 0 (1+ i)))
@@ -1991,7 +1991,7 @@ Why, pray tell?
(cond ((not (< y x)) z)
(t (tak77 (tak49 (the fixnum (1- x)) y z)
(tak47 (the fixnum (1- y)) z x)
- (tak9 (the fixnum (1- z)) x y)))))
+ (tak9 (the fixnum (1- z)) x y)))))
(defun tak77 (x y z)
(declare (fixnum x y z))
(cond ((not (< y x)) z)
@@ -2131,7 +2131,7 @@ Why, pray tell?
(tak0 (the fixnum (1- y)) z x)
(tak0 (the fixnum (1- z)) x y)))))
-(defun time-takr ()
+(defun time-takr ()
(time (tak0 18 12 6)))
|#
@@ -2308,7 +2308,7 @@ Why, pray tell?
count))
(defun init-traverse()
- (prog1 nil (setq root (create-structure 100.))))
+ (prog1 nil (setq root (create-structure 100.))))
(defun run-traverse ()
(do ((i 50. (the fixnum (1- i))))
=====================================
src/benchmarks/soar/default.soar
=====================================
@@ -702,4 +702,4 @@
(preference <q> ^role operator ^value reject
^goal <g4> ^problem-space <p> ^state <s>))
-nil
+nil
=====================================
src/benchmarks/soar/soar.lisp
=====================================
@@ -192,7 +192,7 @@
(and (eq ce 1.) (go ph2))
(setq x (cdr x))
(and (eq ce 2.) (go ph2))
- (setq x (cdr x))
+ (setq x (cdr x))
(and (eq ce 3.) (go ph2))
(setq x (cdr x))
(and (eq ce 4.) (go ph2))
@@ -902,7 +902,7 @@
(prog nil
top (and (not nl) (return nil))
(setq *sendtocall* nil)
- (setq *last-node* (car nl))
+ (setq *last-node* (car nl))
(apply (caar nl) (cdar nl)) ;; %%% here's the apply cdar nl must
;; be the *cN* item, caar nl is test
(setq nl (cdr nl))
@@ -1480,7 +1480,7 @@
(setq v (car vlist))
(setq ind (cadr vlist))
(setq vlist (cddr vlist))
- (setq r (ce-gelm *data-matched* ind))
+ (setq r (ce-gelm *data-matched* ind))
(setq *ce-variable-memory*
(cons (cons v r) *ce-variable-memory*))
(go top)))
@@ -2649,7 +2649,7 @@
)
(defun soarclearprops (sym)
- (setf (symbol-plist sym) () )
+ (setf (symbol-plist sym) () )
)
(defun soarmachinetype ()
@@ -3733,7 +3733,7 @@
(use-result-array))
(defun remove-condition-trash (condition)
- (prog (return-condition pand-flag disjunction-flag)
+ (prog (return-condition pand-flag disjunction-flag)
(setq return-condition nil)
(setq pand-flag nil)
(setq disjunction-flag nil)
@@ -4588,7 +4588,7 @@
(setq out (p-conds-to-sp (sppwm1 (append '(^ identifier) (list object)))))
(setq out1 nil)
(soarmapc
- #'(lambda (x)
+ #'(lambda (x)
(cond ((eq prefflag (eq (car x) 'preference))
(ppline x)
(soarpush x out1)
@@ -4780,7 +4780,7 @@
(cond ((atom x) (soarwarn "Atomic Action" x) (return nil)))
(setq a (setq *action-type* (car x)))
(cond ((eq a 'bind) (check-bind x))
- ((eq a 'cbind) (check-cbind x))
+ ((eq a 'cbind) (check-cbind x))
((eq a 'call2) (return nil))
((eq a 'tabstop) (check-bind x))
((eq a 'decide) (check-decide))
@@ -6299,7 +6299,7 @@
(return array)))
(defun process-decide (phase-set)
- (accum-stats)
+ (accum-stats)
(setq *new-chunks* nil)
(soarmapcar #'classify-decide phase-set)
(process-context-stack *context-stack*))
=====================================
src/hemlock/command.lisp
=====================================
@@ -311,7 +311,7 @@
window, up one screenfull. If P is supplied then scroll that
many lines."
(if p
- (scroll-window window (- p))
+ (scroll-window window (- p))
(let ((height (- (window-height window)))
(overlap (- (value scroll-overlap))))
(scroll-window window (if (>= height overlap)
=====================================
src/hemlock/linimage.lisp
=====================================
@@ -361,7 +361,7 @@
;; If we we didn't wrap then display some losers...
(if xpos
(display-losing-chars open-chars index left-open-pos dest xpos
- width string underhang string-get-rep
+ width string underhang string-get-rep
(and done-p (= index left-open-pos)))
(update-and-punt dis-line width nil 0 index)))
(t
=====================================
src/hemlock/netnews.lisp
=====================================
@@ -530,9 +530,10 @@
(defsetf nn-last-read-message-number %set-nn-last-read-message-number)
-(defconstant nntp-eof ".
"
- "NNTP marks the end of a textual response with this. NNTP also recognizes
- this as the end of a post.")
+(defconstant nntp-eof
+ (coerce '(#\. #\return) 'string)
+ "NNTP marks the end of a textual response with this. NNTP also
+ recognizes this as the end of a post.")
;;; This macro binds a variable to each successive line of input from NNTP
;;; and exits when it sees the NNTP end-of-file-marker, a period by itself on
=====================================
src/hemlock/ring.lisp
=====================================
@@ -98,7 +98,7 @@
(t
(setf (ring-first ring) new)))
(shiftf (aref vec first) nil)))
-
+
;;; ring-length -- Public
;;;
@@ -116,7 +116,7 @@
;;; Do modulo arithmetic to find the correct element.
;;;
(defun ring-ref (ring index)
- (declare (fixnum index))
+ (declare (fixnum index))
"Return the index'th element of a ring. This can be set with Setf."
(let ((first (ring-first ring)))
(declare (fixnum first))
=====================================
src/hemlock/search1.lisp
=====================================
@@ -58,7 +58,7 @@
;;;
;;; This macro is used to define a new kind of search pattern. Kind
;;; is the kind of search pattern to define. Lambda-list is the argument
-;;; list for the expert-function to be built and forms it's body.
+;;; list for the expert-function to be built and forms it's body.
;;; The arguments passed are the direction, the pattern, and either
;;; an old search-pattern of the same type or nil. Documentation
;;; is put on the search-pattern-documentation property of the kind
=====================================
src/hemlock/search2.lisp
=====================================
@@ -83,7 +83,7 @@
;;; Create-Character-Set -- Internal
;;;
-;;; Create-Character-Set returns a character-set which will search
+;;; Create-Character-Set returns a character-set which will search
;;; for no character.
;;;
(defun create-character-set ()
=====================================
src/hemlock/winimage.lisp
=====================================
@@ -307,7 +307,7 @@
TOP
(cond ((null line)
(go DONE))
- ((eq (line-%chars line) (dis-line-old-chars (car current)))
+ ((eq (line-%chars line) (dis-line-old-chars (car current)))
(go STEP)))
;;
;; We found a suspect line.
View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/7d568688d1b52c4e605587…
--
This project does not include diff previews in email notifications.
View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/7d568688d1b52c4e605587…
You're receiving this email because of your account on gitlab.common-lisp.net.
Raymond Toy pushed to branch master at cmucl / cmucl
Commits:
258273ff by Raymond Toy at 2024-06-17T03:42:56+00:00
Fix #329: Fix compiler warnings in os.lisp.
- - - - -
7d568688 by Raymond Toy at 2024-06-17T03:43:15+00:00
Merge branch 'issue-329-undef-var-get-page-size' into 'master'
Fix #329: Fix compiler warnings in os.lisp.
Closes #329
See merge request cmucl/cmucl!230
- - - - -
1 changed file:
- src/code/os.lisp
Changes:
=====================================
src/code/os.lisp
=====================================
@@ -29,7 +29,7 @@
(alien:extern-alien "os_get_page_size"
(function c-call:long)))))
(when (minusp maybe-page-size)
- (error (intl:gettext "get-page-size failed: ~A") (get-unix-error-msg err)))
+ (error (intl:gettext "get-page-size failed: ~A") (unix:get-unix-error-msg)))
maybe-page-size))
View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/e23fc502bf09197c1b14d1…
--
This project does not include diff previews in email notifications.
View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/e23fc502bf09197c1b14d1…
You're receiving this email because of your account on gitlab.common-lisp.net.
Raymond Toy pushed to branch master at cmucl / cmucl
Commits:
e23fc502 by Raymond Toy at 2024-06-11T07:13:48-07:00
Use cmucl-expected-failures branch
We've merged issue-316-support-roundtrip-char-casing to
cmucl-expected-failures, so we can use cmucl-expected-failures as the
ansi-test branch now.
- - - - -
1 changed file:
- bin/run-ansi-tests.sh
Changes:
=====================================
bin/run-ansi-tests.sh
=====================================
@@ -36,7 +36,7 @@ shift $[$OPTIND - 1]
# Use branch cmucl-expected-failures in general since this branch
# generally has the list of expected failures. This is the branch to
# use on cmucl master in general.
-BRANCH=issue-316-support-roundtrip-char-casing
+BRANCH=cmucl-expected-failures
set -x
if [ -d ../ansi-test ]; then
View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/e23fc502bf09197c1b14d1d…
--
This project does not include diff previews in email notifications.
View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/e23fc502bf09197c1b14d1d…
You're receiving this email because of your account on gitlab.common-lisp.net.
Raymond Toy pushed to branch issue-328-typo-code-char at cmucl / cmucl
Commits:
9f7ba388 by Raymond Toy at 2024-06-09T06:02:11-07:00
Add package qualifiers
The function `unicode-title` and the macro `with-one-string` are in
the `lisp` package, so add the package qualifer.
Fixes #330.
- - - - -
1 changed file:
- src/code/unicode.lisp
Changes:
=====================================
src/code/unicode.lisp
=====================================
@@ -496,7 +496,7 @@
(code-char (logxor m #x20)))
#+(and unicode (not unicode-bootstrap))
((> m lisp::+ascii-limit+)
- (code-char (unicode-title m)))
+ (code-char (lisp::unicode-title m)))
(t char))))
(defun title-case-p (char)
@@ -562,7 +562,7 @@
(let* ((string (if (stringp string) string (string string)))
(slen (length string)))
(declare (fixnum slen))
- (with-one-string string start end offset
+ (lisp::with-one-string string start end offset
(let ((offset-slen (+ slen offset))
(newstring (make-string slen)))
(declare (fixnum offset-slen))
View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/9f7ba388700843cc5c4c7a9…
--
This project does not include diff previews in email notifications.
View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/9f7ba388700843cc5c4c7a9…
You're receiving this email because of your account on gitlab.common-lisp.net.
Raymond Toy pushed to branch issue-327-fix-crlf-lf-eol at cmucl / cmucl
Commits:
3a25c685 by Raymond Toy at 2024-06-07T06:39:39-07:00
Make CR more explicit for nntp-eof
https://www.rfc-editor.org/rfc/rfc3977.html seems to say the the NNTP
protocol uses CRLF as line terminators. Make the CR in `nntp-eof`
more explicit. We also note here that `write-line` is used to print
out the value of `nntp-eof`, so we don't need a LF character in
`nntp-eof`.
- - - - -
1 changed file:
- src/hemlock/netnews.lisp
Changes:
=====================================
src/hemlock/netnews.lisp
=====================================
@@ -530,9 +530,10 @@
(defsetf nn-last-read-message-number %set-nn-last-read-message-number)
-(defconstant nntp-eof ".
"
- "NNTP marks the end of a textual response with this. NNTP also recognizes
- this as the end of a post.")
+(defconstant nntp-eof
+ (coerce '(#\. #\return) 'string)
+ "NNTP marks the end of a textual response with this. NNTP also
+ recognizes this as the end of a post.")
;;; This macro binds a variable to each successive line of input from NNTP
;;; and exits when it sees the NNTP end-of-file-marker, a period by itself on
View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/3a25c68519ad166bbd33c72…
--
This project does not include diff previews in email notifications.
View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/3a25c68519ad166bbd33c72…
You're receiving this email because of your account on gitlab.common-lisp.net.
Raymond Toy pushed to branch issue-327-fix-crlf-lf-eol at cmucl / cmucl
Commits:
0d968caf by Raymond Toy at 2024-06-06T20:41:28-07:00
Fix up one more CRLF file
Run dos2unix on hemlock/command.lisp to convert CRLF to LF.
- - - - -
1 changed file:
- src/hemlock/command.lisp
Changes:
=====================================
src/hemlock/command.lisp
=====================================
@@ -311,7 +311,7 @@
window, up one screenfull. If P is supplied then scroll that
many lines."
(if p
- (scroll-window window (- p))
+ (scroll-window window (- p))
(let ((height (- (window-height window)))
(overlap (- (value scroll-overlap))))
(scroll-window window (if (>= height overlap)
View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/0d968caf23929f85d360bde…
--
This project does not include diff previews in email notifications.
View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/0d968caf23929f85d360bde…
You're receiving this email because of your account on gitlab.common-lisp.net.