Slightly better progress reporting in LOADUP. (#1974)

Make it clear when files are skipped because they are already loaded.

Author: MattHeffron

sources/APUTDQ

@@ -1,14 +1,16 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "25-Oct-2022 11:44:17" {DSK}<home>larry>ilisp>medley>sources>APUTDQ.;3
 14079  
+
(FILECREATED "16-Jan-2025 13:35:20" {DSK}<home>matt>Interlisp>medley>sources>APUTDQ.;2
 10901  
 
-      :CHANGES-TO (FNS ENDLOADUP)
+      :EDIT-BY "mth"
 
-      :PREVIOUS-DATE "25-Oct-2022 11:07:06" {DSK}<home>larry>ilisp>medley>sources>APUTDQ.;2)
+      :CHANGES-TO (FNS LOADUP)
+
+      :PREVIOUS-DATE "25-Oct-2022 11:44:17" {DSK}<home>matt>Interlisp>medley>sources>APUTDQ.;1)
 
 
 (* ; "
-Copyright (c) 1981-1988, 1990, 2021-2022 by Venue & Xerox Corporation.
+Copyright (c) 1981-1988, 1990, 2021-2022, 2025 by Venue & Xerox Corporation.
 ")
 
 (PRETTYCOMPRINT APUTDQCOMS)
@@ -75,7 +77,7 @@ Copyright (c) 1981-1988, 1990, 2021-2022 by Venue & Xerox Corporation.
                      (*COMPILED-EXTENSIONS* '(DFASL LCOM))
                      (SYSOUT.EXT 'SYSOUT]
         (LOCALVARS . T)
-        (DECLARE%: DONTEVAL@LOAD DOEVAL@COMPILE DONTCOPY COMPILERVARS (ADDVARS (NLAMA FAULTEVAL)
+        (DECLARE%: DONTEVAL@LOAD DOEVAL@COMPILE DONTCOPY COMPILERVARS (ADDVARS (NLAMA)
                                                                              (NLAML)
                                                                              (LAMA])
 
@@ -132,12 +134,14 @@ Copyright (c) 1981-1988, 1990, 2021-2022 by Venue & Xerox Corporation.
 (DEFINEQ
 
 (LOADUP

-  [LAMBDA (FILES)
                                      (* ; "Edited 12-Mar-2021 00:15 by larry")

-    (for
 X in
 FILES do
 (PRINTOUT T "loading " X T)
-                                  (OR (FMEMB X SYSFILES)
-                                      (DOFILESLOAD (LIST '(SYSLOAD)
-                                                         X)))
-                                  (SMASHFILECOMS
 X])
+  [LAMBDA (FILES)
                                            (* ; "Edited 16-Jan-2025 13:35 by mth")


+                                                           (* ; "Edited 12-Mar-2021 00:15 by larry")

+    (for
 X in
 FILES do
 (if
 (FMEMB X SYSFILES)
+                           then
 (PRINTOUT T X " already loaded" T)
+                         else
 (PRINTOUT T "loading " X T)
+                              (DOFILESLOAD (LIST '(SYSLOAD)
+                                                 X)))
+                       (SMASHFILECOMS
 X])
 
 (ENDLOADUP

   [LAMBDA NIL
@@ -251,91 +255,16 @@ Copyright (c) 1981-1988, 1990, 2021-2022 by Venue & Xerox Corporation.
 )
 (DECLARE%: DONTEVAL@LOAD DOEVAL@COMPILE DONTCOPY COMPILERVARS 
 
-(ADDTOVAR NLAMA
 FAULTEVAL)
-
-(ADDTOVAR NLAML
 )
-
-(ADDTOVAR LAMA
 )
-)
-(PRETTYCOMPRINT APUTDQCOMS)
-
-(RPAQQ APUTDQCOMS

-       [
-        (* ;; " this file contains some dummy definitions of functions whose real implementation is on other files")

-
-        (DECLARE%: EVAL@LOAD DONTCOPY (P (PRIN1 "Warning: APUTDQ contains dummy definitions of " T)
-                                         (PRIN1 
-                                        "FAULTEVAL FAULTAPPLY ERRORX SET-DOCUMENTATION SMASHFILECOMS"
-                                                T)
-                                         (PRIN1 "Be careful not to confuse with the real definitions"
-                                                T)
-                                         (TERPRI T)))
-        (FNS GREETFILENAME FAULTEVAL FAULTAPPLY ERRORX SET-DOCUMENTATION)
-        (FNS SMASHFILECOMS SMASHFILECOMSLST)
-        (INITVARS (DEFAULTREGISTRY)
-               (USERGREETFILES)
-               (LOGINHOST/DIR '{DSK}))
-        (FNS LOADUP ENDLOADUP)
-        (ALISTS (SYSTEMINITVARS \CONNECTED.DIRECTORY DWIMFLG ADDSPELLFLG FILEPKGFLG BUILDMAPFLG 
-                       UPDATEMAPFLG DEFAULTREGISTRY DEFAULTPRINTINGHOST DIRECTORIES USERGREETFILES 
-                       NETWORKOSTYPES CH.NET.HINT CH.DEFAULT.DOMAIN CH.DEFAULT.ORGANIZATION 
-                       ADVISEDFNS LISPUSERSDIRECTORIES DISPLAYFONTDIRECTORIES DISPLAYFONTEXTENSIONS 
-                       INTERPRESSFONTDIRECTORIES))
-        [DECLARE%: DONTEVAL@LOAD DOCOPY 
-
-               (* ;; "many of these are obsolete and can be removed, but it is unclear which ones")

-
-               (P (DUMMYDEF (ADDSTATS *)
-                         (LISPXWATCH NILL)
-                         (CLBUFS NILL)
-                         (FINDFILE INFILEP)
-                         (FILEMAP *)
-                         (VIRGINFN GETD))
-                  (DUMMYDEF (* QUOTE)
-                         (GETP GETPROP)
-                         (DECLARE QUOTE)
-                         (FRPLNODE2 RPLNODE2)
-                         (DISPLAYTERMP TRUE)
-                         (FRPLACA RPLACA)
-                         (FRPLACD RPLACD)
-                         (MISSPELLED? NILL)
-                         (UNDOSAVE NILL)
-                         (SETLINELENGTH ZERO)
-                         (DOBE NILL)
-                         (RELINK NILL)
-                         (PUT PUTPROP)
-                         (/PUT PUTPROP)))
-               (ADDVARS (SYSFILES)
-                      (LISPXHISTORY)
-                      (LINKEDFNS))
-               (VARS (CLEARSTKLST T)
-                     (SYSHASHARRAY (HASHARRAY 50))
-                     (DISPLAYTERMFLG T)
-                     (%#UNDOSAVES)
-                     (NLAMA)
-                     (NLAML)
-                     (LAMS)
-                     (TTYLINELENGTH 82)
-                     (COMPILE.EXT 'LCOM)
-                     (FASL.EXT 'DFASL)
-                     (*COMPILED-EXTENSIONS* '(DFASL LCOM))
-                     (SYSOUT.EXT 'SYSOUT]
-        (LOCALVARS . T)
-        (DECLARE%: DONTEVAL@LOAD DOEVAL@COMPILE DONTCOPY COMPILERVARS (ADDVARS (NLAMA)
-                                                                             (NLAML)
-                                                                             (LAMA])
-(DECLARE%: DONTEVAL@LOAD DOEVAL@COMPILE DONTCOPY COMPILERVARS 
-
 (ADDTOVAR NLAMA
 )
 
 (ADDTOVAR NLAML
 )
 
 (ADDTOVAR LAMA
 )
 )
 (PUTPROPS APUTDQ COPYRIGHT ("Venue & Xerox Corporation" 1981 1982 1983 1984 1985 1986 1987 1988 1990 
-2021 2022))
+2021 2022 2025))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (3978 6186 (GREETFILENAME 3988 . 5861) (FAULTEVAL 5863 . 5935) (FAULTAPPLY 5937 . 6023) 
-(ERRORX 6025 . 6091) (SET-DOCUMENTATION 6093 . 6184)) (6187 7207 (SMASHFILECOMS 6197 . 6539) (
-SMASHFILECOMSLST 6541 . 7205)) (7301 8744 (LOADUP 7311 . 7734) (ENDLOADUP 7736 . 8742)))))
+  (FILEMAP (NIL (3999 6207 (GREETFILENAME 4009 . 5882) (FAULTEVAL 5884 . 5956) (FAULTAPPLY 5958 . 6044) 
+(ERRORX 6046 . 6112) (SET-DOCUMENTATION 6114 . 6205)) (6208 7228 (SMASHFILECOMS 6218 . 6560) (
+SMASHFILECOMSLST 6562 . 7226)) (7322 8926 (LOADUP 7332 . 7916) (ENDLOADUP 7918 . 8924)))))
 STOP