Skip to content

Commit

Permalink
0.7.1.27:
Browse files Browse the repository at this point in the history
	merged the first 2 (of 3) patches from CSR "x86, format, types"
		patches (sbcl-devel 2002-02-27)
  • Loading branch information
William Harold Newman committed Mar 1, 2002
1 parent 28d9bb7 commit 816248a
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 11 deletions.
2 changes: 1 addition & 1 deletion src/code/debug.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -722,7 +722,7 @@ reset to ~S."
(dolist (restart restarts)
(let ((name (restart-name restart)))
(cond ((member name names-used)
(format s "~& ~2D: ~@VT~A~%" count max-name-len restart))
(format s "~& ~2D: ~V@T~A~%" count max-name-len restart))
(t
(format s "~& ~2D: [~VA] ~A~%"
count (- max-name-len 3) name restart)
Expand Down
17 changes: 15 additions & 2 deletions src/code/late-format.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,17 @@
:complaint "String ended before directive was found."
:control-string string
:offset start)
(schar string posn))))
(schar string posn)))
(check-ordering ()
(when (or colonp atsignp)
(error 'format-error
:complaint "parameters found after #\\: or #\\@ modifier"
:control-string string
:offset posn))))
(loop
(let ((char (get-char)))
(cond ((or (char<= #\0 char #\9) (char= char #\+) (char= char #\-))
(check-ordering)
(multiple-value-bind (param new-posn)
(parse-integer string :start posn :junk-allowed t)
(push (cons posn param) params)
Expand All @@ -87,7 +94,9 @@
(decf posn))
(t
(return)))))
((or (char= char #\v) (char= char #\V))
((or (char= char #\v)
(char= char #\V))
(check-ordering)
(push (cons posn :arg) params)
(incf posn)
(case (get-char)
Expand All @@ -97,6 +106,7 @@
(t
(return))))
((char= char #\#)
(check-ordering)
(push (cons posn :remaining) params)
(incf posn)
(case (get-char)
Expand All @@ -106,12 +116,14 @@
(t
(return))))
((char= char #\')
(check-ordering)
(incf posn)
(push (cons posn (get-char)) params)
(incf posn)
(unless (char= (get-char) #\,)
(decf posn)))
((char= char #\,)
(check-ordering)
(push (cons posn nil) params))
((char= char #\:)
(if colonp
Expand All @@ -129,6 +141,7 @@
(setf atsignp t)))
(t
(when (char= (schar string (1- posn)) #\,)
(check-ordering)
(push (cons (1- posn) nil) params))
(return))))
(incf posn))
Expand Down
2 changes: 1 addition & 1 deletion src/code/ntrace.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@
(dolist (entry *traced-entries*)
(when (cdr entry) (incf depth)))
(format t
"~@V,0T~W: "
"~V,0@T~W: "
(+ (mod (* depth *trace-indentation-step*)
(- *max-trace-indentation* *trace-indentation-step*))
*trace-indentation-step*)
Expand Down
4 changes: 2 additions & 2 deletions src/compiler/ir1tran.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -1165,7 +1165,7 @@
(unless (symbolp name)
(compiler-error "The lambda variable ~S is not a symbol." name))
(when (member name names-so-far :test #'eq)
(compiler-error "The variable ~S occurs more than once in the lambda-list."
(compiler-error "The variable ~S occurs more than once in the lambda list."
name))
(let ((kind (info :variable :kind name)))
(when (or (keywordp name) (eq kind :constant))
Expand Down Expand Up @@ -1197,7 +1197,7 @@
(eq (arg-info-kind info) :keyword)
(eq (arg-info-key info) key))
(compiler-error
"The keyword ~S appears more than once in the lambda-list."
"The keyword ~S appears more than once in the lambda list."
key))))
key))

Expand Down
5 changes: 1 addition & 4 deletions src/compiler/x86/float.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -4013,8 +4013,6 @@
;; Perhaps this is OK because of the #!+LONG-FLOAT wrapped around
;; an enormous PROGN above. Still, it would be probably be good to
;; add some code to warn about redefining VOPs.
;; FIXME 2: See comments on DEFINE-VOP FLOG1P :GUARD above.
(:guard #!+pentium nil #!-pentium t)
(:note "inline log1p function")
(:ignore temp)
(:generator 5
Expand Down Expand Up @@ -4068,8 +4066,7 @@
(:arg-types long-float)
(:result-types long-float)
(:policy :fast-safe)
;; FIXME: See comments on DEFINE-VOP FLOG1P :GUARD above.
(:guard #!+pentium t #!-pentium)
(:guard (member :pentium-style-fyl2xp1 *backend-subfeatures*))
(:note "inline log1p function")
(:generator 5
(sc-case x
Expand Down
2 changes: 1 addition & 1 deletion version.lisp-expr
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
;;; for internal versions, especially for internal versions off the
;;; main CVS branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)

"0.7.1.26"
"0.7.1.27"

0 comments on commit 816248a

Please sign in to comment.