[Openmcl-cvs-notifications] r11856 - in /release/1.3/source: compiler/X86/x86-backend.lisp compiler/X86/x86-lap.lisp compiler/vreg.lisp level-1/l1-clos-boot.lisp level-1/l1-error-system.lisp lib/macros.lisp lib/method-combination.lisp library/loop.lisp tools/defsystem.lisp
rme at clozure.com
rme at clozure.com
Sat Mar 28 00:49:44 EDT 2009
Author: rme
Date: Sat Mar 28 00:49:44 2009
New Revision: 11856
Log:
Port r11810 (fixes to various format/warn/etc. calls) to 1.3 branch.
Modified:
release/1.3/source/compiler/X86/x86-backend.lisp
release/1.3/source/compiler/X86/x86-lap.lisp
release/1.3/source/compiler/vreg.lisp
release/1.3/source/level-1/l1-clos-boot.lisp
release/1.3/source/level-1/l1-error-system.lisp
release/1.3/source/lib/macros.lisp
release/1.3/source/lib/method-combination.lisp
release/1.3/source/library/loop.lisp
release/1.3/source/tools/defsystem.lisp
Modified: release/1.3/source/compiler/X86/x86-backend.lisp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- release/1.3/source/compiler/X86/x86-backend.lisp (original)
+++ release/1.3/source/compiler/X86/x86-backend.lisp Sat Mar 28 00:49:44 20=
09
@@ -262,7 +262,7 @@
(setq index base base nil)))
(if (not (or disp base index))
(setq disp (simplify-simple-operand =
head))
- (error "~s not expected in ~s" op))=
)))
+ (error "~s not expected in ~s" head =
op)))))
(if (and (null (cdr form))
(or disp base index))
(progn
@@ -271,7 +271,7 @@
(setq index base base nil)))
(if (not (or disp base index))
(setq disp (simplify-simple-operand hea=
d))
- (error "~s not expected in ~s" op)))))=
)))
+ (error "~s not expected in ~s" head op)=
)))))))
(simplify-operand (op)
(cond ((atom op)
(simplify-simple-operand op))
Modified: release/1.3/source/compiler/X86/x86-lap.lisp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- release/1.3/source/compiler/X86/x86-lap.lisp (original)
+++ release/1.3/source/compiler/X86/x86-lap.lisp Sat Mar 28 00:49:44 2009
@@ -669,7 +669,7 @@
;; A segment register - if present - must be first
(if (eq f form)
(setq seg (svref x86::*x86-seg-entries* (x86::reg-entry-reg-=
num r))) =
- (error "Segment register ~s not valid in ~s" form))
+ (error "Segment register ~s not valid in ~s" head form))
;; Some other register. Assume base if this is the
;; first gpr. If we find only one gpr and a significant
;; scale factor, make that single gpr be the index.
Modified: release/1.3/source/compiler/vreg.lisp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- release/1.3/source/compiler/vreg.lisp (original)
+++ release/1.3/source/compiler/vreg.lisp Sat Mar 28 00:49:44 2009
@@ -281,7 +281,7 @@
(use-node-temp vreg-value)
(when result-p (note-vinsn-sets-gpr vinsn vreg-value)))))
(unless (or (eq class 't) (vreg-ok-for-storage-class vreg class))
- (warn "~s was expected to have storage class matching specifie=
r ~s" class))
+ (warn "~s was expected to have storage class matching specifie=
r ~s" vreg class))
(when value
(if (atom value)
(match-vreg-value vreg-value value)
Modified: release/1.3/source/level-1/l1-clos-boot.lisp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- release/1.3/source/level-1/l1-clos-boot.lisp (original)
+++ release/1.3/source/level-1/l1-clos-boot.lisp Sat Mar 28 00:49:44 2009
@@ -679,7 +679,7 @@
(error "~s is not a subtype of ~s." method-class *method-class*)))
(when declarations
(unless (list-length declarations)
- (error "~s is not a proper list")))
+ (error "~s is not a proper list" declarations)))
;; Fix APO, lambda-list
(if apo-p
(if (not ll-p)
Modified: release/1.3/source/level-1/l1-error-system.lisp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- release/1.3/source/level-1/l1-error-system.lisp (original)
+++ release/1.3/source/level-1/l1-error-system.lisp Sat Mar 28 00:49:44 2009
@@ -987,7 +987,8 @@
:report (lambda (s)
(if (=3D 1 (length other-functions))
(format s "Apply ~s to ~S this time." (firs=
t other-functions) args)
- (format s "Apply one of ~{~S or ~} to ~S th=
is time.")))
+ (format s "Apply one of ~{~S or ~} to ~S th=
is time."
+ other-functions args)))
:interactive (lambda ()
(if (=3D 1 (length other-functions))
other-functions
Modified: release/1.3/source/lib/macros.lisp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- release/1.3/source/lib/macros.lisp (original)
+++ release/1.3/source/lib/macros.lisp Sat Mar 28 00:49:44 2009
@@ -2777,7 +2777,7 @@
(setq stream-symbol '*standard-output*))
(when (and prefixp per-line-prefix-p)
(warn "prefix ~S and per-line-prefix ~S cannot both be specified ~
- in PPRINT-LOGICAL-BLOCK")
+ in PPRINT-LOGICAL-BLOCK" prefix per-line-prefix)
(setq per-line-prefix nil))
`(let ((*logical-block-p* t))
(maybe-initiate-xp-printing
Modified: release/1.3/source/lib/method-combination.lisp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- release/1.3/source/lib/method-combination.lisp (original)
+++ release/1.3/source/lib/method-combination.lisp Sat Mar 28 00:49:44 2009
@@ -683,7 +683,7 @@
(case (car o-tail)
(:most-specific-last)
(:most-specific-first (setf (car res-tail) (nreverse (car res-tail=
))))
- (t (error "~s is neither ~s nor ~s" :most-specific-first :most-spe=
cific-last)))
+ (t (error "~s is neither ~s nor ~s" (car o-tail) :most-specific-fi=
rst :most-specific-last)))
(when (car r-tail)
(unless (car res-tail)
; should use DESCRIPTIONS here
Modified: release/1.3/source/library/loop.lisp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- release/1.3/source/library/loop.lisp (original)
+++ release/1.3/source/library/loop.lisp Sat Mar 28 00:49:44 2009
@@ -1910,7 +1910,7 @@
(check-type which (member hash-key hash-value))
(cond ((or (cdr prep-phrases) (not (member (caar prep-phrases) '(:in :of=
))))
(loop-error "Too many prepositions!"))
- ((null prep-phrases) (loop-error "Missing OF or IN in ~S iteration path."=
)))
+ ((null prep-phrases) (loop-error "Missing OF or IN in iteration path." )))
(let ((ht-var (loop-gentemp 'loop-hashtab-))
(next-fn (loop-gentemp 'loop-hashtab-next-))
(dummy-predicate-var nil)
Modified: release/1.3/source/tools/defsystem.lisp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- release/1.3/source/tools/defsystem.lisp (original)
+++ release/1.3/source/tools/defsystem.lisp Sat Mar 28 00:49:44 2009
@@ -2570,7 +2570,7 @@
;; string. So if case matters in the filename, use strings, not
;; symbols, wherever the system is named.
(when (foreign-system-p system)
- (warn "Foreing system ~S cannot be reloaded by MK:DEFSYSTEM.")
+ (warn "Foreign system ~S cannot be reloaded by MK:DEFSYSTEM."=
system)
(return-from find-system nil))
(let ((path (compute-system-path system-name definition-pname)))
(when (and path
@@ -2592,7 +2592,7 @@
(:load
(or (unless *reload-systems-from-disk* (get-system system-name))
(when (foreign-system-p (get-system system-name))
- (warn "Foreign system ~S cannot be reloaded by MK:DEFSYSTEM.")
+ (warn "Foreign system ~S cannot be reloaded by MK:DEFSYSTEM." s=
ystem-name)
(return-from find-system nil))
(or (find-system system-name :load-or-nil definition-pname)
(error "Can't find system named ~s." system-name))))))
More information about the Openmcl-cvs-notifications
mailing list