Sophie

Sophie

distrib > Fedora > 13 > i386 > media > updates-src > by-pkgid > 14136f842c46f58edd010f3cfe224ce6 > files > 4

pvs-sbcl-4.2-4.20100126svn.fc13.src.rpm

diff -dur pvs-4.2.ORIG/ess/allegro-runtime.lisp pvs-4.2/ess/allegro-runtime.lisp
--- pvs-4.2.ORIG/ess/allegro-runtime.lisp	2006-09-12 13:46:53.000000000 -0600
+++ pvs-4.2/ess/allegro-runtime.lisp	2010-01-04 13:32:05.215925367 -0700
@@ -1,5 +1,5 @@
 #+allegro
-(eval-when (eval load)
+(eval-when (:execute :load-toplevel)
   (setq system:*load-search-list*
 	(list #p"" #p(:type "lfasl") #p(:type "cl") #p(:type "lisp"))))
 (defvar *ess-path*
diff -dur pvs-4.2.ORIG/ess/lang/ab-term/rel/af-runtime.lisp pvs-4.2/ess/lang/ab-term/rel/af-runtime.lisp
--- pvs-4.2.ORIG/ess/lang/ab-term/rel/af-runtime.lisp	2009-01-23 14:03:38.023198000 -0700
+++ pvs-4.2/ess/lang/ab-term/rel/af-runtime.lisp	2010-01-04 13:32:05.215925367 -0700
@@ -25,7 +25,7 @@
 ;;;     07-22-87	rln	Initial development release.
 ;;;
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (unless (find-package "AF-RUNTIME-LIB")
     (make-package "AF-RUNTIME-LIB"
 		  :nicknames '("ABRT" "AFRT")
diff -dur pvs-4.2.ORIG/ess/lang/ab-term/rel/af-top.lisp pvs-4.2/ess/lang/ab-term/rel/af-top.lisp
--- pvs-4.2.ORIG/ess/lang/ab-term/rel/af-top.lisp	2009-01-23 14:03:38.023198000 -0700
+++ pvs-4.2/ess/lang/ab-term/rel/af-top.lisp	2010-01-04 13:32:05.216926010 -0700
@@ -85,7 +85,7 @@
 	   nil))))
 
 
-(eval-when (compile eval)
+(eval-when (:compile-toplevel :execute)
 
 (defmacro ab-read-line ()
   `(string-trim '(#\space #\tab) (read-line)))
diff -dur pvs-4.2.ORIG/ess/lang/sb-term/rel/access.lisp pvs-4.2/ess/lang/sb-term/rel/access.lisp
--- pvs-4.2.ORIG/ess/lang/sb-term/rel/access.lisp	2010-01-04 13:30:14.576611529 -0700
+++ pvs-4.2/ess/lang/sb-term/rel/access.lisp	2010-01-04 13:32:05.217738919 -0700
@@ -132,7 +132,7 @@
 		*sb-package*))))
 
 
-(eval-when (compile eval load)
+(eval-when (:compile-toplevel :execute :load-toplevel)
 
   ;; The following were originally destructive versions of the above, but my
   ;; timing tests show that you don't gain that much and I'm worried about
@@ -197,7 +197,7 @@
 	nil)))
 
 
-(eval-when (compile eval load)
+(eval-when (:compile-toplevel :execute :load-toplevel)
 
 (defmacro grammar-new-line-comment-char (grammar)
   `(grammar-comment-chars 0 ,grammar))
@@ -357,7 +357,7 @@
 	pat))
 
 
-(eval-when (compile eval load)
+(eval-when (:compile-toplevel :execute :load-toplevel)
 
 (defmacro get-nt-slot-total (nt-term)
   `(get-sb-attr ,nt-term 'slots))
@@ -436,7 +436,7 @@
 
 	 
 	
-(eval-when (compile eval load)
+(eval-when (:compile-toplevel :execute :load-toplevel)
 	
 (defmacro get-nt-left-bracket (nt-name grammar)
   `(get-nt-bracket ,nt-name ,grammar 'left-bracket))
@@ -485,7 +485,7 @@
 
 ;;; Precedence access (con.)
 
-(eval-when (compile eval load)
+(eval-when (:compile-toplevel :execute :load-toplevel)
 (defmacro get-nt-prec-initials (nt-name grammar)
   `(nth 0 (get-nt-prec ,nt-name ,grammar)))
 (defmacro get-nt-prec-medial-lefts (nt-name grammar)
@@ -604,7 +604,7 @@
 
 (defparameter pattern-ops (make-hash-table :test #'eq :size (expt 2 8)))
 
-(eval-when (load eval)
+(eval-when (:load-toplevel :execute)
   (mapcar #'(lambda (x)
 	      (setf (gethash x pattern-ops) t))
 	  pattern-op-list))
@@ -750,7 +750,7 @@
 		    (ds-id (term-arg1 pat))))))))
 
 
-(eval-when (compile eval load)
+(eval-when (:compile-toplevel :execute :load-toplevel)
 
 (defmacro pattern-tag (pat)    
   `(pattern-name ,pat))
@@ -875,7 +875,7 @@
     pat))
 
 
-(eval-when (compile eval load)
+(eval-when (:compile-toplevel :execute :load-toplevel)
   ;; There is a compiler error for mapcan.
   (defun map-pattern (pat funct)
     (if (pattern-p pat)
@@ -927,7 +927,7 @@
 
 (defparameter augment-ops (make-hash-table :test #'eq :size (expt 2 8)))
 
-(eval-when (load eval)
+(eval-when (:load-toplevel :execute)
   (mapcar #'(lambda (x)
 	      (setf (gethash x augment-ops) t))
 	  augment-op-list))
@@ -1005,7 +1005,7 @@
 
 
 
-(eval-when (compile eval load)
+(eval-when (:compile-toplevel :execute :load-toplevel)
 
 (defmacro augment-args (aug)
   `(augment-sons ,aug))
diff -dur pvs-4.2.ORIG/ess/lang/sb-term/rel/access-par.lisp pvs-4.2/ess/lang/sb-term/rel/access-par.lisp
--- pvs-4.2.ORIG/ess/lang/sb-term/rel/access-par.lisp	2009-01-23 14:03:38.023198000 -0700
+++ pvs-4.2/ess/lang/sb-term/rel/access-par.lisp	2010-01-04 13:32:05.218926226 -0700
@@ -49,7 +49,7 @@
 
 
 
-(eval-when (compile eval load)
+(eval-when (:compile-toplevel :execute :load-toplevel)
 
 (defmacro atomic (pat)
   `(memq (get-kind ,pat)
diff -dur pvs-4.2.ORIG/ess/lang/sb-term/rel/aux-funs.lisp pvs-4.2/ess/lang/sb-term/rel/aux-funs.lisp
--- pvs-4.2.ORIG/ess/lang/sb-term/rel/aux-funs.lisp	2009-01-23 14:03:38.023198000 -0700
+++ pvs-4.2/ess/lang/sb-term/rel/aux-funs.lisp	2010-01-04 13:32:05.219780041 -0700
@@ -127,7 +127,7 @@
 
 
 
-(eval-when (compile eval load)
+(eval-when (:compile-toplevel :execute :load-toplevel)
 (defmacro sb-write (&rest write-calls)
   `(let ((*package* *sb-package*)
 	 (*print-level* nil)
@@ -331,7 +331,7 @@
   (sb-intern-nupcase (format nil "V~D" x)))
 
 
-(eval-when (load compile eval)
+(eval-when (:load-toplevel :compile-toplevel :execute)
 
 (defmacro get-number (fragment)
   `(car ,fragment))
diff -dur pvs-4.2.ORIG/ess/lang/sb-term/rel/flatten.lisp pvs-4.2/ess/lang/sb-term/rel/flatten.lisp
--- pvs-4.2.ORIG/ess/lang/sb-term/rel/flatten.lisp	2009-01-23 14:03:38.023198000 -0700
+++ pvs-4.2/ess/lang/sb-term/rel/flatten.lisp	2010-01-04 13:32:05.220926450 -0700
@@ -365,7 +365,7 @@
 
 (defun make-and (as-list)
       ; get rid of extra nulls.
-  (delete-if #'null as-list)
+  (setq as-list (delete-if #'null as-list))
   (if (> (length as-list) 1)
       (make-augment :kind 'and :args as-list)
       (car as-list)))
diff -dur pvs-4.2.ORIG/ess/lang/sb-term/rel/new-rt-format.lisp pvs-4.2/ess/lang/sb-term/rel/new-rt-format.lisp
--- pvs-4.2.ORIG/ess/lang/sb-term/rel/new-rt-format.lisp	2009-01-23 14:03:38.023198000 -0700
+++ pvs-4.2/ess/lang/sb-term/rel/new-rt-format.lisp	2010-01-04 13:32:05.221783462 -0700
@@ -48,7 +48,7 @@
 (defvar *sb-fontheight* sb-deffontheight)
 
 
-(eval-when (compile eval load)
+(eval-when (:compile-toplevel :execute :load-toplevel)
 
 (defmacro sb-chars-to-pixels (chars)
   `(* (the fixnum *sb-fontwidth*) ,chars))
@@ -95,7 +95,7 @@
 					; Changes if original nesting will not
 					; work. 
 
-(eval-when (compile eval load)
+(eval-when (:compile-toplevel :execute :load-toplevel)
 (defmacro indent-width (units)
   `(* *indent-unit-width* ,units)))
 
@@ -301,7 +301,7 @@
   )
 
 
-(eval-when (compile eval load)
+(eval-when (:compile-toplevel :execute :load-toplevel)
 (defmacro tinfo-bp-value (tinfo)
   `(bp-value (tinfo-bp ,tinfo)))
 (defmacro tinfo-bp-united-flag (tinfo)
diff -dur pvs-4.2.ORIG/ess/lang/sb-term/rel/old-rt-format.lisp pvs-4.2/ess/lang/sb-term/rel/old-rt-format.lisp
--- pvs-4.2.ORIG/ess/lang/sb-term/rel/old-rt-format.lisp	2009-01-23 14:03:38.023198000 -0700
+++ pvs-4.2/ess/lang/sb-term/rel/old-rt-format.lisp	2010-01-04 13:32:05.222926189 -0700
@@ -48,7 +48,7 @@
 (defvar *sb-fontheight* sb-deffontheight)
 
 
-(eval-when (compile eval load)
+(eval-when (:compile-toplevel :execute :load-toplevel)
 
 (defmacro sb-chars-to-pixels (chars)
   `(* *sb-fontwidth* ,chars))
@@ -93,7 +93,7 @@
 					; Changes if original nesting will not
 					; work. 
 
-(eval-when (compile eval load)
+(eval-when (:compile-toplevel :execute :load-toplevel)
 (defmacro indent-width (units)
   `(* *indent-unit-width* ,units)))
 
@@ -293,7 +293,7 @@
   )
 
 
-(eval-when (compile eval load)
+(eval-when (:compile-toplevel :execute :load-toplevel)
 (defmacro tinfo-bp-value (tinfo)
   `(bp-value (tinfo-bp ,tinfo)))
 (defmacro tinfo-bp-united-flag (tinfo)
diff -dur pvs-4.2.ORIG/ess/lang/sb-term/rel/old-rt-unparse.lisp pvs-4.2/ess/lang/sb-term/rel/old-rt-unparse.lisp
--- pvs-4.2.ORIG/ess/lang/sb-term/rel/old-rt-unparse.lisp	1994-10-04 20:10:52.000000000 -0600
+++ pvs-4.2/ess/lang/sb-term/rel/old-rt-unparse.lisp	2010-01-04 13:32:05.223778102 -0700
@@ -133,7 +133,7 @@
 ;;; Generic macros. 
 
 
-(eval-when (compile eval load)
+(eval-when (:compile-toplevel :execute :load-toplevel)
 
 (defmacro dis-op (op x)
   `(equal ,op
@@ -158,7 +158,7 @@
 ;;; Stack routines for unparsing abstract syntax. 
 
 
-(eval-when (compile eval load)
+(eval-when (:compile-toplevel :execute :load-toplevel)
 
 (defmacro init-as-stack ()
   nil)
@@ -596,7 +596,7 @@
 
 
 
-(eval-when (compile eval load)
+(eval-when (:compile-toplevel :execute :load-toplevel)
 
 (defmacro dis-lt (kind as)
   `(funcall *apply-LT-dis-fun*
@@ -827,7 +827,7 @@
 
 
 
-(eval-when (compile eval load)
+(eval-when (:compile-toplevel :execute :load-toplevel)
 
 (defmacro nt-unp (nt-name as body)
   `(let* ((*uterm-nt-name* ,nt-name)
diff -dur pvs-4.2.ORIG/ess/lang/sb-term/rel/old-rt-unp-structs.lisp pvs-4.2/ess/lang/sb-term/rel/old-rt-unp-structs.lisp
--- pvs-4.2.ORIG/ess/lang/sb-term/rel/old-rt-unp-structs.lisp	2009-01-23 14:03:38.023198000 -0700
+++ pvs-4.2/ess/lang/sb-term/rel/old-rt-unp-structs.lisp	2010-01-04 13:32:05.224644692 -0700
@@ -107,7 +107,7 @@
       (format stream "#<oct>")))
 
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
 
 (defmacro width (oct)
   `(- (rightx ,oct) (leftx ,oct)))
@@ -175,7 +175,7 @@
 					;(format stream "#<aw>")
 
 
-(eval-when (compile eval load)
+(eval-when (:compile-toplevel :execute :load-toplevel)
 
 (defmacro aw-term (aw)
   `(uterm-term (aw-uterm ,aw)))
diff -dur pvs-4.2.ORIG/ess/lang/sb-term/rel/rt-format.lisp pvs-4.2/ess/lang/sb-term/rel/rt-format.lisp
--- pvs-4.2.ORIG/ess/lang/sb-term/rel/rt-format.lisp	2001-06-26 04:46:33.000000000 -0600
+++ pvs-4.2/ess/lang/sb-term/rel/rt-format.lisp	2010-01-04 13:32:05.225646042 -0700
@@ -48,7 +48,7 @@
 (defvar *sb-fontheight* sb-deffontheight)
 
 
-(eval-when (compile eval load)
+(eval-when (:compile-toplevel :execute :load-toplevel)
 
 (defmacro sb-chars-to-pixels (chars)
   `(* *sb-fontwidth* ,chars))
@@ -93,7 +93,7 @@
 					; Changes if original nesting will not
 					; work. 
 
-(eval-when (compile eval load)
+(eval-when (:compile-toplevel :execute :load-toplevel)
 (defmacro indent-width (units)
   `(* *indent-unit-width* ,units)))
 
@@ -293,7 +293,7 @@
   )
 
 
-(eval-when (compile eval load)
+(eval-when (:compile-toplevel :execute :load-toplevel)
 (defmacro tinfo-bp-value (tinfo)
   `(bp-value (tinfo-bp ,tinfo)))
 (defmacro tinfo-bp-united-flag (tinfo)
diff -dur pvs-4.2.ORIG/ess/lang/sb-term/rel/rt-lex.lisp pvs-4.2/ess/lang/sb-term/rel/rt-lex.lisp
--- pvs-4.2.ORIG/ess/lang/sb-term/rel/rt-lex.lisp	2009-01-23 14:03:38.023198000 -0700
+++ pvs-4.2/ess/lang/sb-term/rel/rt-lex.lisp	2010-01-04 13:32:05.225646042 -0700
@@ -49,7 +49,7 @@
 ;;; export different symbols from the LISP package, so it is important that
 ;;; the SBST package does not use the LISP package, so we can get repeatable
 ;;; behavior on different machines.
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (defvar *sbst-package* 
     (cond ((find-package "SBST"))
 	  (t
diff -dur pvs-4.2.ORIG/ess/lang/sb-term/rel/rt-parse-mac.lisp pvs-4.2/ess/lang/sb-term/rel/rt-parse-mac.lisp
--- pvs-4.2.ORIG/ess/lang/sb-term/rel/rt-parse-mac.lisp	2001-06-26 04:46:33.000000000 -0600
+++ pvs-4.2/ess/lang/sb-term/rel/rt-parse-mac.lisp	2010-01-04 13:32:05.226643105 -0700
@@ -43,7 +43,7 @@
 (export '(rbp))
 
 
-(eval-when (compile eval load)
+(eval-when (:compile-toplevel :execute :load-toplevel)
 
 ;;; Determine whether this entry in a fs-list allows an epsilon for the second 
 ;;; token. The "rt" in the name is to avoid a name conflict with an SB routine
@@ -73,7 +73,7 @@
 ;;; otherwise error and return nil.  It isn't clear whether the original code
 ;;; always returned nil when an error occurred.
 
-(eval-when (compile eval load)
+(eval-when (:compile-toplevel :execute :load-toplevel)
 
 (defmacro lam (fs-list &body code)
   (if code
diff -dur pvs-4.2.ORIG/ess/lang/sb-term/rel/rt-term.lisp pvs-4.2/ess/lang/sb-term/rel/rt-term.lisp
--- pvs-4.2.ORIG/ess/lang/sb-term/rel/rt-term.lisp	2009-07-30 23:54:17.224091000 -0600
+++ pvs-4.2/ess/lang/sb-term/rel/rt-term.lisp	2010-01-04 13:32:05.228636235 -0700
@@ -33,7 +33,7 @@
 ;;; the SBST package does not use the LISP package, so we can get repeatable
 ;;; behavior on different machines.
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (defvar *sbst-package* 
     (cond ((find-package "SBST"))
 	  (t
diff -dur pvs-4.2.ORIG/ess/lang/sb-term/rel/rt-unparse.lisp pvs-4.2/ess/lang/sb-term/rel/rt-unparse.lisp
--- pvs-4.2.ORIG/ess/lang/sb-term/rel/rt-unparse.lisp	2009-01-23 14:03:38.023198000 -0700
+++ pvs-4.2/ess/lang/sb-term/rel/rt-unparse.lisp	2010-01-04 13:32:05.229637055 -0700
@@ -135,7 +135,7 @@
 ;;; Generic macros. 
 
 
-(eval-when (compile eval load)
+(eval-when (:compile-toplevel :execute :load-toplevel)
 
 (defmacro dis-op (op x)
   `(equal ,op
@@ -160,7 +160,7 @@
 ;;; Stack routines for unparsing abstract syntax. 
 
 
-(eval-when (compile eval load)
+(eval-when (:compile-toplevel :execute :load-toplevel)
 
 (defmacro init-as-stack ()
   nil)
@@ -602,7 +602,7 @@
 
 
 
-(eval-when (compile eval load)
+(eval-when (:compile-toplevel :execute :load-toplevel)
 
 (defmacro dis-lt (kind as)
   `(funcall *apply-lt-dis-fun*
@@ -836,7 +836,7 @@
 
 
 
-(eval-when (compile eval load)
+(eval-when (:compile-toplevel :execute :load-toplevel)
 
 (defmacro nt-unp (nt-name as body)
   `(let* ((*uterm-nt-name* ,nt-name)
diff -dur pvs-4.2.ORIG/ess/lang/sb-term/rel/rt-unp-structs.lisp pvs-4.2/ess/lang/sb-term/rel/rt-unp-structs.lisp
--- pvs-4.2.ORIG/ess/lang/sb-term/rel/rt-unp-structs.lisp	2009-01-23 14:03:38.023198000 -0700
+++ pvs-4.2/ess/lang/sb-term/rel/rt-unp-structs.lisp	2010-01-04 13:32:05.229637055 -0700
@@ -107,7 +107,7 @@
       (format stream "#<oct>")))
 
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
 
 (defmacro width (oct)
   `(- (rightx ,oct) (leftx ,oct)))
@@ -176,7 +176,7 @@
 					;(format stream "#<aw>")
 
 
-(eval-when (compile eval load)
+(eval-when (:compile-toplevel :execute :load-toplevel)
 
 (defmacro aw-term (aw)
   `(uterm-term (aw-uterm ,aw)))
diff -dur pvs-4.2.ORIG/ess/lang/sb-term/rel/unparse-gen.lisp pvs-4.2/ess/lang/sb-term/rel/unparse-gen.lisp
--- pvs-4.2.ORIG/ess/lang/sb-term/rel/unparse-gen.lisp	2004-12-08 16:07:08.000000000 -0700
+++ pvs-4.2/ess/lang/sb-term/rel/unparse-gen.lisp	2010-01-04 13:32:05.230617604 -0700
@@ -17,7 +17,7 @@
 (in-package :syntax-box)  (use-package :ergolisp)
 
 
-(eval-when (eval compile load)
+(eval-when (:execute :compile-toplevel :load-toplevel)
 
 (defmacro map-append (function &rest lists)
   `(do ((list-to-append
@@ -68,7 +68,7 @@
 		      string)))))
 
 
-(eval-when (compile eval load)
+(eval-when (:compile-toplevel :execute :load-toplevel)
 
 (defmacro mk-bracket-table-name ()
   `(mk-conc-var-name "BRACKET-INFO"))
@@ -248,7 +248,7 @@
 
 
 
-(eval-when (compile eval load)
+(eval-when (:compile-toplevel :execute :load-toplevel)
 (defmacro keyword-intern (x)
   `(let ((x ,x))
      (intern (if (stringp x)
@@ -983,7 +983,7 @@
       t))
 
     ((plus star and)
-     (error "Illegal augment for choose-discriminator:" aug))
+     (error "Illegal augment for choose-discriminator:~%~S~%" aug))
 
     (term-const 
      (cond ((has-elist-arg? aug)	; routines imported from sort-gen.
diff -dur pvs-4.2.ORIG/ess/sys/constr/rel/constr.lisp pvs-4.2/ess/sys/constr/rel/constr.lisp
--- pvs-4.2.ORIG/ess/sys/constr/rel/constr.lisp	2006-08-02 01:36:30.000000000 -0600
+++ pvs-4.2/ess/sys/constr/rel/constr.lisp	2010-01-04 13:32:05.231695899 -0700
@@ -31,7 +31,7 @@
 image).  This doesn't work.  It always insists on inline expanding.")
 
 (defmacro proclaim-constrs-inline (flag)
-  `(eval-when (compile load eval)
+  `(eval-when (:compile-toplevel :load-toplevel :execute)
      (setq *proclaim-constrs-inline* ,flag)))
 
 
diff -dur pvs-4.2.ORIG/ess/sys/ergolisp/rel/dlambda.lisp pvs-4.2/ess/sys/ergolisp/rel/dlambda.lisp
--- pvs-4.2.ORIG/ess/sys/ergolisp/rel/dlambda.lisp	2009-01-23 14:03:38.023198000 -0700
+++ pvs-4.2/ess/sys/ergolisp/rel/dlambda.lisp	2010-01-04 13:32:05.232616636 -0700
@@ -117,7 +117,7 @@
 	  (values selectors (length selectors)))
     `(progn
        (defreconstr ,constr ,arg-cnt :equal ,equal)
-       (eval-when (compile load eval)
+       (eval-when (:compile-toplevel :load-toplevel :execute)
 	 (setf (get-constructor-info ',constr)
 	       (list ',sel-spec
 		     ',discrim))))))
diff -dur pvs-4.2.ORIG/ess/sys/ergolisp/rel/ergo-system.lisp pvs-4.2/ess/sys/ergolisp/rel/ergo-system.lisp
--- pvs-4.2.ORIG/ess/sys/ergolisp/rel/ergo-system.lisp	2006-08-02 01:36:30.000000000 -0600
+++ pvs-4.2/ess/sys/ergolisp/rel/ergo-system.lisp	2010-01-04 13:32:05.233642604 -0700
@@ -128,7 +128,7 @@
     (when (probe-file file-name)
       (rename-file file-name next-file-name))))
 
-(eval-when (compile eval load)
+(eval-when (:compile-toplevel :execute :load-toplevel)
   (defmacro ergo-ignore-if-unused (&rest vars)
     #+excl				; for allegro
     nil ;;`(declare (excl:ignore-if-unused ,@vars))
diff -dur pvs-4.2.ORIG/ess/sys/ergolisp/rel/type-check.lisp pvs-4.2/ess/sys/ergolisp/rel/type-check.lisp
--- pvs-4.2.ORIG/ess/sys/ergolisp/rel/type-check.lisp	2006-08-02 01:36:30.000000000 -0600
+++ pvs-4.2/ess/sys/ergolisp/rel/type-check.lisp	2010-01-04 13:32:05.233642604 -0700
@@ -48,7 +48,7 @@
   "Expands to nothing, but saves something on the property list of
 NAME.  This can be used on the top level, or as the first thing in
 a DEFUN."
-  `(eval-when (compile load eval)
+  `(eval-when (:compile-toplevel :load-toplevel :execute)
      (setf (get ',name 'type-info) (cons ',argtypes ',resulttypes))))
 
 (defmacro declare-ftype (name argtypes &rest resulttypes)
diff -dur pvs-4.2.ORIG/ess/sys/tools/rel/box.lisp pvs-4.2/ess/sys/tools/rel/box.lisp
--- pvs-4.2.ORIG/ess/sys/tools/rel/box.lisp	2006-08-02 01:36:30.000000000 -0600
+++ pvs-4.2/ess/sys/tools/rel/box.lisp	2010-01-04 13:32:05.234646805 -0700
@@ -269,7 +269,7 @@
 (defun \#> ()
   (set-dispatch-macro-character #\# #\> #'box-reader))
 
-(eval-when (load eval)
+(eval-when (:load-toplevel :execute)
   (\#>))
 
 (defun box-cerror (continue-string format-string &rest args)
@@ -327,7 +327,7 @@
 
 (def-disksave-hook (setq *null-output* (make-broadcast-stream)))
 
-(eval-when (load eval)
+(eval-when (:load-toplevel :execute)
   (if (streamp *null-output*)
       *null-output*
       (setq *null-output* (make-broadcast-stream))))
diff -dur pvs-4.2.ORIG/ess/sys/tools/rel/retry.lisp pvs-4.2/ess/sys/tools/rel/retry.lisp
--- pvs-4.2.ORIG/ess/sys/tools/rel/retry.lisp	2006-08-02 01:36:30.000000000 -0600
+++ pvs-4.2/ess/sys/tools/rel/retry.lisp	2010-01-04 13:32:05.235631096 -0700
@@ -21,7 +21,7 @@
 
 ;;; First a lucid 2.1 bug workaround.
 #+(or (and lucid (not lcl3.0)) harlequin-common-lisp)
-(eval-when (load compile eval)
+(eval-when (:load-toplevel :compile-toplevel :execute)
   (dolist (s '("*catchers*" "retry" "retry-catch" "reinit-retry-catch"))
     (export (list (intern s :lisp)) :lisp)))
 
diff -dur pvs-4.2.ORIG/ess/term/attr/rel/attr-lang.lisp pvs-4.2/ess/term/attr/rel/attr-lang.lisp
--- pvs-4.2.ORIG/ess/term/attr/rel/attr-lang.lisp	1994-10-05 14:23:17.000000000 -0600
+++ pvs-4.2/ess/term/attr/rel/attr-lang.lisp	2010-01-04 13:32:05.236634549 -0700
@@ -30,7 +30,7 @@
 (defmacro defcon (con-name lang-name &optional (doc-string ""))
   "Predefines a context."
   (let ((deltafun (deltafun-fam-name con-name :global)))
-    `(eval-when (compile load eval)
+    `(eval-when (:compile-toplevel :load-toplevel :execute)
        (setf (gethash ',con-name *context-table*)
 	     (make-context-family
 	      :name ',con-name
@@ -42,7 +42,7 @@
 (defmacro defsyn (syn-name lang-name con-name &optional (doc-string ""))
   "Predefines a syntext depending on a context."
   (let ((compfun (compfun-fam-name syn-name :global)))
-    `(eval-when (compile load eval)
+    `(eval-when (:compile-toplevel :load-toplevel :execute)
        (let* ((con
 	       (sometable-lookup ',con-name *context-table*
 				 ,(format nil "The context ~S on which the syntext ~~S
@@ -63,7 +63,7 @@
 (defmacro defattr (attr-name lang-name syn-name &optional (doc-string ""))
   "Predefines an attribute by declaring the syntext it depends on."
   (let ((attrfun (attrfun-fam-name attr-name :global)))
-    `(eval-when (compile load eval)
+    `(eval-when (:compile-toplevel :load-toplevel :execute)
        (let* ((syn
 	       (sometable-lookup ',syn-name *syntext-table*
 				 ,(format nil "The syntext ~S on which the attribute ~~S
diff -dur pvs-4.2.ORIG/ess/term/attr/rel/attr-lib.lisp pvs-4.2/ess/term/attr/rel/attr-lib.lisp
--- pvs-4.2.ORIG/ess/term/attr/rel/attr-lib.lisp	1994-10-05 14:23:17.000000000 -0600
+++ pvs-4.2/ess/term/attr/rel/attr-lib.lisp	2010-01-04 13:32:05.236634549 -0700
@@ -22,7 +22,7 @@
 
 (defconstant undefined 'undefined)
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
 
 (defun is-underline (form)
   (and (symbolp form) (string-equal (symbol-name form) "_")))
diff -dur pvs-4.2.ORIG/ess/term/attr/rel/attr-sort.lisp pvs-4.2/ess/term/attr/rel/attr-sort.lisp
--- pvs-4.2.ORIG/ess/term/attr/rel/attr-sort.lisp	2006-08-02 01:36:30.000000000 -0600
+++ pvs-4.2/ess/term/attr/rel/attr-sort.lisp	2010-01-04 13:32:05.237636052 -0700
@@ -116,7 +116,7 @@
 	  (mapcar #'(lambda (sort)
 		      (cons sort (deltafun-fam-name confam-name sort)))
 		  sortlist)))
-    `(eval-when (compile load eval)
+    `(eval-when (:compile-toplevel :load-toplevel :execute)
        (setf (gethash ',confam-name *context-table*)
 	     (make-context-family
 	      :name ',confam-name
@@ -143,7 +143,7 @@
 (defmacro defsynfam (synfam-name lang-name confam-name
 				 &optional (doc-string ""))
   "Predefines a syntext family depending on a context family."
-  `(eval-when (compile load eval)
+  `(eval-when (:compile-toplevel :load-toplevel :execute)
      (let* ((con-fam
 	     (sometable-lookup ',confam-name *context-table*
 			       ,(format nil "The context family ~S on which the syntext family ~~S
@@ -187,7 +187,7 @@
 (defmacro defattrfam (attrfam-name lang-name synfam-name
 				   &optional (doc-string ""))
   "Predefines an attribute family depending on a syntext family."
-  `(eval-when (compile load eval)
+  `(eval-when (:compile-toplevel :load-toplevel :execute)
      (let* ((syn-fam
 	     (sometable-lookup ',synfam-name *syntext-table*
 			       ,(format nil "The syntext family ~S on which the attribute family ~~S
diff -dur pvs-4.2.ORIG/ess/term/language/rel/languages.lisp pvs-4.2/ess/term/language/rel/languages.lisp
--- pvs-4.2.ORIG/ess/term/language/rel/languages.lisp	2009-01-23 14:03:38.023198000 -0700
+++ pvs-4.2/ess/term/language/rel/languages.lisp	2010-01-04 13:32:05.238575834 -0700
@@ -137,7 +137,7 @@
 
 
 
-(eval-when (compile eval load)
+(eval-when (:compile-toplevel :execute :load-toplevel)
   (defmacro not-empty-str? (s)
     `(not (string= ,s ""))))
 
@@ -176,7 +176,7 @@
 
 
 
-(eval-when (compile eval load)
+(eval-when (:compile-toplevel :execute :load-toplevel)
 
   (defmacro lang-name (lang)
     `(lang-struct-name ,lang))
diff -dur pvs-4.2.ORIG/ess/term/terms/rel/occur.lisp pvs-4.2/ess/term/terms/rel/occur.lisp
--- pvs-4.2.ORIG/ess/term/terms/rel/occur.lisp	2006-08-02 01:36:30.000000000 -0600
+++ pvs-4.2/ess/term/terms/rel/occur.lisp	2010-01-04 13:32:05.239646579 -0700
@@ -118,7 +118,7 @@
 
 
 
-(eval-when (compile eval load)
+(eval-when (:compile-toplevel :execute :load-toplevel)
 
   (defmacro nil-occ ()
     "Returns the empty occurrence."
@@ -181,7 +181,7 @@
 					; doc. 
 
 
-(eval-when (compile eval load)
+(eval-when (:compile-toplevel :execute :load-toplevel)
   (defmacro occ-rest (occ)
     "Synonym for occ-parent."
     `(occ-parent ,occ))
@@ -266,7 +266,7 @@
 (defun ergolisp::\#q ()
   (set-dispatch-macro-character #\# #\q #'read-list-to-occ))
 
-(eval-when (load eval)
+(eval-when (:load-toplevel :execute)
   (ergolisp::\#q))
 
 
diff -dur pvs-4.2.ORIG/ess/term/terms/rel/opers.lisp pvs-4.2/ess/term/terms/rel/opers.lisp
--- pvs-4.2.ORIG/ess/term/terms/rel/opers.lisp	2006-08-02 01:36:30.000000000 -0600
+++ pvs-4.2/ess/term/terms/rel/opers.lisp	2010-01-04 13:32:05.239646579 -0700
@@ -295,7 +295,7 @@
 (defun ergolisp::\#^ ()
   (set-dispatch-macro-character #\# #\^ #'read-sexp-to-oper))
 
-(eval-when (load eval)
+(eval-when (:load-toplevel :execute)
   (ergolisp::\#^))
 
 
diff -dur pvs-4.2.ORIG/ess/term/terms/rel/sorts.lisp pvs-4.2/ess/term/terms/rel/sorts.lisp
--- pvs-4.2.ORIG/ess/term/terms/rel/sorts.lisp	2006-08-02 01:36:30.000000000 -0600
+++ pvs-4.2/ess/term/terms/rel/sorts.lisp	2010-01-04 13:32:05.240644987 -0700
@@ -484,7 +484,7 @@
 (defun ergolisp::\#t ()
   (set-dispatch-macro-character #\# #\t #'read-sexp-to-ttype))
 
-(eval-when (load eval)
+(eval-when (:load-toplevel :execute)
   (ergolisp::\#t))
 
 
@@ -504,7 +504,7 @@
 (defun ergolisp::\#\@ ()
   (set-dispatch-macro-character #\# #\@ #'read-sexp-to-opsig))
 
-(eval-when (load eval)
+(eval-when (:load-toplevel :execute)
   (ergolisp::\#\@))
 
 
@@ -710,7 +710,7 @@
 
 
 
-(eval-when (load)
+(eval-when (:load-toplevel)
   (setq *global-sort-table* (make-sort-table))
   (setq *global-opsig-table* (make-opsig-table)))
 
diff -dur pvs-4.2.ORIG/ess/term/terms/rel/terms.lisp pvs-4.2/ess/term/terms/rel/terms.lisp
--- pvs-4.2.ORIG/ess/term/terms/rel/terms.lisp	2006-08-02 01:36:30.000000000 -0600
+++ pvs-4.2/ess/term/terms/rel/terms.lisp	2010-01-04 13:32:05.241642494 -0700
@@ -80,7 +80,7 @@
 	    "The term ~S does not have a ~dth argument" term n)
     (elt args n)))
 
-(eval-when (compile eval load)
+(eval-when (:compile-toplevel :execute :load-toplevel)
   (defmacro term-arg0 (term)
     "Get the 0th argument (child) of a term"
     `(term-argn ,term 0))
@@ -122,7 +122,7 @@
   "Number of TERM's arguments (sons)."
   (length (term-args term)))
 
-(eval-when (compile eval load)
+(eval-when (:compile-toplevel :execute :load-toplevel)
   (defmacro term-arity0? (term)
     "Does TERM have 0 arguments?"
     `(eql (term-arity ,term) 0))
@@ -258,6 +258,6 @@
 (defun ergolisp::\#! ()
   (set-dispatch-macro-character #\# #\! #'read-sexp-to-term))
 
-(eval-when (load eval)
+(eval-when (:load-toplevel :execute)
   (ergolisp::\#!))
 
diff -dur pvs-4.2.ORIG/ess/term/trep/rel/attr-prims.lisp pvs-4.2/ess/term/trep/rel/attr-prims.lisp
--- pvs-4.2.ORIG/ess/term/trep/rel/attr-prims.lisp	2009-01-23 14:03:38.023198000 -0700
+++ pvs-4.2/ess/term/trep/rel/attr-prims.lisp	2010-01-04 13:32:05.241642494 -0700
@@ -19,7 +19,7 @@
 ;;; features from the terms, so it is the default method for storing
 ;;; attributes.
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (unless (find-package "TERM")
     (make-package "TERM" :nicknames '("GTERM")
 			 :use '(:cl-user :common-lisp :ergolisp))))
diff -dur pvs-4.2.ORIG/ess/term/trep/rel/gterm.lisp pvs-4.2/ess/term/trep/rel/gterm.lisp
--- pvs-4.2.ORIG/ess/term/trep/rel/gterm.lisp	2009-01-23 14:03:38.023198000 -0700
+++ pvs-4.2/ess/term/trep/rel/gterm.lisp	2010-01-04 13:32:05.242647427 -0700
@@ -29,7 +29,7 @@
 ;;; instead of a real operator.
 ;;; 
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (unless (find-package "TERM")
     (make-package "TERM" :nicknames '("GTERM")
                          :use '(:cl-user :common-lisp :ergolisp))))
diff -dur pvs-4.2.ORIG/pvs-config.lisp pvs-4.2/pvs-config.lisp
--- pvs-4.2.ORIG/pvs-config.lisp	2010-01-04 01:42:48.463502000 -0700
+++ pvs-4.2/pvs-config.lisp	2010-01-04 13:32:05.242647427 -0700
@@ -41,7 +41,7 @@
       ;; Assume this is loaded while cd'd to the PVS directory 
       (namestring (truename *default-pathname-defaults*))))
 
-(eval-when (eval load)
+(eval-when (:execute :load-toplevel)
   (defvar *pvs-platform*
     (let ((cmd (format nil "~a/bin/pvs-platform" *pvs-path*)))
       #+allegro (car (excl.osi:command-output cmd))
@@ -104,7 +104,7 @@
   )
 
 #+sbcl
-(eval-when (eval load)
+(eval-when (:execute :load-toplevel)
   (setq sb-c::*fasl-file-type* *pvs-binary-type*))
 
 #+allegro
diff -dur pvs-4.2.ORIG/pvs.system pvs-4.2/pvs.system
--- pvs-4.2.ORIG/pvs.system	2009-07-30 23:54:43.972932000 -0600
+++ pvs-4.2/pvs.system	2010-01-04 13:32:05.243641533 -0700
@@ -76,11 +76,11 @@
 	*print-pretty* t))
 
 #+sbcl
-(eval-when (eval load)
+(eval-when (:execute :load-toplevel)
   (setq *compile-verbose* nil)
   (setq *compile-print* nil))
 
-(eval-when (eval load)
+(eval-when (:execute :load-toplevel)
   ;; This sets *pvs-path* and sets *pvs-binary-type*
   (load "pvs-config.lisp")
   #+allegro (chdir *pvs-path*))
diff -dur pvs-4.2.ORIG/src/defcl.lisp pvs-4.2/src/defcl.lisp
--- pvs-4.2.ORIG/src/defcl.lisp	2009-02-10 14:07:16.072144000 -0700
+++ pvs-4.2/src/defcl.lisp	2010-01-04 13:32:05.243641533 -0700
@@ -38,7 +38,7 @@
   nil)
 
 #+gcl
-(eval-when (eval compile load)
+(eval-when (:execute :compile-toplevel :load-toplevel)
   (defmacro ignore-errors (&body forms)
     `(progn ,@forms)))
 
@@ -84,7 +84,7 @@
     (proclaim '(inline ,(intern (format nil "~a?" name))))
     (defun ,(intern (format nil "~a?" name)) (obj)
       (typep obj ',name))
-    (eval-when (eval compile load)
+    (eval-when (:execute :compile-toplevel :load-toplevel)
       (setq *slot-info*
 	    (cons (cons ',name
 			'(,classes ,args))
@@ -164,7 +164,7 @@
       obj
       (apply #'copy obj initargs)))
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (defun remove-keyword (key list)
     (let ((tail (member key list)))
       (if tail
@@ -327,7 +327,7 @@
 ;(defmethod eequal (obj1 obj2)
 ;  (equal obj1 obj2))
 
-(eval-when (eval compile load)
+(eval-when (:execute :compile-toplevel :load-toplevel)
   (unless (fboundp 'memq)
     (defun memq (elt list)
       (member elt list :test #'eq))))
diff -dur pvs-4.2.ORIG/src/defsystem.lisp pvs-4.2/src/defsystem.lisp
--- pvs-4.2.ORIG/src/defsystem.lisp	2010-01-04 13:30:14.582611539 -0700
+++ pvs-4.2/src/defsystem.lisp	2010-01-04 13:32:05.245651845 -0700
@@ -834,7 +834,7 @@
 ;;; Massage CLtL2 onto *features* **
 ;;; ********************************
 ;;; Let's be smart about CLtL2 compatible Lisps:
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   #+(or (and allegro-version>= (version>= 4 0)) :mcl :sbcl)
   (pushnew :cltl2 *features*))
 
@@ -1027,7 +1027,7 @@
 #+(and :cltl2 (not (or :cmu :clisp :sbcl
 		       (and :excl (or :allegro-v4.0 :allegro-v4.1))
 		       :mcl)))
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (unless (find-package "MAKE")
     (make-package "MAKE" :nicknames '("MK") :use '("COMMON-LISP"))))
 
@@ -1046,7 +1046,7 @@
   (:nicknames :mk))
 
 #+(or :cltl2 :lispworks :scl)
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (in-package "MAKE"))
 
 #+ecl
@@ -1106,7 +1106,7 @@
 ;;; the compile form, so that you can't use a defvar with a default value and
 ;;; then a succeeding export as well.
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (defvar *special-exports* nil)
   (defvar *exports* nil)
   (defvar *other-exports* nil)
@@ -1397,7 +1397,7 @@
 ;;; ********************************
 
 ;;; Massage people's *features* into better shape.
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (dolist (feature *features*)
     (when (and (symbolp feature)   ; 3600
                (equal (symbol-name feature) "CMU"))
@@ -1522,7 +1522,7 @@
 
 ;;; mc 11-Apr-91: Bashes MCL's point reader, so commented out.
 #-:mcl
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   ;; Define #@"foo" as a shorthand for (afs-binary-directory "foo").
   ;; For example,
   ;;    <cl> #@"foo"
@@ -5134,7 +5134,7 @@
 	    (t
 	     nil)))))
 
-(eval-when (load eval)
+(eval-when (:load-toplevel :execute)
 (component-operation :clean    'delete-binaries-operation)
 (component-operation 'clean    'delete-binaries-operation)
 (component-operation :delete-binaries     'delete-binaries-operation)
diff -dur pvs-4.2.ORIG/src/globals.lisp pvs-4.2/src/globals.lisp
--- pvs-4.2.ORIG/src/globals.lisp	2010-01-04 13:30:14.583612346 -0700
+++ pvs-4.2/src/globals.lisp	2010-01-04 13:32:05.247646832 -0700
@@ -69,7 +69,7 @@
   (let ((end (position #\space excl::cl-release-date :from-end t)))
     (subseq excl::cl-release-date 0 end)))
 
-(eval-when (eval compile load)
+(eval-when (:execute :compile-toplevel :load-toplevel)
   (defparameter *pvs-version* "4.3")
 
   ;; Not used in PVS sources, but may be useful for patches, strategies, etc.
diff -dur pvs-4.2.ORIG/src/interface/allegro.lisp pvs-4.2/src/interface/allegro.lisp
--- pvs-4.2.ORIG/src/interface/allegro.lisp	2007-10-13 18:27:31.785169000 -0600
+++ pvs-4.2/src/interface/allegro.lisp	2010-01-04 13:32:05.255617163 -0700
@@ -78,7 +78,7 @@
 ;;;===========================================================================
 ;;; Epilogue
 
-(eval-when (load eval)
+(eval-when (:load-toplevel :execute)
   (unless (compiled-function-p #'ilisp-callers)
     (ilisp-message t "File is not compiled, use M-x ilisp-compile-inits")))
 
diff -dur pvs-4.2.ORIG/src/interface/cl-ilisp.lisp pvs-4.2/src/interface/cl-ilisp.lisp
--- pvs-4.2.ORIG/src/interface/cl-ilisp.lisp	2007-09-25 02:55:27.666195000 -0600
+++ pvs-4.2/src/interface/cl-ilisp.lisp	2010-01-04 13:32:05.256590085 -0700
@@ -775,7 +775,7 @@
        nil))))
 
 #-:cormanlisp
-(eval-when (load eval)
+(eval-when (:load-toplevel :execute)
   (when
       #+(and :CMU (or :CMU17 :CMU18))
       (eval:interpreted-function-p #'ilisp-matching-symbols)
diff -dur pvs-4.2.ORIG/src/macros.lisp pvs-4.2/src/macros.lisp
--- pvs-4.2.ORIG/src/macros.lisp	2006-08-15 19:08:38.000000000 -0600
+++ pvs-4.2/src/macros.lisp	2010-01-04 13:32:05.256590085 -0700
@@ -370,7 +370,7 @@
   (assert (symbolp name) () "NAME should be a symbol")
   (assert (stringp term) () "TERM should be a string")
   (assert (stringp theory) () "THEORY should be a string")
-  (eval-when (eval load)
+  (eval-when (:execute :load-toplevel)
     (let ((var (gensym))
 	  (reset-name (intern (format nil "%RESET-~a" name)))
 	  (hook (if (gethash (intern theory) *prelude*)
diff -dur pvs-4.2.ORIG/src/make-allegro-pvs.lisp pvs-4.2/src/make-allegro-pvs.lisp
--- pvs-4.2.ORIG/src/make-allegro-pvs.lisp	2008-07-22 05:15:55.475014000 -0600
+++ pvs-4.2/src/make-allegro-pvs.lisp	2010-01-04 13:32:05.257601202 -0700
@@ -26,7 +26,7 @@
 
 (in-package :cl-user)
 (defvar *pvs-path* (or (sys:getenv "PVSPATH") "."))
-(eval-when (load eval)
+(eval-when (:load-toplevel :execute)
   (require 'tpl-debug)
   #+(or runtime-standard runtime-dynamic)
   (pushnew :runtime *features*)
diff -dur pvs-4.2.ORIG/src/make-pvs-methods.lisp pvs-4.2/src/make-pvs-methods.lisp
--- pvs-4.2.ORIG/src/make-pvs-methods.lisp	2009-02-10 14:09:51.780822000 -0700
+++ pvs-4.2/src/make-pvs-methods.lisp	2010-01-04 13:32:05.258561299 -0700
@@ -29,7 +29,7 @@
 
 (in-package :cl-user)
 
-(eval-when (eval load)
+(eval-when (:execute :load-toplevel)
   ;; This sets *pvs-path* and sets *pvs-binary-type*
   (load "pvs-config.lisp"))
 
diff -dur pvs-4.2.ORIG/src/make-pvs-parser.lisp pvs-4.2/src/make-pvs-parser.lisp
--- pvs-4.2.ORIG/src/make-pvs-parser.lisp	2009-07-31 01:53:25.344382000 -0600
+++ pvs-4.2/src/make-pvs-parser.lisp	2010-01-04 13:32:05.258561299 -0700
@@ -40,7 +40,7 @@
 
 (in-package :cl-user)
 
-(eval-when (eval load)
+(eval-when (:execute :load-toplevel)
   ;; This sets *pvs-path* and sets *pvs-binary-type*
   (load "pvs-config.lisp"))
 
diff -dur pvs-4.2.ORIG/src/metering.lisp pvs-4.2/src/metering.lisp
--- pvs-4.2.ORIG/src/metering.lisp	2009-07-31 01:53:25.344382000 -0600
+++ pvs-4.2/src/metering.lisp	2010-01-04 13:32:05.258561299 -0700
@@ -289,7 +289,7 @@
 
 (progn
   #-(or sbcl cmu allegro)
-  (eval-when (compile eval)
+  (eval-when (:compile-toplevel :execute)
     (warn
      "You may want to supply implementation-specific get-time functions."))
 
@@ -320,7 +320,7 @@
 
 #-(or sbcl :cmu :lcl3.0)
 (progn
-  (eval-when (compile eval)
+  (eval-when (:compile-toplevel :execute)
     (warn "No consing will be reported unless a get-cons function is ~
            defined."))
 
@@ -401,10 +401,10 @@
 
 #-(or sbcl :cmu :lcl3.0 (and :allegro (not :coral)))
 (progn
- (eval-when (compile eval)
+ (eval-when (:compile-toplevel :execute)
    (warn
     "You may want to add an implementation-specific Required-Arguments function."))
- (eval-when (load eval)
+ (eval-when (:load-toplevel :execute)
    (defun required-arguments (name)
      (declare (ignore name))
      (values 0 t))))
@@ -547,7 +547,7 @@
 ;;; ********************************
 ;;; Encapsulate ********************
 ;;; ********************************
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
 ;; Returns a lambda expression for a function that, when called with the
 ;; function name, will set up that function for metering.
 ;;
@@ -642,7 +642,7 @@
 ;;; along with any new ones we encounter. Since we're now precomputing
 ;;; closure functions for common argument signatures, this eliminates
 ;;; the former need to call COMPILE for each monitored function.  
-(eval-when (compile eval)
+(eval-when (:compile-toplevel :execute)
    (defconstant precomputed-encapsulations 8))
 
 (defvar *existing-encapsulations* (make-hash-table :test #'equal))
diff -dur pvs-4.2.ORIG/src/prover/strategies.lisp pvs-4.2/src/prover/strategies.lisp
--- pvs-4.2.ORIG/src/prover/strategies.lisp	2010-01-02 07:27:48.897224000 -0700
+++ pvs-4.2/src/prover/strategies.lisp	2010-01-04 13:32:05.260886822 -0700
@@ -29,7 +29,7 @@
 
 (in-package :pvs)
 
-(eval-when (eval compile load)
+(eval-when (:execute :compile-toplevel :load-toplevel)
   (defun check-formals (formals &optional opt-flag)
     (or (null formals)
 	(if (eq (car formals) '&optional)
diff -dur pvs-4.2.ORIG/src/utils/file-utils.lisp pvs-4.2/src/utils/file-utils.lisp
--- pvs-4.2.ORIG/src/utils/file-utils.lisp	2006-08-03 01:03:34.000000000 -0600
+++ pvs-4.2/src/utils/file-utils.lisp	2010-01-04 13:32:05.261988137 -0700
@@ -19,12 +19,12 @@
 ;; --------------------------------------------------------------------
 
 (in-package :pvs)
-(eval-when (compile)
+(eval-when (:compile-toplevel)
   (require :foreign))
 (export '(file-exists-p directory-p read-permission? write-permission?
 			file-write-time get-file-info))
 
-(eval-when (eval compile load)
+(eval-when (:execute :compile-toplevel :load-toplevel)
 (ff:def-foreign-call fileutils___file_exists_p
     ((filename (* :char) simple-string))
   #+(version>= 6) :strings-convert #+(version>= 6) t