diff --git a/code/exports.lisp b/code/exports.lisp index 924ff7f1acc710a9f3a26b2ecf51581608927e92..980f4f63f9464934a16127a2340f858e8081607b 100644 --- a/code/exports.lisp +++ b/code/exports.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/exports.lisp,v 1.179 2001/02/21 14:48:34 dtc Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/exports.lisp,v 1.180 2001/03/13 02:10:27 pw Exp $") ;;; ;;; ********************************************************************** ;;; @@ -362,8 +362,8 @@ "COMPILATION-SPEED" "COMPILE" "COMPILE-FILE" "COMPILE-FILE-PATHNAME" "COMPILED-FUNCTION" "COMPILED-FUNCTION-P" - "COMPILER-MACRO" "COMPILER-MACRO-FUNCTION" "COMPILER-MACROEXPAND" - "COMPILER-MACROEXPAND-1" "COMPLEMENT" "COMPLEX" + "COMPILER-MACRO" "COMPILER-MACRO-FUNCTION" + "COMPLEMENT" "COMPLEX" "COMPLEXP" "COMPUTE-RESTARTS" "CONCATENATE" "CONCATENATED-STREAM" "CONCATENATED-STREAM-STREAMS" "COND" "CONDITION" @@ -375,7 +375,7 @@ "COUNT-IF-NOT" "CTYPECASE" "DEBUG" "DECF" "DECLAIM" "DECLARATION" "DECLARE" "DECODE-FLOAT" "DECODE-UNIVERSAL-TIME" "DEFCONSTANT" "DEFINE-COMPILER-MACRO" "DEFINE-CONDITION" - "DEFINE-MODIFY-MACRO" "DEFINE-SETF-METHOD" "DEFINE-SYMBOL-MACRO" + "DEFINE-MODIFY-MACRO" "DEFINE-SYMBOL-MACRO" "DEFMACRO" "DEFPACKAGE" "DEFPARAMETER" "DEFSETF" "DEFSTRUCT" "DEFTYPE" "DEFUN" "DEFVAR" "DELETE" "DELETE-DUPLICATES" "DELETE-FILE" "DELETE-IF" @@ -412,7 +412,6 @@ "GENTEMP" "GET" "GET-DECODED-TIME" "GET-DISPATCH-MACRO-CHARACTER" "GET-INTERNAL-REAL-TIME" "GET-INTERNAL-RUN-TIME" "GET-MACRO-CHARACTER" "GET-OUTPUT-STREAM-STRING" "GET-PROPERTIES" - "GET-SETF-METHOD" "GET-SETF-METHOD-MULTIPLE-VALUE" "GET-UNIVERSAL-TIME" "GETF" "GETHASH" "GO" "GRAPHIC-CHAR-P" "HANDLER-BIND" "HANDLER-CASE" "HASH-TABLE" "HASH-TABLE-COUNT" "HASH-TABLE-P" "HASH-TABLE-REHASH-THRESHOLD" @@ -443,9 +442,7 @@ "LIST-LENGTH" "LISTEN" "LISTP" "LOAD" "LOAD-LOGICAL-PATHNAME-TRANSLATIONS" "LOAD-TIME-VALUE" "LOCALLY" "LOG" "LOGAND" "LOGANDC1" "LOGANDC2" "LOGBITP" "LOGCOUNT" "LOGEQV" - "LOGICAL-PATHNAME" - "LOGICAL-PATHNAME-P" - "LOGICAL-PATHNAME-TRANSLATIONS" + "LOGICAL-PATHNAME" "LOGICAL-PATHNAME-TRANSLATIONS" "LOGIOR" "LOGNAND" "LOGNOR" "LOGNOT" "LOGORC1" "LOGORC2" "LOGTEST" "LOGXOR" "LONG-FLOAT" "LONG-FLOAT-EPSILON" "LONG-FLOAT-NEGATIVE-EPSILON" "LONG-SITE-NAME" "LOOP" @@ -517,7 +514,7 @@ "SIMPLE-BIT-VECTOR-P" "SIMPLE-CONDITION" "SIMPLE-CONDITION-FORMAT-ARGUMENTS" "SIMPLE-CONDITION-FORMAT-CONTROL" - "SIMPLE-CONDITION-FORMAT-STRING" "SIMPLE-ERROR" + "SIMPLE-ERROR" "SIMPLE-STRING" "SIMPLE-STRING-P" "SIMPLE-TYPE-ERROR" "SIMPLE-VECTOR" "SIMPLE-VECTOR-P" "SIMPLE-WARNING" "SIN" "SINGLE-FLOAT" "SINGLE-FLOAT-EPSILON" @@ -570,8 +567,8 @@ "COMPUTE-APPLICABLE-METHODS" "DEFCLASS" "DEFGENERIC" "DEFINE-METHOD-COMBINATION" "DEFMETHOD" "DESCRIBE-OBJECT" "ENSURE-GENERIC-FUNCTION" - "FIND-METHOD" "FUNCTION-KEYWORDS" "GENERIC-FLET" - "GENERIC-LABELS" "INITIALIZE-INSTANCE" "INVALID-METHOD-ERROR" + "FIND-METHOD" "FUNCTION-KEYWORDS" + "INITIALIZE-INSTANCE" "INVALID-METHOD-ERROR" "MAKE-INSTANCE" "MAKE-INSTANCES-OBSOLETE" "METHOD-COMBINATION-ERROR" "METHOD-QUALIFIERS" "NEXT-METHOD-P" "NO-APPLICABLE-METHOD" "NO-NEXT-METHOD" "PRINT-OBJECT" @@ -580,11 +577,9 @@ "SLOT-UNBOUND" "SLOT-VALUE" "STANDARD" "STANDARD-CLASS" "STANDARD-GENERIC-FUNCTION" "STANDARD-METHOD" "STANDARD-OBJECT" "UPDATE-INSTANCE-FOR-DIFFERENT-CLASS" - "UPDATE-INSTANCE-FOR-REDEFINED-CLASS" "WITH-ACCESSORS" - "WITH-ADDED-METHODS" "WITH-SLOTS" + "UPDATE-INSTANCE-FOR-REDEFINED-CLASS" "WITH-ACCESSORS" "WITH-SLOTS" "MAKE-METHOD" "UNBOUND-SLOT" "UNBOUND-SLOT-INSTANCE" "CELL-ERROR-NAME" - "HASH-TABLE-WEAK-P" "GET-SETF-EXPANSION" "STYLE-WARNING" "PRINT-NOT-READABLE-OBJECT" "DEFINE-SETF-EXPANDER" "PRINT-NOT-READABLE" "METHOD" diff --git a/code/macros.lisp b/code/macros.lisp index b30b1597e6d252c6b3e6a6976be7390c4b79ad9a..580b17fd229ef72ab38da62d0f20c164b0f886cd 100644 --- a/code/macros.lisp +++ b/code/macros.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/macros.lisp,v 1.66 2001/03/03 16:50:08 pw Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/macros.lisp,v 1.67 2001/03/13 02:10:28 pw Exp $") ;;; ;;; ********************************************************************** ;;; @@ -24,9 +24,7 @@ get-setf-expansion define-setf-expander define-modify-macro destructuring-bind nth-value otherwise ; Sacred to CASE and related macros. - define-compiler-macro - ;; CLtL1 versions: - define-setf-method get-setf-method get-setf-method-multiple-value)) + define-compiler-macro)) (in-package "EXTENSIONS") (export '(do-anonymous collect iterate)) diff --git a/code/pathname.lisp b/code/pathname.lisp index 2fa0d58a9dc6070a8fb2e252cdcf22b34ac65a46..616a52a2dddf1c8cda3a9757cac593657d0ec0c8 100644 --- a/code/pathname.lisp +++ b/code/pathname.lisp @@ -4,7 +4,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/pathname.lisp,v 1.44 2001/03/11 22:02:24 pw Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/pathname.lisp,v 1.45 2001/03/13 02:10:29 pw Exp $") ;;; ;;; ********************************************************************** ;;; @@ -17,7 +17,7 @@ (in-package "LISP") -(export '(pathname pathnamep logical-pathname logical-pathname-p +(export '(pathname pathnamep logical-pathname parse-namestring merge-pathnames make-pathname pathname-host pathname-device pathname-directory pathname-name pathname-type pathname-version namestring file-namestring diff --git a/code/pprint.lisp b/code/pprint.lisp index 478beb378733e08961764c2106f5f419ba0247af..9afec5b26a5da7a00613edd3ea0df3092f77947f 100644 --- a/code/pprint.lisp +++ b/code/pprint.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/pprint.lisp,v 1.27 2000/12/27 15:42:40 dtc Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/pprint.lisp,v 1.28 2001/03/13 02:10:30 pw Exp $") ;;; ;;; ********************************************************************** ;;; @@ -1408,7 +1408,7 @@ (with-pretty-stream (stream) (funcall (pprint-dispatch object) stream object))) -(defparameter magic-forms +(defparameter *magic-forms* '((lambda pprint-lambda) ;; Special forms. (block pprint-block) @@ -1417,8 +1417,6 @@ (eval-when pprint-block) (flet pprint-flet) (function pprint-quote) - (generic-flet pprint-flet) - (generic-labels pprint-flet) (labels pprint-flet) (let pprint-let) (let* pprint-let) @@ -1435,7 +1433,6 @@ (tagbody pprint-tagbody) (throw pprint-block) (unwind-protect pprint-block) - (with-added-methods pprint-flet) ;; Macros. (case pprint-case) @@ -1503,7 +1500,7 @@ #'pprint-function-call -1) (set-pprint-dispatch 'cons #'pprint-fill -2) ;; Cons cells with interesting things for the car. - (dolist (magic-form magic-forms) + (dolist (magic-form *magic-forms*) (set-pprint-dispatch `(cons (eql ,(first magic-form))) (symbol-function (second magic-form)))) ;; Other pretty-print init forms.