Changeset 11855

Timestamp:

Mar 28, 2009, 4:44:12 AM (11 years ago)

Author:

rme

Message:

Merge r11810 (fixes to various format/warn/etc. calls).

Location:

trunk/source

Files:

• compiler/X86/x86-backend.lisp (modified) (2 diffs)
• compiler/X86/x86-lap.lisp (modified) (1 diff)
• compiler/vreg.lisp (modified) (1 diff)
• level-1/l1-clos-boot.lisp (modified) (1 diff)
• level-1/l1-error-system.lisp (modified) (1 diff)
• lib/macros.lisp (modified) (1 diff)
• lib/method-combination.lisp (modified) (1 diff)
• library/loop.lisp (modified) (1 diff)
• tools/defsystem.lisp (modified) (2 diffs)

trunk/source/compiler/X86/x86-backend.lisp

@@ -263 +263 @@
                                     (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))
@@ -272 +272 @@
                                  (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))))))))
                      (simplify-operand (op)
                        (cond ((atom op)

trunk/source/compiler/X86/x86-lap.lisp

@@ -670 +670 @@
             (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

trunk/source/compiler/vreg.lisp

@@ -282 +282 @@
                (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 specifier ~s" class))
+            (warn "~s was expected to have storage class matching specifier ~s" vreg class))
           (when value
             (if (atom value)

trunk/source/level-1/l1-clos-boot.lisp

@@ -683 +683 @@
   (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

trunk/source/level-1/l1-error-system.lisp

@@ -988 +988 @@
                              (if (= 1 (length other-functions))
                                (format s "Apply ~s to ~S this time." (first other-functions) args)
-                               (format s "Apply one of ~{~S or ~} to ~S this time.")))
+                               (format s "Apply one of ~{~S or ~} to ~S this time."
+                                       other-functions args)))
                    :interactive (lambda ()
                                   (if (= 1 (length other-functions))

trunk/source/lib/macros.lisp

@@ -2778 +2778 @@
   (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))

trunk/source/lib/method-combination.lisp

@@ -684 +684 @@
         (: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-specific-last)))
+        (t (error "~s is neither ~s nor ~s" (car o-tail) :most-specific-first :most-specific-last)))
       (when (car r-tail)
         (unless (car res-tail)

trunk/source/library/loop.lisp

@@ -1945 +1945 @@
   (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-))

trunk/source/tools/defsystem.lisp

@@ -2575 +2575 @@
            ;; 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)))
@@ -2597 +2597 @@
      (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." system-name)
            (return-from find-system nil))
          (or (find-system system-name :load-or-nil definition-pname)