From a111907bf4c52cf6753e85b44bf645cbdcd21a5f Mon Sep 17 00:00:00 2001
From: rmkaplan <69548581+rmkaplan@users.noreply.github.com>
Date: Wed, 19 Jul 2023 12:01:38 -0700
Subject: [PATCH] GATHEREXPORTS uses standard MAKEFILE machinery (#1278)

* GATHEREXPORTS uses standard MAKEFILE machinery

So that it gets all the normal file properties (FILE, FILEDATES) when it is LOADed.  Also nothing special about setting up its reader environment

* GATHEREXPORTS again:  PRETTYDEF likes only litatom filenames

(which probably should be fixed)
---
 sources/FILEPKG      | 137 +++++++++++++++++++++----------------------
 sources/FILEPKG.LCOM | Bin 102490 -> 101817 bytes
 2 files changed, 66 insertions(+), 71 deletions(-)

diff --git a/sources/FILEPKG b/sources/FILEPKG
index 1c8358da..ff2f4b82 100644
--- a/sources/FILEPKG
+++ b/sources/FILEPKG
@@ -1,10 +1,12 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "31-Oct-2022 16:05:09" {WMEDLEY}<sources>FILEPKG.;47
 274788 
+
(FILECREATED "18-Jul-2023 23:40:13" {WMEDLEY}<sources>FILEPKG.;50
 274539 
 
-      :CHANGES-TO (FNS EDITCALLERS)
+      :EDIT-BY rmk
 
-      :PREVIOUS-DATE "22-Sep-2022 08:46:29" {WMEDLEY}<sources>FILEPKG.;45)
+      :CHANGES-TO (FNS GATHEREXPORTS)
+
+      :PREVIOUS-DATE "13-Jul-2023 14:56:21" {WMEDLEY}<sources>FILEPKG.;48)
 
 
 (* ; "
@@ -4300,8 +4302,9 @@ compiling " T)
 (DEFINEQ
 
 (FINDCALLERS

-  [LAMBDA (ATOMS FILES)                                      (* lmm "30-SEP-78 01:36")

-    (PROG ((X (EDITCALLERS
 ATOMS FILES T)))
+  [LAMBDA (ATOMS FILES DEPTH)
                                (* ; "Edited 13-Jul-2023 14:55 by rmk")

+                                                             (* lmm "30-SEP-78 01:36")

+    (PROG ((X (EDITCALLERS
 ATOMS FILES T DEPTH)))
           (RETURN (NCONC (DREVERSE (CDR X))
                          (AND (CAR X)
                               (LIST (CONS (COND
@@ -4311,7 +4314,9 @@ compiling " T)
                                           (CAR X])
 
 (EDITCALLERS

-  [LAMBDA (ATOMS FILES COMS)
+  [LAMBDA (ATOMS FILES COMS DEPTH)
+
+    (* ;; "Edited 13-Jul-2023 14:56 by rmk")

 
     (* ;; "Edited 31-Oct-2022 16:04 by rmk")

 
@@ -4342,7 +4347,7 @@ compiling " T)
                           ((LISTP FILES)
                            FILES)
                           ((STRPOS "*" FILES)                (* ; "Depth 2 for TMAX>TMAX")

-                           (FILDIR FILES 2))
+                           (FILDIR FILES (OR DEPTH 2)))
                           (T (LIST FILES))) unless
 (DIRECTORYNAMEP FILE)
         do

         (RESETLST
@@ -4704,29 +4709,19 @@ compiling " T)
         (for
 FILE in
 FILES do
 (IMPORTFILE
 (CADR FILE])
 
 (GATHEREXPORTS

-  [LAMBDA (FROMFILES TOFILE FLG)
                            (* ; "Edited 23-Aug-2021 16:40 by rmk:")

-                                                             (* ; 
-
                                          "Copies all exported definitions from FROMFILES to TOFILE.")

+  [LAMBDA (FROMFILES TOFILE FLG)
                             (* ; "Edited 18-Jul-2023 23:39 by rmk")


+                                                            (* ; "Edited 22-May-2021 00:01 by rmk:")

+
+    (* ;; "Use PRETTYDEF so that EXPORTS.ALL is registered with the normal file properties, reader environment, etc.")

+
+    (CL:UNLESS FLG (SETQ FLG T))
+    (SETQ TOFILE (MKATOM TOFILE))                            (* ; 
+
                                                             "PRETTYDEF doesn't like strings--why?")

     (RESETLST
-        [RESETSAVE NIL (LIST (FUNCTION CLOSE-AND-MAYBE-DELETE)
-                             (SETQ TOFILE (OPENSTREAM TOFILE 'OUTPUT]
-        (RESETSAVE (OUTPUT TOFILE))
-        (LET ((ENV *DEFAULT-MAKEFILE-ENVIRONMENT*))
-             (SETQ ENV (if
 ENV
-                           then
 (\DO-DEFINE-FILE-INFO TOFILE ENV)
-                         else
 *OLD-INTERLISP-READ-ENVIRONMENT*))
-             (WITH-READER-ENVIRONMENT ENV
-                 (PRINT-READER-ENVIRONMENT ENV)
-                 (printout NIL "(LISPXPRIN1 %"EXPORTS GATHERED FROM " (DIRECTORYNAME T)
-                        " ON "
-                        (DATE)
-                        "%"  T)" T "(LISPXTERPRI T)" T)
-                 (for
 F inside
 FROMFILES do
 (MAPC (IMPORTFILE
 F (OR FLG T))
-                                                  (FUNCTION PRINT))
-                                            (TERPRI))
-                 (PRINT 'STOP)
-                 (TERPRI)
-                 (FULLNAME TOFILE))))])
+        [PRETTYDEF NIL TOFILE `((E (MAPC (MKLIST FROMFILES)
+                                         (FUNCTION (LAMBDA (F)
+                                                     (MAPC (IMPORTFILE
 F FLG)
+                                                           (FUNCTION PRINT])])
 
 (\DUMPEXPORTS

   [NLAMBDA COMS                                              (* bvm%: "24-Oct-86 19:42")

@@ -4866,46 +4861,46 @@ compiling " T)
 (PUTPROPS FILEPKG COPYRIGHT ("Venue & Xerox Corporation" 1982 1983 1984 1985 1986 1987 1988 1989 1990 
 1991 1992 1993 1995 2018 2022))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (18953 20626 (SEARCHPRETTYTYPELST 18963 . 19932) (PRETTYDEFMACROS 19934 . 20370) (
-FILEPKGCOMPROPS 20372 . 20624)) (21439 55731 (CLEANUP 21449 . 22839) (COMPILEFILES 22841 . 23117) (
-COMPILEFILES0 23119 . 23932) (CONTINUEDIT 23934 . 25311) (MAKEFILE 25313 . 37039) (FILECHANGES 37041
- . 39805) (FILEPKG.MERGECHANGES 39807 . 40442) (FILEPKG.CHANGEDFNS 40444 . 40756) (MAKEFILE1 40758 . 
-44970) (COMPILE-FILE? 44972 . 46559) (MAKEFILES 46561 . 48089) (ADDFILE 48091 . 50634) (ADDFILE0 50636
- . 54760) (LISTFILES 54762 . 55729)) (56403 89989 (FILEPKGCHANGES 56413 . 57592) (GETFILEPKGTYPE 57594
- . 60544) (MARKASCHANGED 60546 . 62177) (FILECOMS 62179 . 62563) (WHEREIS 62565 . 64094) (
-SMASHFILECOMS 64096 . 64324) (FILEFNSLST 64326 . 64492) (FILECOMSLST 64494 . 64980) (UPDATEFILES 64982
- . 69480) (INFILECOMS? 69482 . 71325) (INFILECOMTAIL 71327 . 72445) (INFILECOMS 72447 . 72608) (
-INFILECOM 72610 . 82628) (INFILECOMSVALS 82630 . 82937) (INFILECOMSVAL 82939 . 83947) (INFILECOMSPROP 
-83949 . 84742) (IFCPROPS 84744 . 85824) (IFCEXPRTYPE 85826 . 86442) (IFCPROPSCAN 86444 . 87405) (
-IFCDECLARE 87407 . 88666) (INFILEPAIRS 88668 . 88967) (INFILECOMSMACRO 88969 . 89987)) (90024 120710 (
-FILES? 90034 . 92145) (FILES?1 92147 . 92849) (FILES?PRINTLST 92851 . 93633) (ADDTOFILES? 93635 . 
-104178) (ADDTOFILE 104180 . 105096) (WHATIS 105098 . 107074) (ADDTOCOMS 107076 . 108614) (ADDTOCOM 
-108616 . 115103) (ADDTOCOM1 115105 . 116276) (ADDNEWCOM 116278 . 117328) (MAKENEWCOM 117330 . 119177) 
-(DEFAULTMAKENEWCOM 119179 . 120708)) (120780 123597 (MERGEINSERT 120790 . 123133) (MERGEINSERT1 123135
- . 123595)) (123751 125112 (ADDTOFILEKEYLST 123761 . 125110)) (125229 136030 (DELFROMFILES 125239 . 
-126069) (DELFROMCOMS 126071 . 127750) (DELFROMCOM 127752 . 133517) (DELFROMCOM1 133519 . 134318) (
-REMOVEITEM 134320 . 135196) (MOVETOFILE 135198 . 136028)) (136244 138615 (SAVEPUT 136254 . 138613)) (
-138740 146983 (UNMARKASCHANGED 138750 . 140234) (PREEDITFN 140236 . 142717) (POSTEDITPROPS 142719 . 
-145013) (POSTEDITALISTS 145015 . 146981)) (147128 166598 (ALISTS.GETDEF 147138 . 147517) (
-ALISTS.WHENCHANGED 147519 . 148165) (CLEARCLISPARRAY 148167 . 149345) (EXPRESSIONS.WHENCHANGED 149347
- . 149725) (MAKEALISTCOMS 149727 . 150742) (MAKEFILESCOMS 150744 . 152074) (MAKELISPXMACROSCOMS 152076
- . 154094) (MAKEPROPSCOMS 154096 . 154722) (MAKEUSERMACROSCOMS 154724 . 156541) (PROPS.WHENCHANGED 
-156543 . 157164) (FILEGETDEF.LISPXMACROS 157166 . 158465) (FILEGETDEF.ALISTS 158467 . 159058) (
-FILEGETDEF.RECORDS 159060 . 159987) (FILEGETDEF.PROPS 159989 . 160784) (FILEGETDEF.MACROS 160786 . 
-161668) (FILEGETDEF.VARS 161670 . 162273) (FILEGETDEF.FNS 162275 . 163515) (FILEPKGCOMS.PUTDEF 163517
- . 165459) (FILES.PUTDEF 165461 . 166329) (VARS.PUTDEF 166331 . 166474) (FILES.WHENCHANGED 166476 . 
-166596)) (168620 175851 (RENAME 168630 . 170075) (CHANGECALLERS 170077 . 175849)) (175852 223761 (
-SHOWDEF 175862 . 177059) (COPYDEF 177061 . 179809) (GETDEF 179811 . 182354) (GETDEFCOM 182356 . 183322
-) (GETDEFCOM0 183324 . 184517) (GETDEFCURRENT 184519 . 190831) (GETDEFERR 190833 . 192103) (
-GETDEFFROMFILE 192105 . 196334) (GETDEFSAVED 196336 . 197424) (PUTDEF 197426 . 198133) (EDITDEF 198135
- . 199118) (DEFAULT.EDITDEF 199120 . 201958) (EDITDEF.FILES 201960 . 202165) (LOADDEF 202167 . 202343)
- (DWIMDEF 202345 . 203199) (DELDEF 203201 . 206095) (DELFROMLIST 206097 . 206601) (HASDEF 206603 . 
-212840) (GETFILEDEF 212842 . 213354) (SAVEDEF 213356 . 215044) (UNSAVEDEF 215046 . 215942) (
-COMPAREDEFS 215944 . 219750) (COMPARE 219752 . 220456) (TYPESOF 220458 . 223759)) (223911 232159 (
-FILEPKGCOM 223921 . 228697) (FILEPKGTYPE 228699 . 232157)) (244192 261485 (FINDCALLERS 244202 . 244717
-) (EDITCALLERS 244719 . 255369) (EDITFROMFILE 255371 . 260800) (FINDATS 260802 . 261074) (LOOKIN 
-261076 . 261483)) (261486 263157 (SEPRCASE 261496 . 263155)) (263674 269130 (IMPORTFILE 263684 . 
-264654) (IMPORTEVAL 264656 . 265542) (IMPORTFILESCAN 265544 . 265957) (CHECKIMPORTS 265959 . 267215) (
-GATHEREXPORTS 267217 . 268538) (\DUMPEXPORTS 268540 . 269128)) (269468 271538 (CLEARFILEPKG 269478 . 
-271536)))))
+  (FILEMAP (NIL (18975 20648 (SEARCHPRETTYTYPELST 18985 . 19954) (PRETTYDEFMACROS 19956 . 20392) (
+FILEPKGCOMPROPS 20394 . 20646)) (21461 55753 (CLEANUP 21471 . 22861) (COMPILEFILES 22863 . 23139) (
+COMPILEFILES0 23141 . 23954) (CONTINUEDIT 23956 . 25333) (MAKEFILE 25335 . 37061) (FILECHANGES 37063
+ . 39827) (FILEPKG.MERGECHANGES 39829 . 40464) (FILEPKG.CHANGEDFNS 40466 . 40778) (MAKEFILE1 40780 . 
+44992) (COMPILE-FILE? 44994 . 46581) (MAKEFILES 46583 . 48111) (ADDFILE 48113 . 50656) (ADDFILE0 50658
+ . 54782) (LISTFILES 54784 . 55751)) (56425 90011 (FILEPKGCHANGES 56435 . 57614) (GETFILEPKGTYPE 57616
+ . 60566) (MARKASCHANGED 60568 . 62199) (FILECOMS 62201 . 62585) (WHEREIS 62587 . 64116) (
+SMASHFILECOMS 64118 . 64346) (FILEFNSLST 64348 . 64514) (FILECOMSLST 64516 . 65002) (UPDATEFILES 65004
+ . 69502) (INFILECOMS? 69504 . 71347) (INFILECOMTAIL 71349 . 72467) (INFILECOMS 72469 . 72630) (
+INFILECOM 72632 . 82650) (INFILECOMSVALS 82652 . 82959) (INFILECOMSVAL 82961 . 83969) (INFILECOMSPROP 
+83971 . 84764) (IFCPROPS 84766 . 85846) (IFCEXPRTYPE 85848 . 86464) (IFCPROPSCAN 86466 . 87427) (
+IFCDECLARE 87429 . 88688) (INFILEPAIRS 88690 . 88989) (INFILECOMSMACRO 88991 . 90009)) (90046 120732 (
+FILES? 90056 . 92167) (FILES?1 92169 . 92871) (FILES?PRINTLST 92873 . 93655) (ADDTOFILES? 93657 . 
+104200) (ADDTOFILE 104202 . 105118) (WHATIS 105120 . 107096) (ADDTOCOMS 107098 . 108636) (ADDTOCOM 
+108638 . 115125) (ADDTOCOM1 115127 . 116298) (ADDNEWCOM 116300 . 117350) (MAKENEWCOM 117352 . 119199) 
+(DEFAULTMAKENEWCOM 119201 . 120730)) (120802 123619 (MERGEINSERT 120812 . 123155) (MERGEINSERT1 123157
+ . 123617)) (123773 125134 (ADDTOFILEKEYLST 123783 . 125132)) (125251 136052 (DELFROMFILES 125261 . 
+126091) (DELFROMCOMS 126093 . 127772) (DELFROMCOM 127774 . 133539) (DELFROMCOM1 133541 . 134340) (
+REMOVEITEM 134342 . 135218) (MOVETOFILE 135220 . 136050)) (136266 138637 (SAVEPUT 136276 . 138635)) (
+138762 147005 (UNMARKASCHANGED 138772 . 140256) (PREEDITFN 140258 . 142739) (POSTEDITPROPS 142741 . 
+145035) (POSTEDITALISTS 145037 . 147003)) (147150 166620 (ALISTS.GETDEF 147160 . 147539) (
+ALISTS.WHENCHANGED 147541 . 148187) (CLEARCLISPARRAY 148189 . 149367) (EXPRESSIONS.WHENCHANGED 149369
+ . 149747) (MAKEALISTCOMS 149749 . 150764) (MAKEFILESCOMS 150766 . 152096) (MAKELISPXMACROSCOMS 152098
+ . 154116) (MAKEPROPSCOMS 154118 . 154744) (MAKEUSERMACROSCOMS 154746 . 156563) (PROPS.WHENCHANGED 
+156565 . 157186) (FILEGETDEF.LISPXMACROS 157188 . 158487) (FILEGETDEF.ALISTS 158489 . 159080) (
+FILEGETDEF.RECORDS 159082 . 160009) (FILEGETDEF.PROPS 160011 . 160806) (FILEGETDEF.MACROS 160808 . 
+161690) (FILEGETDEF.VARS 161692 . 162295) (FILEGETDEF.FNS 162297 . 163537) (FILEPKGCOMS.PUTDEF 163539
+ . 165481) (FILES.PUTDEF 165483 . 166351) (VARS.PUTDEF 166353 . 166496) (FILES.WHENCHANGED 166498 . 
+166618)) (168642 175873 (RENAME 168652 . 170097) (CHANGECALLERS 170099 . 175871)) (175874 223783 (
+SHOWDEF 175884 . 177081) (COPYDEF 177083 . 179831) (GETDEF 179833 . 182376) (GETDEFCOM 182378 . 183344
+) (GETDEFCOM0 183346 . 184539) (GETDEFCURRENT 184541 . 190853) (GETDEFERR 190855 . 192125) (
+GETDEFFROMFILE 192127 . 196356) (GETDEFSAVED 196358 . 197446) (PUTDEF 197448 . 198155) (EDITDEF 198157
+ . 199140) (DEFAULT.EDITDEF 199142 . 201980) (EDITDEF.FILES 201982 . 202187) (LOADDEF 202189 . 202365)
+ (DWIMDEF 202367 . 203221) (DELDEF 203223 . 206117) (DELFROMLIST 206119 . 206623) (HASDEF 206625 . 
+212862) (GETFILEDEF 212864 . 213376) (SAVEDEF 213378 . 215066) (UNSAVEDEF 215068 . 215964) (
+COMPAREDEFS 215966 . 219772) (COMPARE 219774 . 220478) (TYPESOF 220480 . 223781)) (223933 232181 (
+FILEPKGCOM 223943 . 228719) (FILEPKGTYPE 228721 . 232179)) (244214 261689 (FINDCALLERS 244224 . 244854
+) (EDITCALLERS 244856 . 255573) (EDITFROMFILE 255575 . 261004) (FINDATS 261006 . 261278) (LOOKIN 
+261280 . 261687)) (261690 263361 (SEPRCASE 261700 . 263359)) (263878 268881 (IMPORTFILE 263888 . 
+264858) (IMPORTEVAL 264860 . 265746) (IMPORTFILESCAN 265748 . 266161) (CHECKIMPORTS 266163 . 267419) (
+GATHEREXPORTS 267421 . 268289) (\DUMPEXPORTS 268291 . 268879)) (269219 271289 (CLEARFILEPKG 269229 . 
+271287)))))
 STOP
diff --git a/sources/FILEPKG.LCOM b/sources/FILEPKG.LCOM
index 27fcbbe9062203e4f6cef928f0b0ad247070d216..ca33e989277fdc429823a42559611cac92917a15 100644
GIT binary patch
delta 766
zcmZuv&1(}u6yNE_7Pl%wQbe)#HK%NGlik^TIq~3RcedSjzu29$27Ay_!BA~M6g+qk
z_2R81$R2u8{0CGh!ISt;M9@o*f*1b-osAV6^c~*3nK%4C=FOK^lOOgcch?F=Q(Jy`
zSHn6s0h^?%6T{rw($3d(6_nyw7ZY41=H9z=y+z8GSj?_RVayZgZ9~!Ncpe<TT`rf4
zuzBmj?alwfRBJ_5DLJmkte8>GY#8S{Qqr%W+4Y(ZxKXW{SAa0v<yyN7_wQ{1v6g7C
z$P$f*P;!DqfiYPskSJ!WZrDjQTQCR$^RHE-N@{h24MA{8ZmLTEb?)M`AsP%3dZA5W
zuvx^H(nEp@r&W*)BuVl$+H0RmA6HP>sKa_-g@J{IWv~ScixUP-$mChn^TbxTGwZOk
zEmkn~!Pg4<sZ5zixSt8CoOr1qDVI*SP;sH&`|&=1QxY*sN>;s{r}Dw<PFB*<!9KMP
zaw%^iZ@vMEOGwNT#yi298`xl&7}ot&&rLWOxRHKpp?ty6!FFS2@i6WN)MpViar&)=
z7A7zr6t1EhO8?2z3y}^y%qAg>o{^A*?nEQj>5TfUR5A<@56OAgW{#=^t|uJTp;Tf}
z@@Zs=yfUJ7;?U1vl63Aln!%3xr|<gNKgn9)fa5KShSLcw?uLOtb_1^dj#OSokMfsg
zB+2bJy^Y*QdNPx+G11>0&b7^dO&{}&8{^Zbx~>}_r28wBhrXBs#{I+L%;5Vn+F`!{
Dvw^!m

delta 1307
zcmZuxOK;;;6!uL@TRb48Lp3l#Gdi+Vks#dhy?({+ATaSw<KRbR-_$L10W_mYgfwL_
z3pS|Yv0w#LB9Th4K;jP!NL2-c)OCLVvp`}o|A5u7gzM|3w4zaDpM2+>?|k>%bMnh~
z^MCv>{~%x1v6}4MSBXXlV9V7^S9A71RIeL$6J$l#{_|>@tF>Ib|I>?isUNVm7lt&=
zV0;gh&L9loeC+D#ssh9J@820-N<ws{DK|PnNZTp(81+H9OvePH8<AlHu?@S`0=M1u
z;&qy-EP+NR&fuJkrVMUBr5iyq$W)(Gf<lOz-TA0I85eF?E^!LRIm2wqldl%9ef|U;
zJwfPe^#+DQO9laG;ISminjmRNk}7X{<15pHTWA%VupPIPxXrs{gU>7Rvs17yYG~*t
z?B3%?1L7S0eGB~~f4hcWd*&M%N!2M{L&_`q_^+Q|cu(RV@sJDa;Z3i4Sl=y7PXGtr
z^piCdb`8h^*G*|g*&xn?*au7;*p4>BAY<G%&R6#|O~ZgSt}aMvn<eR1>_xN>wliJ2
zjb5!_=jip@=v{dlw9y+2eSTCLZ%iJ1_VRNrU`f#c=zufX&z37#n=JgUT*16A;W|e#
znSAhcWlx7rnna>iO+eMfc?sPuROdDE654laqk4Tbtk?6a^_{Dy?q`dr0x!{gc?nm$
z2YIb4Qa;UJ+8oXoAzLR>a8e0Q=J<DMZlNpkL}Nxga!-<u$0e1>J3jMp$D%0le|#ho
zE`*j)UVrDfcX(YW6fuG!uL-+W{jv9G^hFOn>Q#PyJHK{V9m_?1>B}K12`kmZry}Fw
zZ&HJpCNP@z(*THJ0)NL0h;Bm=^^=r|-V)5)$M>YT6d;;)mcVbVOu#K;24dS5Aiq%S
zjCv27tr==qXO;$H-mz}XAil~4BTvTG#cAO4;hg%Ml8dQ)1AUsRd>Dc>i6hFTTQ+R_
ziR#l%5L2~~uLf~vF9Cx<GGP4ypFRtcK8-WR(<46d*s&mE2_H8bE@9-0F-ycV%Yb&6
zWK{KHUyZ!2w<s?dQbvpY!8Qh^!RNfcdD>Xk^cBD+0cAx2U`_smv_OF*<`1mtv+(ld
tD+=8#TA#tX$GSA-e=)`Ef-()((Z`eTAJgYg9c9?`PY>NZ>UGgB{TI?GEFb^?