("src/compiler/target/nlx")
("src/compiler/target/show")
("src/compiler/target/array"
- ;; KLUDGE: Compiling this file raises alarming warnings of the form
+ ;; KLUDGE: Compiling this file for X86 raises alarming warnings of
+ ;; the form
;; Argument FOO to VOP CHECK-BOUND has SC restriction
;; DESCRIPTOR-REG which is not allowed by the operand type:
;; (:OR POSITIVE-FIXNUM)
;; these warnings are severe enough that they would ordinarily abort
;; compilation, for now we blithely ignore them and press on to more
;; pressing problems. Someday, though, it would be nice to figure out
- ;; what the problem is and fix it.. -- WHN 19990323
+ ;; what the problem is and fix it. (See the comments in
+ ;; src/compiler/x86/array for a candidate patch.) -- WHN 19990323
:ignore-failure-p)
("src/compiler/target/pred")
("src/compiler/target/type-vops")
;; subseq expansion.
(subseq foo (1+ slash) (1- end)))))
(first-colon (position #\: name))
- (last-colon (if first-colon (position #\: name :from-end t)))
- (package-name (if last-colon
+ (second-colon (if first-colon (position #\: name :start (1+ first-colon))))
+ (package-name (if first-colon
(subseq name 0 first-colon)
"COMMON-LISP-USER"))
(package (find-package package-name)))
(error 'format-error
:complaint "no package named ~S"
:args (list package-name)))
- (intern (if first-colon
- (subseq name (1+ first-colon))
- name)
+ (intern (cond
+ ((and second-colon (= second-colon (1+ first-colon)))
+ (subseq name (1+ second-colon)))
+ (first-colon
+ (subseq name (1+ first-colon)))
+ (t name))
package))))
;;; Note that the immediate SC for the index argument is disabled
;;; because it is not possible to generate a valid error code SC for
;;; an immediate value.
+;;;
+;;; FIXME: As per the KLUDGE note explaining the :IGNORE-FAILURE-P
+;;; flag in build-order.lisp-expr, compiling this file causes warnings
+;;; Argument FOO to VOP CHECK-BOUND has SC restriction
+;;; DESCRIPTOR-REG which is not allowed by the operand type:
+;;; (:OR POSITIVE-FIXNUM)
+;;; CSR's message "format ~/ /" on sbcl-devel 2002-03-12 contained
+;;; a possible patch, described as
+;;; Another patch is included more for information than anything --
+;;; removing the descriptor-reg SCs from the CHECK-BOUND vop in
+;;; x86/array.lisp seems to allow that file to compile without error[*],
+;;; and build; I haven't tested rebuilding capability, but I'd be
+;;; surprised if there were a problem. I'm not certain that this is the
+;;; correct fix, though, as the restrictions on the arguments to the VOP
+;;; aren't the same as in the sparc and alpha ports, where, incidentally,
+;;; the corresponding file builds without error currently.
+;;; Since neither of us (CSR or WHN) was quite sure that this is the
+;;; right thing, I've just recorded the patch here in hopes it might
+;;; help when someone attacks this problem again:
+;;; diff -u -r1.7 array.lisp
+;;; --- src/compiler/x86/array.lisp 11 Oct 2001 14:05:26 -0000 1.7
+;;; +++ src/compiler/x86/array.lisp 12 Mar 2002 12:23:37 -0000
+;;; @@ -76,10 +76,10 @@
+;;; (:translate %check-bound)
+;;; (:policy :fast-safe)
+;;; (:args (array :scs (descriptor-reg))
+;;; - (bound :scs (any-reg descriptor-reg))
+;;; - (index :scs (any-reg descriptor-reg #+nil immediate) :target result))
+;;; + (bound :scs (any-reg))
+;;; + (index :scs (any-reg #+nil immediate) :target result))
+;;; (:arg-types * positive-fixnum tagged-num)
+;;; - (:results (result :scs (any-reg descriptor-reg)))
+;;; + (:results (result :scs (any-reg)))
+;;; (:result-types positive-fixnum)
+;;; (:vop-var vop)
+;;; (:save-p :compute-only)
(define-vop (check-bound)
(:translate %check-bound)
(:policy :fast-safe)
(assert (string= (format nil "~1,3,8,' $" 7.3) " 007.3"))
(assert (string= (format nil "~2,3,8,'0$" 7.3) "00007.30"))
+;;; Check for symbol lookup in ~/ / directive -- double-colon was
+;;; broken in 0.7.1.36 and earlier
+(defun print-foo (stream arg colonp atsignp &rest params)
+ (declare (ignore colonp atsignp params))
+ (format stream "~d" arg))
+
+(assert (string= (format nil "~/print-foo/" 2) "2"))
+(assert (string= (format nil "~/cl-user:print-foo/" 2) "2"))
+(assert (string= (format nil "~/cl-user::print-foo/" 2) "2"))
+(assert (raises-error? (format nil "~/cl-user:::print-foo/" 2)))
+(assert (raises-error? (format nil "~/cl-user:a:print-foo/" 2)))
+(assert (raises-error? (format nil "~/a:cl-user:print-foo/" 2)))
+(assert (raises-error? (format nil "~/cl-user:print-foo:print-foo/" 2)))
+
+;;; better make sure that we get this one right, too
+(defun print-foo\:print-foo (stream arg colonp atsignp &rest params)
+ (declare (ignore colonp atsignp params))
+ (format stream "~d" arg))
+
+(assert (string= (format nil "~/cl-user:print-foo:print-foo/" 2) "2"))
+(assert (string= (format nil "~/cl-user::print-foo:print-foo/" 2) "2"))
+
;;; success
(quit :unix-status 104)
;;; 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.36"
+"0.7.1.37"
projects / sbcl.git / commitdiff