@@ -104,7 +104,7 @@

 ;;; AKCL's SETF brokenly tries to macroexpand the place

-;;; form before looking for a define-setf-method.  Redefine the

+;;; form before looking for a define-setf-expander  Redefine the

 ;;; internal function to do the right thing.

 #+akcl

@@ -120,7 +120,7 @@

 ;;; Allegro has renamed this stuff as per ANSI CL.

-#+allegro

+#+(or cmu allegro)

 (eval-when (eval compile load)

   (setf (macro-function 'define-setf-method)

 	(macro-function 'define-setf-expander))

@@ -147,7 +147,7 @@

 (define-mumble-macro mumble::dynamic (name)

   `(locally (declare (special ,name)) ,name))

-(define-setf-method mumble::dynamic (name)

+(define-setf-expander mumble::dynamic (name)

   (let ((store  (gensym)))

     (values nil

 	    nil

@@ -441,7 +441,7 @@

 (define-mumble-import last)

 (define-mumble-import butlast)

-(define-setf-method mumble::list-ref (list n)

+(define-setf-expander mumble::list-ref (list n)

   (get-setf-method `(nth ,n ,list)))

 (define-mumble-function-inline mumble::memq (object list)

@@ -566,7 +566,7 @@

 (define-mumble-function-inline mumble::string-ref (x n)

   (the character (schar (the simple-string x) (the fixnum n))))

-(define-setf-method mumble::string-ref (string n)

+(define-setf-expander mumble::string-ref (string n)

   (get-setf-method `(schar ,string ,n)))

 (define-mumble-synonym mumble::string=? string=)

@@ -628,7 +628,7 @@

 (define-mumble-function-inline mumble::vector-ref (x n)

   (svref (the simple-vector x) (the fixnum n)))

-(define-setf-method mumble::vector-ref (vector n)

+(define-setf-expander mumble::vector-ref (vector n)

   (get-setf-method `(svref ,vector ,n)))

 (define-mumble-function-inline mumble::vector->list (vector)

@@ -722,7 +722,7 @@

 (define-mumble-function-inline mumble::table-entry (table key)

   (gethash key table))

-(define-setf-method mumble::table-entry (table key)

+(define-setf-expander mumble::table-entry (table key)

   (get-setf-method `(gethash ,key ,table)))

 (define-mumble-synonym mumble::table-for-each maphash)

@@ -6,6 +6,10 @@

 ;;; All of the files loaded here are assumed to be regular Common Lisp

 ;;; files.

+(eval-when (:load-toplevel :compile-toplevel :execute)

+  (unless (find-package "MUMBLE-IMPLEMENTATION")

+    (make-package "MUMBLE-IMPLEMENTATION" :use '("LISP"))))

+

 (in-package "MUMBLE-IMPLEMENTATION")

@@ -114,13 +118,14 @@

 ;;; Environment variables in pathnames may not be supported by the

 ;;; host Lisp.

-#-mcl (progn

-        (defvar *support-directory* "cl-support/")

-        (defvar *support-binary-directory*

-          (concatenate 'string 

-                       *support-directory* 

-                       *lisp-implementation-name*

-                       "/")))

+#-mcl

+(progn

+  (defvar *support-directory* "cl-support/")

+  (defvar *support-binary-directory*

+    (concatenate 'string 

+		 *support-directory* 

+		 *lisp-implementation-name*

+		 "/")))

 (defun load-compiled-cl-file (filename)

   (let ((source-file (concatenate 'string

@@ -131,11 +136,14 @@

 				  *support-binary-directory*

 				  filename

 				  *lisp-binary-file-type*)))

+    (format t "~&CWD: ~a~%" (truename "."))

     (if (or (not (probe-file binary-file))

 	    (< (file-write-date binary-file) (file-write-date source-file)))

 	(compile-file source-file :output-file (merge-pathnames binary-file)))

     (load binary-file)))

+(eval-when (:load-toplevel :compile-toplevel :execute)

+  (trace load-compiled-cl-file))

 ;;; Do NOT change the load order of these files.

@@ -412,7 +412,7 @@

 		    ;; the BOA constructor.  Bogus!!!

 		    ;; If you do this in WCL, it will just quietly ignore

 		    ;; the BOA.

-		    #-(or akcl wcl) (:constructor nil)

+		    #-(or cmu akcl wcl) (:constructor nil)

 		    (:constructor ,(td-%constructor td) ,(make-boa-args slots))

 		    (:predicate ,predicate)

 		    (:copier    nil))

@@ -6,7 +6,7 @@

 cd $Y2

 $CMUCL <<EOF

 (setf ext:*bytes-consed-between-gcs* 4000000)

-(proclaim '(optimize (speed 3) (safety 0) (debug 0) (ext:inhibit-warnings 3)))

+(proclaim '(optimize (speed 0) (safety 0) (debug 3) (ext:inhibit-warnings 0)))

 (load "cl-support/cl-init")

 (quit)

 EOF

@@ -8,20 +8,20 @@ setenv HASKELL_LIBRARY $HASKELL/progs/lib

 # You may need to change this to point at the appropriate subdirectory,

 # depending on which Lisp is being used.

-setenv PRELUDEBIN $PRELUDE/lucid

-#setenv PRELUDEBIN $PRELUDE/cmu

+#setenv PRELUDEBIN $PRELUDE/lucid

+setenv PRELUDEBIN $PRELUDE/cmu

 # You may need to change this to point at the appropriate subdirectory,

 # depending on which Lisp is being used.

-setenv LIBRARYBIN $HASKELL_LIBRARY/bin/lucid

-#setenv LIBRARYBIN $HASKELL_LIBRARY/bin/cmu

+#setenv LIBRARYBIN $HASKELL_LIBRARY/bin/lucid

+setenv LIBRARYBIN $HASKELL_LIBRARY/bin/cmu

 # You may need to change this to point at the appropriate executable,

 # depending on which Lisp is being used.

-setenv HASKELLPROG $HASKELL/bin/haskell

-#setenv HASKELLPROG $HASKELL/bin/cmu-haskell

+#setenv HASKELLPROG $HASKELL/bin/haskell

+setenv HASKELLPROG $HASKELL/bin/cmu-haskell

 # You only need this next definition if you are using the CMU CL version

 # of haskell and you have /tmp mounted on a tmpfs file system (it won't

 # be able to initialize itself otherwise).

-setenv CMUCL_EMPTYFILE /var/tmp/empty

+#setenv CMUCL_EMPTYFILE /var/tmp/empty