From: Christophe R. <cr...@us...> - 2002-10-28 14:33:36
|
Update of /cvsroot/sbcl/sbcl/src/pcl In directory usw-pr-cvs1:/tmp/cvs-serv15278/src/pcl Modified Files: boot.lisp braid.lisp defclass.lisp defcombin.lisp defs.lisp std-class.lisp Log Message: 0.7.9.8: Change *LOAD-TRUENAME* to *LOAD-PATHNAME* throughout PCL, so as to facilitate an eventual build system which would enable the system sources to be findable when placed in an arbitrary filesystem location. Index: boot.lisp =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/pcl/boot.lisp,v retrieving revision 1.55 retrieving revision 1.56 diff -u -d -r1.55 -r1.56 --- boot.lisp 26 Oct 2002 11:22:51 -0000 1.55 +++ boot.lisp 28 Oct 2002 14:33:29 -0000 1.56 @@ -239,7 +239,7 @@ (apply #'ensure-generic-function fun-name :lambda-list lambda-list - :definition-source `((defgeneric ,fun-name) ,*load-truename*) + :definition-source `((defgeneric ,fun-name) ,*load-pathname*) initargs)) ;;; As per section 3.4.2 of the ANSI spec, generic function lambda @@ -1306,7 +1306,7 @@ :definition-source `((defmethod ,gf-spec ,@qualifiers ,specializers) - ,*load-truename*) + ,*load-pathname*) initargs))) (unless (or (eq method-class 'standard-method) (eq (find-class method-class nil) (class-of method))) @@ -1764,7 +1764,7 @@ (!bootstrap-set-slot 'standard-generic-function fin 'source - *load-truename*) + *load-pathname*) (set-fun-name fin spec) (let ((arg-info (make-arg-info))) (setf (early-gf-arg-info fin) arg-info) Index: braid.lisp =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/pcl/braid.lisp,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- braid.lisp 22 Jun 2002 15:15:29 -0000 1.22 +++ braid.lisp 28 Oct 2002 14:33:30 -0000 1.23 @@ -243,7 +243,7 @@ smc name value))) - (set-slot 'source *load-truename*) + (set-slot 'source *load-pathname*) (set-slot 'type 'standard) (set-slot 'documentation "The standard method combination.") (set-slot 'options ())) Index: defclass.lisp =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/pcl/defclass.lisp,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- defclass.lisp 14 Aug 2002 13:26:00 -0000 1.23 +++ defclass.lisp 28 Oct 2002 14:33:30 -0000 1.24 @@ -400,7 +400,7 @@ canonical-options (copy-tree canonical-options)) (let ((ecd (make-early-class-definition name - *load-truename* + *load-pathname* metaclass supers canonical-slots Index: defcombin.lisp =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/pcl/defcombin.lisp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- defcombin.lisp 31 Aug 2002 01:19:51 -0000 1.12 +++ defcombin.lisp 28 Oct 2002 14:33:31 -0000 1.13 @@ -74,7 +74,7 @@ ',type ',operator ',identity-with-one-arg ',documentation))) (defun load-short-defcombin (type operator ioa doc) - (let* ((truename *load-truename*) + (let* ((pathname *load-pathname*) (specializers (list (find-class 'generic-function) (intern-eql-specializer type) @@ -95,7 +95,7 @@ (short-combine-methods type options operator ioa new-method doc)) args)) - :definition-source `((define-method-combination ,type) ,truename))) + :definition-source `((define-method-combination ,type) ,pathname))) (when old-method (remove-method #'find-method-combination old-method)) (add-method #'find-method-combination new-method))) @@ -215,7 +215,7 @@ :documentation doc)) args)) :definition-source `((define-method-combination ,type) - ,*load-truename*)))) + ,*load-pathname*)))) (setf (gethash type *long-method-combination-functions*) function) (when old-method (remove-method #'find-method-combination old-method)) (add-method #'find-method-combination new-method))) Index: defs.lisp =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/pcl/defs.lisp,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- defs.lisp 9 Oct 2002 17:03:33 -0000 1.21 +++ defs.lisp 28 Oct 2002 14:33:31 -0000 1.22 @@ -472,7 +472,7 @@ (defclass definition-source-mixin (std-object) ((source - :initform *load-truename* + :initform *load-pathname* :reader definition-source :initarg :definition-source)) (:metaclass std-class)) Index: std-class.lisp =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/pcl/std-class.lisp,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- std-class.lisp 15 Oct 2002 09:23:21 -0000 1.28 +++ std-class.lisp 28 Oct 2002 14:33:31 -0000 1.29 @@ -320,7 +320,7 @@ :direct-superclasses supers :direct-slots slots :definition-source `((defclass ,name) - ,*load-truename*) + ,*load-pathname*) other))) ;; Defclass of a class with a forward-referenced superclass does not ;; have a wrapper. RES is the incomplete PCL class. The Lisp class |