Silence 'EVAL-WHEN' warnings

ChangeLog

@@ -1,3 +1,8 @@
+2023-11-16  Qian Yun  <[email protected]>
+
+	* src/lisp/fricas-lisp.lisp, src/boot/ptyout.boot,
+	src/interp/foam_l.lisp: Silence 'EVAL-WHEN' warnings
+
 2023-11-16  Qian Yun  <[email protected]>
 
 	* src/lisp/fricas-lisp.lisp: Simplify 'ecl-foreign-call',

src/boot/compiled/btincl2.clisp

@@ -5,7 +5,7 @@
 
 ; bStreamNil:=["nullstream"]
 
-(EVAL-WHEN (EVAL LOAD) (SETQ |bStreamNil| (LIST '|nullstream|)))
+(EVAL-WHEN (:EXECUTE :LOAD-TOPLEVEL) (SETQ |bStreamNil| (LIST '|nullstream|)))
 
 ; shoeFileMap(f, fn)==
 ;      a:=shoeInputFile fn

src/boot/compiled/ptyout.clisp

@@ -679,11 +679,6 @@
               (SETQ |b| (|shoeCompTran| (LIST 'LAMBDA (LIST '|x|) |b|)))
               (|bpPush| (LIST (|shoeEVALANDFILEACTQ| (CADDR |b|)))))))))))
 
-; shoeEVALANDFILEACTQ x==  ["EVAL-WHEN", ["EVAL","LOAD"], x]
-
-(DEFUN |shoeEVALANDFILEACTQ| (|x|)
-  (PROG () (RETURN (LIST 'EVAL-WHEN (LIST 'EVAL 'LOAD) |x|))))
-
 ; SoftShoeError(posn,key)==
 ;     shoeConsole CONCAT('"ERROR IN LINE ",STRINGIMAGE lineNo posn)
 ;     shoeConsole lineString posn

src/boot/compiled/typrops.clisp

@@ -54,7 +54,7 @@
 ;             ['"'", "QUOTE"], _
 ;             ['"|", "BAR"]                          ]
 
-(EVAL-WHEN (EVAL LOAD)
+(EVAL-WHEN (:EXECUTE :LOAD-TOPLEVEL)
   (SETQ |shoeKeyWords|
           (LIST (LIST "and" 'AND) (LIST "by" 'BY) (LIST "case" 'CASE)
                 (LIST "cross" 'CROSS) (LIST "else" 'ELSE) (LIST "for" 'FOR)
@@ -76,59 +76,62 @@
 
 ; shoeKeyTable:=shoeKeyTableCons()
 
-(EVAL-WHEN (EVAL LOAD) (SETQ |shoeKeyTable| (|shoeKeyTableCons|)))
+(EVAL-WHEN (:EXECUTE :LOAD-TOPLEVEL) (SETQ |shoeKeyTable| (|shoeKeyTableCons|)))
 
 ; shoeSPACE       := STR_ELT('"    ", 0)
 
-(EVAL-WHEN (EVAL LOAD) (SETQ |shoeSPACE| (STR_ELT "    " 0)))
+(EVAL-WHEN (:EXECUTE :LOAD-TOPLEVEL) (SETQ |shoeSPACE| (STR_ELT "    " 0)))
 
 ; shoeESCAPE      := STR_ELT('"__  ", 0)
 
-(EVAL-WHEN (EVAL LOAD) (SETQ |shoeESCAPE| (STR_ELT "_  " 0)))
+(EVAL-WHEN (:EXECUTE :LOAD-TOPLEVEL) (SETQ |shoeESCAPE| (STR_ELT "_  " 0)))
 
 ; shoeLispESCAPE      := STR_ELT('"!  ", 0)
 
-(EVAL-WHEN (EVAL LOAD) (SETQ |shoeLispESCAPE| (STR_ELT "!  " 0)))
+(EVAL-WHEN (:EXECUTE :LOAD-TOPLEVEL) (SETQ |shoeLispESCAPE| (STR_ELT "!  " 0)))
 
 ; shoeSTRING_CHAR := STR_ELT('"_"  ", 0)
 
-(EVAL-WHEN (EVAL LOAD) (SETQ |shoeSTRING_CHAR| (STR_ELT "\"  " 0)))
+(EVAL-WHEN (:EXECUTE :LOAD-TOPLEVEL)
+  (SETQ |shoeSTRING_CHAR| (STR_ELT "\"  " 0)))
 
 ; shoePLUSCOMMENT := STR_ELT('"+   ", 0)
 
-(EVAL-WHEN (EVAL LOAD) (SETQ |shoePLUSCOMMENT| (STR_ELT "+   " 0)))
+(EVAL-WHEN (:EXECUTE :LOAD-TOPLEVEL)
+  (SETQ |shoePLUSCOMMENT| (STR_ELT "+   " 0)))
 
 ; shoeMINUSCOMMENT:= STR_ELT('"-   ", 0)
 
-(EVAL-WHEN (EVAL LOAD) (SETQ |shoeMINUSCOMMENT| (STR_ELT "-   " 0)))
+(EVAL-WHEN (:EXECUTE :LOAD-TOPLEVEL)
+  (SETQ |shoeMINUSCOMMENT| (STR_ELT "-   " 0)))
 
 ; shoeDOT         := STR_ELT('".   ", 0)
 
-(EVAL-WHEN (EVAL LOAD) (SETQ |shoeDOT| (STR_ELT ".   " 0)))
+(EVAL-WHEN (:EXECUTE :LOAD-TOPLEVEL) (SETQ |shoeDOT| (STR_ELT ".   " 0)))
 
 ; shoeEXPONENT1   := STR_ELT('"E   ", 0)
 
-(EVAL-WHEN (EVAL LOAD) (SETQ |shoeEXPONENT1| (STR_ELT "E   " 0)))
+(EVAL-WHEN (:EXECUTE :LOAD-TOPLEVEL) (SETQ |shoeEXPONENT1| (STR_ELT "E   " 0)))
 
 ; shoeEXPONENT2   := STR_ELT('"e   ", 0)
 
-(EVAL-WHEN (EVAL LOAD) (SETQ |shoeEXPONENT2| (STR_ELT "e   " 0)))
+(EVAL-WHEN (:EXECUTE :LOAD-TOPLEVEL) (SETQ |shoeEXPONENT2| (STR_ELT "e   " 0)))
 
 ; shoeCLOSEPAREN  := STR_ELT('")   ", 0)
 
-(EVAL-WHEN (EVAL LOAD) (SETQ |shoeCLOSEPAREN| (STR_ELT ")   " 0)))
+(EVAL-WHEN (:EXECUTE :LOAD-TOPLEVEL) (SETQ |shoeCLOSEPAREN| (STR_ELT ")   " 0)))
 
 ; shoeTAB := 9
 
-(EVAL-WHEN (EVAL LOAD) (SETQ |shoeTAB| 9))
+(EVAL-WHEN (:EXECUTE :LOAD-TOPLEVEL) (SETQ |shoeTAB| 9))
 
 ; shoeDict:=shoeDictCons()
 
-(EVAL-WHEN (EVAL LOAD) (SETQ |shoeDict| (|shoeDictCons|)))
+(EVAL-WHEN (:EXECUTE :LOAD-TOPLEVEL) (SETQ |shoeDict| (|shoeDictCons|)))
 
 ; shoePun:=shoePunCons()
 
-(EVAL-WHEN (EVAL LOAD) (SETQ |shoePun| (|shoePunCons|)))
+(EVAL-WHEN (:EXECUTE :LOAD-TOPLEVEL) (SETQ |shoePun| (|shoePunCons|)))
 
 ; for i in [ _
 ;              "NOT", _
@@ -138,7 +141,7 @@
 ;                      ] _
 ;        repeat SETF (GET(i,'SHOEPRE),'T)
 
-(EVAL-WHEN (EVAL LOAD)
+(EVAL-WHEN (:EXECUTE :LOAD-TOPLEVEL)
   (PROG ()
     (RETURN
      ((LAMBDA (|bfVar#1| |i|)
@@ -169,7 +172,7 @@
 ;                    ]_
 ;        repeat SETF (GET(CAR i,'SHOEINF),CADR i)
 
-(EVAL-WHEN (EVAL LOAD)
+(EVAL-WHEN (:EXECUTE :LOAD-TOPLEVEL)
   (PROG ()
     (RETURN
      ((LAMBDA (|bfVar#2| |i|)
@@ -210,7 +213,7 @@
 ;
 ;        repeat SETF (GET(CAR i,'SHOETHETA),CDR i)
 
-(EVAL-WHEN (EVAL LOAD)
+(EVAL-WHEN (:EXECUTE :LOAD-TOPLEVEL)
   (PROG ()
     (RETURN
      ((LAMBDA (|bfVar#3| |i|)
@@ -285,7 +288,7 @@
 ;                                 ]
 ;        repeat SETF (GET(CAR i,'SHOERENAME),CDR i)
 
-(EVAL-WHEN (EVAL LOAD)
+(EVAL-WHEN (:EXECUTE :LOAD-TOPLEVEL)
   (PROG ()
     (RETURN
      ((LAMBDA (|bfVar#4| |i|)
@@ -357,7 +360,7 @@
 ;                              ] _
 ;        repeat SETF (GET(CAR i,'SHOESELFUNCTION),CADR i)
 
-(EVAL-WHEN (EVAL LOAD)
+(EVAL-WHEN (:EXECUTE :LOAD-TOPLEVEL)
   (PROG ()
     (RETURN
      ((LAMBDA (|bfVar#5| |i|)

src/boot/compiled/tytree1.clisp

@@ -5,7 +5,7 @@
 
 ; $inDefIS := false
 
-(EVAL-WHEN (EVAL LOAD) (SETQ |$inDefIS| NIL))
+(EVAL-WHEN (:EXECUTE :LOAD-TOPLEVEL) (SETQ |$inDefIS| NIL))
 
 ; bfGenSymbol()==
 ;     $GenVarCounter:=$GenVarCounter+1

src/boot/ptyout.boot

@@ -336,8 +336,6 @@ bpOutItem()==
     b:=shoeCompTran ["LAMBDA",["x"],b]
     bpPush [shoeEVALANDFILEACTQ CADDR b]
 
-shoeEVALANDFILEACTQ x==  ["EVAL-WHEN", ["EVAL","LOAD"], x]
-
 SoftShoeError(posn,key)==
     shoeConsole CONCAT('"ERROR IN LINE ",STRINGIMAGE lineNo posn)
     shoeConsole lineString posn

src/interp/foam_l.lisp

@@ -666,13 +666,13 @@
 
 ;;; Boot macros
 (defmacro file-exports (lst)
-  `(eval-when (load eval)
+  `(eval-when (:execute :load-toplevel)
               (when (fboundp 'process-export-entry)
                     (mapcar #'process-export-entry ,lst))
         nil))
 
 (defmacro file-imports (lst)
-  `(eval-when (load eval)
+  `(eval-when (:execute :load-toplevel)
               (when (fboundp 'process-import-entry)
                     (mapcar #'process-import-entry ,lst))
         nil))

src/lisp/fricas-lisp.lisp

@@ -1141,3 +1141,7 @@ with this hack and will try to convince the GCL crowd to fix this.
 (defmacro |doInBoottranPackage| (expr)
     `(let ((*PACKAGE* (find-package "BOOTTRAN")))
          ,expr))
+
+(defun |shoeEVALANDFILEACTQ| (expr)
+    `(eval-when (:execute :load-toplevel)
+         ,expr))