From 929690c6a39debf5f5555ba53e337768f858391a Mon Sep 17 00:00:00 2001 From: Larry Masinter Date: Tue, 30 Jan 2024 15:09:30 -0800 Subject: [PATCH 1/2] fix FILEPKG so that MAKEFILE(NEW) never references the 'previous version' and recompiles the whole file --- sources/FILEPKG | 229 +++++++++++++++++++++++++------------------ sources/FILEPKG.LCOM | Bin 101817 -> 103792 bytes 2 files changed, 135 insertions(+), 94 deletions(-) diff --git a/sources/FILEPKG b/sources/FILEPKG index ff2f4b829..bed0271fc 100644 --- a/sources/FILEPKG +++ b/sources/FILEPKG @@ -1,18 +1,15 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "18-Jul-2023 23:40:13" {WMEDLEY}FILEPKG.;50 274539 +(FILECREATED "30-Jan-2024 15:03:40" {DSK}larry>il>medley>sources>FILEPKG.;5 277737 - :EDIT-BY rmk + :EDIT-BY "lmm" - :CHANGES-TO (FNS GATHEREXPORTS) + :CHANGES-TO (FNS COMPILEFILES0 MAKEFILE-NEW MAKEFILE) + (VARS FILEPKGCOMS) - :PREVIOUS-DATE "13-Jul-2023 14:56:21" {WMEDLEY}FILEPKG.;48) + :PREVIOUS-DATE "18-Jul-2023 23:40:13" {DSK}larry>il>medley>sources>FILEPKG.;1) -(* ; " -Copyright (c) 1982-1993, 1995, 2018, 2022 by Venue & Xerox Corporation. -") - (PRETTYCOMPRINT FILEPKGCOMS) (RPAQQ FILEPKGCOMS @@ -35,7 +32,7 @@ Copyright (c) 1982-1993, 1995, 2018, 2022 by Venue & Xerox Corporation. [COMS (* ;; "making, adding, listing, compiling files") - (FNS CLEANUP COMPILEFILES COMPILEFILES0 CONTINUEDIT MAKEFILE FILECHANGES + (FNS CLEANUP COMPILEFILES COMPILEFILES0 CONTINUEDIT MAKEFILE MAKEFILE-NEW FILECHANGES FILEPKG.MERGECHANGES FILEPKG.CHANGEDFNS MAKEFILE1 COMPILE-FILE? MAKEFILES ADDFILE ADDFILE0 LISTFILES) (INITVARS (*DEFAULT-CLEANUP-COMPILER* 'CL:COMPILE-FILE) @@ -168,7 +165,7 @@ Copyright (c) 1982-1993, 1995, 2018, 2022 by Venue & Xerox Corporation. INFILECOMSVALS INFILEPAIRS INFILECOMSMACRO IFCPROPS IFCEXPRTYPE IFCPROPSCAN IFCDECLARE (LOCALFREEVARS NAME LITERALS VAL TYPE ONFILETYPE ORIGFLG) INFILECOMSPROP) - (NIL MAKEFILE (LOCALVARS . T) + (NIL MAKEFILE MAKEFILE-NEW (LOCALVARS . T) (SPECVARS FILE OPTIONS REPRINTFNS SOURCEFILE FILETYPE FILEDATES CHANGES)) (ADDFILE ADDFILE ADDFILE0) (FILEPKGCHANGES FILEPKGCHANGES (NOLINKFNS . T)) @@ -400,13 +397,13 @@ Copyright (c) 1982-1993, 1995, 2018, 2022 by Venue & Xerox Corporation. (T (COMPILEFILES0 FILES]) (COMPILEFILES0 - [LAMBDA (FILES OPTIONS) (* rmk%: "19-FEB-83 21:59") - (for X OPTS (RCFLG _ T) on (OR FILES NOTCOMPILEDFILES) first (SETQ OPTS - (SELECTQ (CAR (LISTP OPTIONS)) - (C (SETQ RCFLG NIL) - (CDR OPTIONS)) - (RC (CDR OPTIONS)) - OPTIONS)) + [LAMBDA (FILES OPTIONS) (* ; "Edited 30-Jan-2024 15:03 by lmm") + (* rmk%: "19-FEB-83 21:59") + (for X OPTS RCFLG on (OR FILES NOTCOMPILEDFILES) first (SETQ OPTS (SELECTQ (CAR (LISTP OPTIONS)) + (C (SETQ RCFLG NIL) + (CDR OPTIONS)) + (RC (CDR OPTIONS)) + OPTIONS)) do (MAKEFILE1 (OR (MISSPELLED? (CAR X) 70 FILELST NIL X) (CAR X)) @@ -437,7 +434,8 @@ Copyright (c) 1982-1993, 1995, 2018, 2022 by Venue & Xerox Corporation. (RETURN FILE]) (MAKEFILE - [LAMBDA (FILE OPTIONS REPRINTFNS SOURCEFILE) (* ; "Edited 10-Oct-2021 20:36 by rmk:") + [LAMBDA (FILE OPTIONS REPRINTFNS SOURCEFILE) (* ; "Edited 30-Jan-2024 12:50 by lmm") + (* ; "Edited 10-Oct-2021 20:36 by rmk:") (* ; "Edited 29-Jun-2021 17:24 by rmk:") (* ;; "OPTIONS: FAST means dump with PRETTYFLG set to NIL; LIST means list the FILE; RC means RECOMPILE, C means COMPILEL; --- for C AND RC assume ST unless next option is F.") @@ -462,35 +460,14 @@ Copyright (c) 1982-1993, 1995, 2018, 2022 by Venue & Xerox Corporation. (SETQ CHANGES (fetch TOBEDUMPED of FILEPROP)) (SETQ FILEDATES (LISTP (fetch FILEDATES of ROOTNAME))) (SETQ FILETYPE (GETPROP ROOTNAME 'FILETYPE)) - LP0 (if (AND (NULL (fetch LOADTYPE of FILEPROP)) + (if (AND (NULL (fetch LOADTYPE of FILEPROP)) (NULL FILEDATES)) then (* ;  "File has never been loaded and never dumped i.e. user just set up COMS in core") - elseif [OR (EQMEMB 'NEW OPTIONS) + elseif [OR (MEMB 'NEW OPTIONS) (AND (NULL MAKEFILEREMAKEFLG) (NOT (MEMB 'REMAKE OPTIONS] - then (COND - ((AND (fetch LOADTYPE of FILEPROP) - (NEQ T (fetch LOADTYPE of FILEPROP))) - (LISPXPRIN2 FILE T T) - (LISPXPRIN1 (SELECTQ (fetch LOADTYPE of FILEPROP) - (LOADCOMP "the file was loaded for compilation purposes only") - ((compiled Compiled COMPILED) - " -- only the compiled file has been loaded -") - ((loadfns LOADFNS) - " -- only some of its symbolics have been loaded -") - (SHOULDNT)) - T) - (COND - ((NEQ (ASKUSER DWIMWAIT 'Y "Go ahead and MAKEFILE anyway? ") - 'Y) (* ; - "E.g. user loads a .com file and then resets the COMS or defines the functons by hand.") - (GO OUT))) - (/replace LOADTYPE of FILEPROP with NIL))) - (SETQ SOURCEFILE NIL) - (SETQ REPRINTFNS NIL) + then (RETURN (MAKEFILE-NEW FILE OPTIONS)) elseif SOURCEFILE then (* ; "source file given") elseif [AND FILEDATES (OR [AND (SETQ SOURCEFILE (FINDFILE ROOTNAME T)) @@ -519,11 +496,7 @@ Copyright (c) 1982-1993, 1995, 2018, 2022 by Venue & Xerox Corporation. (LISPXPRIN2 FILE T T) (LISPXPRIN1 '", so it will have to be written anew " T) - (SETQ SOURCEFILE NIL) - (SETQ REPRINTFNS NIL) - (push OPTIONS 'NEW) - (SETQ CHANGES (fetch FILECHANGES of ROOTNAME)) - (GO LP0)) + (RETURN (MAKEFILE-NEW FILE OPTIONS))) (COND ((AND SOURCEFILE (SETQ Z (SELECTQ (fetch LOADTYPE of FILEPROP) (LOADCOMP (* ; @@ -616,6 +589,76 @@ Copyright (c) 1982-1993, 1995, 2018, 2022 by Venue & Xerox Corporation. (RETURN FILE) OUT (RETURN (LIST FILE "-- MAKEFILE not performed."]) +(MAKEFILE-NEW + [LAMBDA (FILE OPTIONS) (* ; "Edited 30-Jan-2024 14:58 by lmm") + (* ; "Edited 10-Oct-2021 20:36 by rmk:") + (* ; "Edited 29-Jun-2021 17:24 by rmk:") + + (* ;; "OPTIONS: FAST means dump with PRETTYFLG set to NIL; LIST means list the FILE; RC means RECOMPILE, C means COMPILEL; --- for C AND RC assume ST unless next option is F.") + + (* ;; "RMK: OPTIONS can specify external format, either as a pair like (FORMAT :UTF-8) or just :UTF-8 where (FIND-FORMAT :UTF-8) is non NIL.") + + [SETQ OPTIONS (for OPT inside OPTIONS collect (CL:IF (FIND-FORMAT OPT T) + (LIST 'FORMAT OPT))] + (PROG ((PRETTYFLG (AND (NOT (MEMB 'FAST OPTIONS)) + PRETTYFLG)) + (*PRINT-BASE* (if (EQ *PRINT-BASE* 8) + then 8 + else (* ; "make sure radix is either 8 or 10, because all others don't read in like they print. Maybe obsolete now with makefile environments") + 10)) + FILETYPE ROOTNAME FILEPROP CHANGES FILEDATES (Z (ADDFILE FILE))) + (DECLARE (CL:SPECIAL PRETTYFLG)) + (SETQ FILE (CAR Z)) (* ; + "Necessary because FILE might have been misspelled.") + (SETQ ROOTNAME (CADR Z)) (* ; "result of (ROOTFILENAME FILE), or if FILE is corrected, result of applying ROOTFILENAME to correct value.") + (SETQ FILEPROP (CDDR Z)) + (UPDATEFILES) (* ; "Want updating done after file is added to filelst, so any functions that are being dumped are marked as having been dumped.") + (SETQ CHANGES (fetch TOBEDUMPED of FILEPROP)) + (SETQ FILEDATES (LISTP (fetch FILEDATES of ROOTNAME))) + (SETQ FILETYPE (GETPROP ROOTNAME 'FILETYPE)) + (RESETLST + [COND + ((MEMB 'NOCLISP OPTIONS) + (RESETSAVE PRETTYTRANFLG T)) + ((MEMB 'CLISP% OPTIONS) + (RESETSAVE PRETTYTRANFLG 'BOTH] + (RESETSAVE %#UNDOSAVES) + [COND + ((OR (MEMB 'CLISPIFY OPTIONS) + (MEMB 'CLISP OPTIONS)) + (RESETSAVE CLISPIFYPRETTYFLG T)) + ((OR (EQ FILETYPE 'CLISP) + (MEMB 'CLISP (LISTP FILETYPE))) + (RESETSAVE CLISPIFYPRETTYFLG 'CHANGES] + (for X in MAKEFILEFORMS do (ERSETQ (EVAL X))) + [SETQ FILE (PRETTYDEF NIL FILE (fetch COMSNAME of FILEPROP) + T NIL CHANGES (CADR (ASSOC 'FORMAT OPTIONS]) + (SETQ LASTFILE ROOTNAME) + (/replace TOBEDUMPED of FILEPROP with NIL) + (COND + ((NOT (EQMEMB 'DON'TLIST FILETYPE)) + (pushnew NOTLISTEDFILES ROOTNAME))) + (COND + ((NOT (EQMEMB 'DON'TCOMPILE FILETYPE)) + (pushnew NOTCOMPILEDFILES ROOTNAME))) + [for TAIL OPT on OPTIONS do (SETQ OPT (CAR TAIL)) + (SELECTQ OPT + ((RC C) + (AND (MEMB ROOTNAME NOTCOMPILEDFILES) + (MAKEFILE1 FILE NIL (CDR TAIL)))) + (LIST (AND (MEMB ROOTNAME NOTLISTEDFILES) + (APPLY 'LISTFILES (LIST FILE)))) + (COND + ((MEMB (CL:IF (LISTP OPT) + (CAR OPT) + OPT) + MAKEFILEOPTIONS)) + ((FIXSPELL OPT NIL MAKEFILEOPTIONS NIL OPTIONS) + (GO $$LP)) + (T (ERROR "Unrecognized MAKEFILE option" OPT] + (RETURN FILE) + OUT (RETURN (LIST FILE "-- MAKEFILE not performed."]) + (FILECHANGES [LAMBDA (FILE TYPE) (* ; "Edited 2-Mar-2022 15:43 by larry") (* bvm%: "30-Aug-86 15:08") @@ -3040,14 +3083,14 @@ compiling " T) (ADDTOVAR USERMACROS + (M NIL (MAKE FILE FILE)) (M (X . Y) (E (MARKASCHANGED (COND ((LISTP 'X) (CAR 'X)) (T 'X)) 'USERMACROS) T) - (ORIGINAL (M X . Y))) - (M NIL (MAKE FILE FILE))) + (ORIGINAL (M X . Y)))) (ADDTOVAR EDITMACROS (M (X . Y) @@ -4824,7 +4867,7 @@ compiling " T) (LOCALFREEVARS NAME LITERALS VAL TYPE ONFILETYPE ORIGFLG) INFILECOMSPROP) -(BLOCK%: NIL MAKEFILE (LOCALVARS . T) +(BLOCK%: NIL MAKEFILE MAKEFILE-NEW (LOCALVARS . T) (SPECVARS FILE OPTIONS REPRINTFNS SOURCEFILE FILETYPE FILEDATES CHANGES)) (BLOCK%: ADDFILE ADDFILE ADDFILE0) @@ -4858,49 +4901,47 @@ compiling " T) (ADDTOVAR LAMA FILEPKGTYPE FILEPKGCOM FILEPKGCHANGES) ) -(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 (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))))) + (FILEMAP (NIL (19011 20684 (SEARCHPRETTYTYPELST 19021 . 19990) (PRETTYDEFMACROS 19992 . 20428) ( +FILEPKGCOMPROPS 20430 . 20682)) (21497 59073 (CLEANUP 21507 . 22897) (COMPILEFILES 22899 . 23175) ( +COMPILEFILES0 23177 . 24043) (CONTINUEDIT 24045 . 25422) (MAKEFILE 25424 . 35874) (MAKEFILE-NEW 35876 + . 40381) (FILECHANGES 40383 . 43147) (FILEPKG.MERGECHANGES 43149 . 43784) (FILEPKG.CHANGEDFNS 43786 + . 44098) (MAKEFILE1 44100 . 48312) (COMPILE-FILE? 48314 . 49901) (MAKEFILES 49903 . 51431) (ADDFILE +51433 . 53976) (ADDFILE0 53978 . 58102) (LISTFILES 58104 . 59071)) (59745 93331 (FILEPKGCHANGES 59755 + . 60934) (GETFILEPKGTYPE 60936 . 63886) (MARKASCHANGED 63888 . 65519) (FILECOMS 65521 . 65905) ( +WHEREIS 65907 . 67436) (SMASHFILECOMS 67438 . 67666) (FILEFNSLST 67668 . 67834) (FILECOMSLST 67836 . +68322) (UPDATEFILES 68324 . 72822) (INFILECOMS? 72824 . 74667) (INFILECOMTAIL 74669 . 75787) ( +INFILECOMS 75789 . 75950) (INFILECOM 75952 . 85970) (INFILECOMSVALS 85972 . 86279) (INFILECOMSVAL +86281 . 87289) (INFILECOMSPROP 87291 . 88084) (IFCPROPS 88086 . 89166) (IFCEXPRTYPE 89168 . 89784) ( +IFCPROPSCAN 89786 . 90747) (IFCDECLARE 90749 . 92008) (INFILEPAIRS 92010 . 92309) (INFILECOMSMACRO +92311 . 93329)) (93366 124052 (FILES? 93376 . 95487) (FILES?1 95489 . 96191) (FILES?PRINTLST 96193 . +96975) (ADDTOFILES? 96977 . 107520) (ADDTOFILE 107522 . 108438) (WHATIS 108440 . 110416) (ADDTOCOMS +110418 . 111956) (ADDTOCOM 111958 . 118445) (ADDTOCOM1 118447 . 119618) (ADDNEWCOM 119620 . 120670) ( +MAKENEWCOM 120672 . 122519) (DEFAULTMAKENEWCOM 122521 . 124050)) (124122 126939 (MERGEINSERT 124132 . +126475) (MERGEINSERT1 126477 . 126937)) (127093 128454 (ADDTOFILEKEYLST 127103 . 128452)) (128571 +139372 (DELFROMFILES 128581 . 129411) (DELFROMCOMS 129413 . 131092) (DELFROMCOM 131094 . 136859) ( +DELFROMCOM1 136861 . 137660) (REMOVEITEM 137662 . 138538) (MOVETOFILE 138540 . 139370)) (139586 141957 + (SAVEPUT 139596 . 141955)) (142082 150325 (UNMARKASCHANGED 142092 . 143576) (PREEDITFN 143578 . +146059) (POSTEDITPROPS 146061 . 148355) (POSTEDITALISTS 148357 . 150323)) (150470 169940 ( +ALISTS.GETDEF 150480 . 150859) (ALISTS.WHENCHANGED 150861 . 151507) (CLEARCLISPARRAY 151509 . 152687) +(EXPRESSIONS.WHENCHANGED 152689 . 153067) (MAKEALISTCOMS 153069 . 154084) (MAKEFILESCOMS 154086 . +155416) (MAKELISPXMACROSCOMS 155418 . 157436) (MAKEPROPSCOMS 157438 . 158064) (MAKEUSERMACROSCOMS +158066 . 159883) (PROPS.WHENCHANGED 159885 . 160506) (FILEGETDEF.LISPXMACROS 160508 . 161807) ( +FILEGETDEF.ALISTS 161809 . 162400) (FILEGETDEF.RECORDS 162402 . 163329) (FILEGETDEF.PROPS 163331 . +164126) (FILEGETDEF.MACROS 164128 . 165010) (FILEGETDEF.VARS 165012 . 165615) (FILEGETDEF.FNS 165617 + . 166857) (FILEPKGCOMS.PUTDEF 166859 . 168801) (FILES.PUTDEF 168803 . 169671) (VARS.PUTDEF 169673 . +169816) (FILES.WHENCHANGED 169818 . 169938)) (171962 179193 (RENAME 171972 . 173417) (CHANGECALLERS +173419 . 179191)) (179194 227103 (SHOWDEF 179204 . 180401) (COPYDEF 180403 . 183151) (GETDEF 183153 . +185696) (GETDEFCOM 185698 . 186664) (GETDEFCOM0 186666 . 187859) (GETDEFCURRENT 187861 . 194173) ( +GETDEFERR 194175 . 195445) (GETDEFFROMFILE 195447 . 199676) (GETDEFSAVED 199678 . 200766) (PUTDEF +200768 . 201475) (EDITDEF 201477 . 202460) (DEFAULT.EDITDEF 202462 . 205300) (EDITDEF.FILES 205302 . +205507) (LOADDEF 205509 . 205685) (DWIMDEF 205687 . 206541) (DELDEF 206543 . 209437) (DELFROMLIST +209439 . 209943) (HASDEF 209945 . 216182) (GETFILEDEF 216184 . 216696) (SAVEDEF 216698 . 218386) ( +UNSAVEDEF 218388 . 219284) (COMPAREDEFS 219286 . 223092) (COMPARE 223094 . 223798) (TYPESOF 223800 . +227101)) (227253 235501 (FILEPKGCOM 227263 . 232039) (FILEPKGTYPE 232041 . 235499)) (247534 265009 ( +FINDCALLERS 247544 . 248174) (EDITCALLERS 248176 . 258893) (EDITFROMFILE 258895 . 264324) (FINDATS +264326 . 264598) (LOOKIN 264600 . 265007)) (265010 266681 (SEPRCASE 265020 . 266679)) (267198 272201 ( +IMPORTFILE 267208 . 268178) (IMPORTEVAL 268180 . 269066) (IMPORTFILESCAN 269068 . 269481) ( +CHECKIMPORTS 269483 . 270739) (GATHEREXPORTS 270741 . 271609) (\DUMPEXPORTS 271611 . 272199)) (272539 +274609 (CLEARFILEPKG 272549 . 274607))))) STOP diff --git a/sources/FILEPKG.LCOM b/sources/FILEPKG.LCOM index ca33e989277fdc429823a42559611cac92917a15..eb99cb773298c62138708db33f2ad2883e322ff8 100644 GIT binary patch delta 5584 zcmd5=TWlQF8Qz)MILYRM?c5wYaZZ+8)=Afy`^6;Aj(2D6v3GaIGvjPbfjIU$u_Y&N z5(q>sY(PAaR-%+6x~Q~ORY6OUsC^cAW&wu{g`TqaR%g;32c%k8mVp-yo{in|-MP8JVpmgzamng?kB0e^K z?n{$X<0UkG9>vj@GycGXM<=GwjdxF-zIgFU_vBRfx$)A}_?7NU)AwB*8^6?@wR4s` z(A#;3(t%=eQClHa?Gi=!8%Lu=>eRs!ngpTQp4^5y^?CJR=vKIuS-6Q<{*sxM%N-+{VZ&pKf{Lw+&?T7!5&Pxjw8MO-c+ z+`(+<{2a~|I%4?ob=&9PV}7XOzwO`~I#A?rl*OGbhZ-gtBMC{wg4KqPXfga~%i*n= zqMgqNEGm(aW(j{mU>BLR1 zB-U?9U1dij=6n`6&29}w$kL6ukDB;3shK?`=1%VEekLToSYlqyEvy}wXubR4fdfBb zxrO)hjVVw|)sSy@b$OO=1w)0RUC1C+M0e#+rwPCx2=gVDQ;m$u{|{UI`_zI^lFM) z+gLSXuC3S}nnPDdQj(wZ?HGZl)U>?MO?OrTjTPn7f zszFhfs_ds4xrOLNBXg>mn`?8LtGfP}vN_GI)x(`ecIKUM>vP5Sz8lvcsBWL>EHS6H zmbkfX%v{{rTHQXs1BR2=zUyr53pWu<8zM^(xZmJCsiVxp_^#9!m;?A)s*{xs{GQv= zj091Zkw4VqnzjcMNyCHr-Ay7SbFUQyj!XP52nH4kyBd5L=>}oo1X+XqZEFZg#7$<) z`oOe-lQ)RmwkU}+cJu8VFH!=F4E!^9=Q_%zgAib9M7pe!V_eU1kuH+F*~RIwkxI}E zg%UJb!Qbj>V@2}Q%Betxb;ieU_Oz{~@>B&h*oI&4Z{So}C7W24DAmrX0-bUy&*R6_ zZLGmlk&0r#bbAyjvPgu1846fVHY#M}&UJY+?Kwyha8pl9sI+Wou&0%iL3yI5Og+#N zMKZ_$LR1z-gqNHaPUZ>6ZUzJvc1Dq;hEt*>nNkgRZ{RhQGvT_3Dj(V_^3(c zJS)h0PM-L_?jmj3Ti}|)ZrqfOmjxXGBn826#>!HyNk~+lq81qnaGk6yjCeyrcEJuP zrU^UK*PgdKvklE=^mWSxY=eBX8eLJhzHv+Q~1FftS!I17GY76Mq1 z4b-=TWMzO30*Oq60uwM}P~k7!11>(giq~ ztox{}X>zzp1EWpXwF((3LsJA~W~yU2A503YyqhDat$_-)iH|fe*zWW@9oIt|xT`w$ zk*XQUh5uKZttylXMTV$Q1|3wfu8zv9P(L7dAfpT=9Fp{gDG?Tqz;87kP_jzo_ z&B*JDYMFbZQxwPJivc4QV5!^ZzazGXyg1jZc zq%|ER9fuA?t*I}-K5B;`$S@%JN+Surt(VtA05!r#Aaq4yN-Jmcf9Siw9D!=Lk0I5r ziHY=uI9lSKE>%(RIWq+KKKA6ypCSoShuhV@2|~Oq6gO%u^RM?myou#L!0D6Mk3`<5 zfEn(5ayIh45kSsJ2*)Au`?Ha+rD5eYr{%hfe>=S2NTey|&!O2H<|ggPV}f zAPvg#>RMhVM800l0dDIuOrGZjq^c?+T?h@lDj9WIs;I1308ZMg5D-(q5YrzR@+}XM z>|U8966jt{flkt-#duBF5L5{(VbOEC5 zfk%OY^?CV;|3vUD$CtwohBMY@qh>c^aOA#H~}GmCqfdS3YkM_1+rGXW7+($z}{gz1ukJXnNVw|bGR;nbCFWr)))E1IsOj8iyRI|yk|Emjj${bnUK2o6YE zska6>doxKELrK&gO)9UPst}0P*$ADbrXUlk5bXLRMuk96O`k5EIe!VMl3as4;Durd zYJ%GCFihai*WNt}Kodzv;yFl19StJ|L}rR*J6|+y=vtvoEkME7>XH?RX8lMRuy7d3 zVD&QE%21{1r^yQFQ9DfruO|Vi!RY|e;jN%2OL|zCtFIBrn79O`o}@9L=kg^ENwinH+RHVUM+lN zTR&d(PDIH)!ne~7f|p``@$I}p zHB=j3qB4ZLc0vu-B-=w4{-GX&uh&=}>0Mb%G52B_B z)fe;el}}~?x@6)7+6M`eL?@)OK|=|X(8B;8S$HLox4sMypqEDX%v2 z9U)oPByfE%n;cV3?x&U}UNzaThI#y?$zC;IvBNfLDogn%>@Z0eqBb+oZ*L?rmTY!- z=G{mF(6$ywDD@J`+dl0-tjuvx0`Q!uoZA4k2!NNwK$!1+C9T2<+j9!!gA7CzGBcfPb9^g%9LZ8$2wxk?cQ017<1Y2T&ZGl6{ zwNd3+Sl9^6wfAFUF&Z#(^J+u2Gt8b?44fS{c9oGc%-w7ZRhG^$U%$)|E@>TI!oq delta 5597 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 From 90c81b6f60f4e45ae7727542c0133e09ebf498ad Mon Sep 17 00:00:00 2001 From: Larry Masinter Date: Thu, 18 Apr 2024 12:57:42 -0700 Subject: [PATCH 2/2] reduce changes: no separate MAKEFILE-NEW but fix so it will not copy from previous version if you do MAKEFILE(something NEW). --- sources/FILEPKG | 172 +++++++++++++------------------------------ sources/FILEPKG.LCOM | Bin 103792 -> 103638 bytes 2 files changed, 51 insertions(+), 121 deletions(-) diff --git a/sources/FILEPKG b/sources/FILEPKG index bed0271fc..c7166977f 100644 --- a/sources/FILEPKG +++ b/sources/FILEPKG @@ -1,13 +1,13 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "30-Jan-2024 15:03:40" {DSK}larry>il>medley>sources>FILEPKG.;5 277737 +(FILECREATED "18-Apr-2024 12:53:26" {DSK}larry>il>medley>sources>FILEPKG.;53 273166 :EDIT-BY "lmm" - :CHANGES-TO (FNS COMPILEFILES0 MAKEFILE-NEW MAKEFILE) - (VARS FILEPKGCOMS) + :CHANGES-TO (VARS FILEPKGCOMS) + (FNS MAKEFILE) - :PREVIOUS-DATE "18-Jul-2023 23:40:13" {DSK}larry>il>medley>sources>FILEPKG.;1) + :PREVIOUS-DATE "18-Apr-2024 12:33:38" {DSK}larry>il>medley>sources>FILEPKG.;52) (PRETTYCOMPRINT FILEPKGCOMS) @@ -32,7 +32,7 @@ [COMS (* ;; "making, adding, listing, compiling files") - (FNS CLEANUP COMPILEFILES COMPILEFILES0 CONTINUEDIT MAKEFILE MAKEFILE-NEW FILECHANGES + (FNS CLEANUP COMPILEFILES COMPILEFILES0 CONTINUEDIT MAKEFILE FILECHANGES FILEPKG.MERGECHANGES FILEPKG.CHANGEDFNS MAKEFILE1 COMPILE-FILE? MAKEFILES ADDFILE ADDFILE0 LISTFILES) (INITVARS (*DEFAULT-CLEANUP-COMPILER* 'CL:COMPILE-FILE) @@ -165,7 +165,7 @@ INFILECOMSVALS INFILEPAIRS INFILECOMSMACRO IFCPROPS IFCEXPRTYPE IFCPROPSCAN IFCDECLARE (LOCALFREEVARS NAME LITERALS VAL TYPE ONFILETYPE ORIGFLG) INFILECOMSPROP) - (NIL MAKEFILE MAKEFILE-NEW (LOCALVARS . T) + (NIL MAKEFILE (LOCALVARS . T) (SPECVARS FILE OPTIONS REPRINTFNS SOURCEFILE FILETYPE FILEDATES CHANGES)) (ADDFILE ADDFILE ADDFILE0) (FILEPKGCHANGES FILEPKGCHANGES (NOLINKFNS . T)) @@ -589,76 +589,6 @@ (RETURN FILE) OUT (RETURN (LIST FILE "-- MAKEFILE not performed."]) -(MAKEFILE-NEW - [LAMBDA (FILE OPTIONS) (* ; "Edited 30-Jan-2024 14:58 by lmm") - (* ; "Edited 10-Oct-2021 20:36 by rmk:") - (* ; "Edited 29-Jun-2021 17:24 by rmk:") - - (* ;; "OPTIONS: FAST means dump with PRETTYFLG set to NIL; LIST means list the FILE; RC means RECOMPILE, C means COMPILEL; --- for C AND RC assume ST unless next option is F.") - - (* ;; "RMK: OPTIONS can specify external format, either as a pair like (FORMAT :UTF-8) or just :UTF-8 where (FIND-FORMAT :UTF-8) is non NIL.") - - [SETQ OPTIONS (for OPT inside OPTIONS collect (CL:IF (FIND-FORMAT OPT T) - (LIST 'FORMAT OPT))] - (PROG ((PRETTYFLG (AND (NOT (MEMB 'FAST OPTIONS)) - PRETTYFLG)) - (*PRINT-BASE* (if (EQ *PRINT-BASE* 8) - then 8 - else (* ; "make sure radix is either 8 or 10, because all others don't read in like they print. Maybe obsolete now with makefile environments") - 10)) - FILETYPE ROOTNAME FILEPROP CHANGES FILEDATES (Z (ADDFILE FILE))) - (DECLARE (CL:SPECIAL PRETTYFLG)) - (SETQ FILE (CAR Z)) (* ; - "Necessary because FILE might have been misspelled.") - (SETQ ROOTNAME (CADR Z)) (* ; "result of (ROOTFILENAME FILE), or if FILE is corrected, result of applying ROOTFILENAME to correct value.") - (SETQ FILEPROP (CDDR Z)) - (UPDATEFILES) (* ; "Want updating done after file is added to filelst, so any functions that are being dumped are marked as having been dumped.") - (SETQ CHANGES (fetch TOBEDUMPED of FILEPROP)) - (SETQ FILEDATES (LISTP (fetch FILEDATES of ROOTNAME))) - (SETQ FILETYPE (GETPROP ROOTNAME 'FILETYPE)) - (RESETLST - [COND - ((MEMB 'NOCLISP OPTIONS) - (RESETSAVE PRETTYTRANFLG T)) - ((MEMB 'CLISP% OPTIONS) - (RESETSAVE PRETTYTRANFLG 'BOTH] - (RESETSAVE %#UNDOSAVES) - [COND - ((OR (MEMB 'CLISPIFY OPTIONS) - (MEMB 'CLISP OPTIONS)) - (RESETSAVE CLISPIFYPRETTYFLG T)) - ((OR (EQ FILETYPE 'CLISP) - (MEMB 'CLISP (LISTP FILETYPE))) - (RESETSAVE CLISPIFYPRETTYFLG 'CHANGES] - (for X in MAKEFILEFORMS do (ERSETQ (EVAL X))) - [SETQ FILE (PRETTYDEF NIL FILE (fetch COMSNAME of FILEPROP) - T NIL CHANGES (CADR (ASSOC 'FORMAT OPTIONS]) - (SETQ LASTFILE ROOTNAME) - (/replace TOBEDUMPED of FILEPROP with NIL) - (COND - ((NOT (EQMEMB 'DON'TLIST FILETYPE)) - (pushnew NOTLISTEDFILES ROOTNAME))) - (COND - ((NOT (EQMEMB 'DON'TCOMPILE FILETYPE)) - (pushnew NOTCOMPILEDFILES ROOTNAME))) - [for TAIL OPT on OPTIONS do (SETQ OPT (CAR TAIL)) - (SELECTQ OPT - ((RC C) - (AND (MEMB ROOTNAME NOTCOMPILEDFILES) - (MAKEFILE1 FILE NIL (CDR TAIL)))) - (LIST (AND (MEMB ROOTNAME NOTLISTEDFILES) - (APPLY 'LISTFILES (LIST FILE)))) - (COND - ((MEMB (CL:IF (LISTP OPT) - (CAR OPT) - OPT) - MAKEFILEOPTIONS)) - ((FIXSPELL OPT NIL MAKEFILEOPTIONS NIL OPTIONS) - (GO $$LP)) - (T (ERROR "Unrecognized MAKEFILE option" OPT] - (RETURN FILE) - OUT (RETURN (LIST FILE "-- MAKEFILE not performed."]) - (FILECHANGES [LAMBDA (FILE TYPE) (* ; "Edited 2-Mar-2022 15:43 by larry") (* bvm%: "30-Aug-86 15:08") @@ -3083,14 +3013,14 @@ compiling " T) (ADDTOVAR USERMACROS - (M NIL (MAKE FILE FILE)) (M (X . Y) (E (MARKASCHANGED (COND ((LISTP 'X) (CAR 'X)) (T 'X)) 'USERMACROS) T) - (ORIGINAL (M X . Y)))) + (ORIGINAL (M X . Y))) + (M NIL (MAKE FILE FILE))) (ADDTOVAR EDITMACROS (M (X . Y) @@ -4867,7 +4797,7 @@ compiling " T) (LOCALFREEVARS NAME LITERALS VAL TYPE ONFILETYPE ORIGFLG) INFILECOMSPROP) -(BLOCK%: NIL MAKEFILE MAKEFILE-NEW (LOCALVARS . T) +(BLOCK%: NIL MAKEFILE (LOCALVARS . T) (SPECVARS FILE OPTIONS REPRINTFNS SOURCEFILE FILETYPE FILEDATES CHANGES)) (BLOCK%: ADDFILE ADDFILE ADDFILE0) @@ -4902,46 +4832,46 @@ compiling " T) (ADDTOVAR LAMA FILEPKGTYPE FILEPKGCOM FILEPKGCHANGES) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (19011 20684 (SEARCHPRETTYTYPELST 19021 . 19990) (PRETTYDEFMACROS 19992 . 20428) ( -FILEPKGCOMPROPS 20430 . 20682)) (21497 59073 (CLEANUP 21507 . 22897) (COMPILEFILES 22899 . 23175) ( -COMPILEFILES0 23177 . 24043) (CONTINUEDIT 24045 . 25422) (MAKEFILE 25424 . 35874) (MAKEFILE-NEW 35876 - . 40381) (FILECHANGES 40383 . 43147) (FILEPKG.MERGECHANGES 43149 . 43784) (FILEPKG.CHANGEDFNS 43786 - . 44098) (MAKEFILE1 44100 . 48312) (COMPILE-FILE? 48314 . 49901) (MAKEFILES 49903 . 51431) (ADDFILE -51433 . 53976) (ADDFILE0 53978 . 58102) (LISTFILES 58104 . 59071)) (59745 93331 (FILEPKGCHANGES 59755 - . 60934) (GETFILEPKGTYPE 60936 . 63886) (MARKASCHANGED 63888 . 65519) (FILECOMS 65521 . 65905) ( -WHEREIS 65907 . 67436) (SMASHFILECOMS 67438 . 67666) (FILEFNSLST 67668 . 67834) (FILECOMSLST 67836 . -68322) (UPDATEFILES 68324 . 72822) (INFILECOMS? 72824 . 74667) (INFILECOMTAIL 74669 . 75787) ( -INFILECOMS 75789 . 75950) (INFILECOM 75952 . 85970) (INFILECOMSVALS 85972 . 86279) (INFILECOMSVAL -86281 . 87289) (INFILECOMSPROP 87291 . 88084) (IFCPROPS 88086 . 89166) (IFCEXPRTYPE 89168 . 89784) ( -IFCPROPSCAN 89786 . 90747) (IFCDECLARE 90749 . 92008) (INFILEPAIRS 92010 . 92309) (INFILECOMSMACRO -92311 . 93329)) (93366 124052 (FILES? 93376 . 95487) (FILES?1 95489 . 96191) (FILES?PRINTLST 96193 . -96975) (ADDTOFILES? 96977 . 107520) (ADDTOFILE 107522 . 108438) (WHATIS 108440 . 110416) (ADDTOCOMS -110418 . 111956) (ADDTOCOM 111958 . 118445) (ADDTOCOM1 118447 . 119618) (ADDNEWCOM 119620 . 120670) ( -MAKENEWCOM 120672 . 122519) (DEFAULTMAKENEWCOM 122521 . 124050)) (124122 126939 (MERGEINSERT 124132 . -126475) (MERGEINSERT1 126477 . 126937)) (127093 128454 (ADDTOFILEKEYLST 127103 . 128452)) (128571 -139372 (DELFROMFILES 128581 . 129411) (DELFROMCOMS 129413 . 131092) (DELFROMCOM 131094 . 136859) ( -DELFROMCOM1 136861 . 137660) (REMOVEITEM 137662 . 138538) (MOVETOFILE 138540 . 139370)) (139586 141957 - (SAVEPUT 139596 . 141955)) (142082 150325 (UNMARKASCHANGED 142092 . 143576) (PREEDITFN 143578 . -146059) (POSTEDITPROPS 146061 . 148355) (POSTEDITALISTS 148357 . 150323)) (150470 169940 ( -ALISTS.GETDEF 150480 . 150859) (ALISTS.WHENCHANGED 150861 . 151507) (CLEARCLISPARRAY 151509 . 152687) -(EXPRESSIONS.WHENCHANGED 152689 . 153067) (MAKEALISTCOMS 153069 . 154084) (MAKEFILESCOMS 154086 . -155416) (MAKELISPXMACROSCOMS 155418 . 157436) (MAKEPROPSCOMS 157438 . 158064) (MAKEUSERMACROSCOMS -158066 . 159883) (PROPS.WHENCHANGED 159885 . 160506) (FILEGETDEF.LISPXMACROS 160508 . 161807) ( -FILEGETDEF.ALISTS 161809 . 162400) (FILEGETDEF.RECORDS 162402 . 163329) (FILEGETDEF.PROPS 163331 . -164126) (FILEGETDEF.MACROS 164128 . 165010) (FILEGETDEF.VARS 165012 . 165615) (FILEGETDEF.FNS 165617 - . 166857) (FILEPKGCOMS.PUTDEF 166859 . 168801) (FILES.PUTDEF 168803 . 169671) (VARS.PUTDEF 169673 . -169816) (FILES.WHENCHANGED 169818 . 169938)) (171962 179193 (RENAME 171972 . 173417) (CHANGECALLERS -173419 . 179191)) (179194 227103 (SHOWDEF 179204 . 180401) (COPYDEF 180403 . 183151) (GETDEF 183153 . -185696) (GETDEFCOM 185698 . 186664) (GETDEFCOM0 186666 . 187859) (GETDEFCURRENT 187861 . 194173) ( -GETDEFERR 194175 . 195445) (GETDEFFROMFILE 195447 . 199676) (GETDEFSAVED 199678 . 200766) (PUTDEF -200768 . 201475) (EDITDEF 201477 . 202460) (DEFAULT.EDITDEF 202462 . 205300) (EDITDEF.FILES 205302 . -205507) (LOADDEF 205509 . 205685) (DWIMDEF 205687 . 206541) (DELDEF 206543 . 209437) (DELFROMLIST -209439 . 209943) (HASDEF 209945 . 216182) (GETFILEDEF 216184 . 216696) (SAVEDEF 216698 . 218386) ( -UNSAVEDEF 218388 . 219284) (COMPAREDEFS 219286 . 223092) (COMPARE 223094 . 223798) (TYPESOF 223800 . -227101)) (227253 235501 (FILEPKGCOM 227263 . 232039) (FILEPKGTYPE 232041 . 235499)) (247534 265009 ( -FINDCALLERS 247544 . 248174) (EDITCALLERS 248176 . 258893) (EDITFROMFILE 258895 . 264324) (FINDATS -264326 . 264598) (LOOKIN 264600 . 265007)) (265010 266681 (SEPRCASE 265020 . 266679)) (267198 272201 ( -IMPORTFILE 267208 . 268178) (IMPORTEVAL 268180 . 269066) (IMPORTFILESCAN 269068 . 269481) ( -CHECKIMPORTS 269483 . 270739) (GATHEREXPORTS 270741 . 271609) (\DUMPEXPORTS 271611 . 272199)) (272539 -274609 (CLEARFILEPKG 272549 . 274607))))) + (FILEMAP (NIL (18960 20633 (SEARCHPRETTYTYPELST 18970 . 19939) (PRETTYDEFMACROS 19941 . 20377) ( +FILEPKGCOMPROPS 20379 . 20631)) (21446 54515 (CLEANUP 21456 . 22846) (COMPILEFILES 22848 . 23124) ( +COMPILEFILES0 23126 . 23992) (CONTINUEDIT 23994 . 25371) (MAKEFILE 25373 . 35823) (FILECHANGES 35825 + . 38589) (FILEPKG.MERGECHANGES 38591 . 39226) (FILEPKG.CHANGEDFNS 39228 . 39540) (MAKEFILE1 39542 . +43754) (COMPILE-FILE? 43756 . 45343) (MAKEFILES 45345 . 46873) (ADDFILE 46875 . 49418) (ADDFILE0 49420 + . 53544) (LISTFILES 53546 . 54513)) (55187 88773 (FILEPKGCHANGES 55197 . 56376) (GETFILEPKGTYPE 56378 + . 59328) (MARKASCHANGED 59330 . 60961) (FILECOMS 60963 . 61347) (WHEREIS 61349 . 62878) ( +SMASHFILECOMS 62880 . 63108) (FILEFNSLST 63110 . 63276) (FILECOMSLST 63278 . 63764) (UPDATEFILES 63766 + . 68264) (INFILECOMS? 68266 . 70109) (INFILECOMTAIL 70111 . 71229) (INFILECOMS 71231 . 71392) ( +INFILECOM 71394 . 81412) (INFILECOMSVALS 81414 . 81721) (INFILECOMSVAL 81723 . 82731) (INFILECOMSPROP +82733 . 83526) (IFCPROPS 83528 . 84608) (IFCEXPRTYPE 84610 . 85226) (IFCPROPSCAN 85228 . 86189) ( +IFCDECLARE 86191 . 87450) (INFILEPAIRS 87452 . 87751) (INFILECOMSMACRO 87753 . 88771)) (88808 119494 ( +FILES? 88818 . 90929) (FILES?1 90931 . 91633) (FILES?PRINTLST 91635 . 92417) (ADDTOFILES? 92419 . +102962) (ADDTOFILE 102964 . 103880) (WHATIS 103882 . 105858) (ADDTOCOMS 105860 . 107398) (ADDTOCOM +107400 . 113887) (ADDTOCOM1 113889 . 115060) (ADDNEWCOM 115062 . 116112) (MAKENEWCOM 116114 . 117961) +(DEFAULTMAKENEWCOM 117963 . 119492)) (119564 122381 (MERGEINSERT 119574 . 121917) (MERGEINSERT1 121919 + . 122379)) (122535 123896 (ADDTOFILEKEYLST 122545 . 123894)) (124013 134814 (DELFROMFILES 124023 . +124853) (DELFROMCOMS 124855 . 126534) (DELFROMCOM 126536 . 132301) (DELFROMCOM1 132303 . 133102) ( +REMOVEITEM 133104 . 133980) (MOVETOFILE 133982 . 134812)) (135028 137399 (SAVEPUT 135038 . 137397)) ( +137524 145767 (UNMARKASCHANGED 137534 . 139018) (PREEDITFN 139020 . 141501) (POSTEDITPROPS 141503 . +143797) (POSTEDITALISTS 143799 . 145765)) (145912 165382 (ALISTS.GETDEF 145922 . 146301) ( +ALISTS.WHENCHANGED 146303 . 146949) (CLEARCLISPARRAY 146951 . 148129) (EXPRESSIONS.WHENCHANGED 148131 + . 148509) (MAKEALISTCOMS 148511 . 149526) (MAKEFILESCOMS 149528 . 150858) (MAKELISPXMACROSCOMS 150860 + . 152878) (MAKEPROPSCOMS 152880 . 153506) (MAKEUSERMACROSCOMS 153508 . 155325) (PROPS.WHENCHANGED +155327 . 155948) (FILEGETDEF.LISPXMACROS 155950 . 157249) (FILEGETDEF.ALISTS 157251 . 157842) ( +FILEGETDEF.RECORDS 157844 . 158771) (FILEGETDEF.PROPS 158773 . 159568) (FILEGETDEF.MACROS 159570 . +160452) (FILEGETDEF.VARS 160454 . 161057) (FILEGETDEF.FNS 161059 . 162299) (FILEPKGCOMS.PUTDEF 162301 + . 164243) (FILES.PUTDEF 164245 . 165113) (VARS.PUTDEF 165115 . 165258) (FILES.WHENCHANGED 165260 . +165380)) (167404 174635 (RENAME 167414 . 168859) (CHANGECALLERS 168861 . 174633)) (174636 222545 ( +SHOWDEF 174646 . 175843) (COPYDEF 175845 . 178593) (GETDEF 178595 . 181138) (GETDEFCOM 181140 . 182106 +) (GETDEFCOM0 182108 . 183301) (GETDEFCURRENT 183303 . 189615) (GETDEFERR 189617 . 190887) ( +GETDEFFROMFILE 190889 . 195118) (GETDEFSAVED 195120 . 196208) (PUTDEF 196210 . 196917) (EDITDEF 196919 + . 197902) (DEFAULT.EDITDEF 197904 . 200742) (EDITDEF.FILES 200744 . 200949) (LOADDEF 200951 . 201127) + (DWIMDEF 201129 . 201983) (DELDEF 201985 . 204879) (DELFROMLIST 204881 . 205385) (HASDEF 205387 . +211624) (GETFILEDEF 211626 . 212138) (SAVEDEF 212140 . 213828) (UNSAVEDEF 213830 . 214726) ( +COMPAREDEFS 214728 . 218534) (COMPARE 218536 . 219240) (TYPESOF 219242 . 222543)) (222695 230943 ( +FILEPKGCOM 222705 . 227481) (FILEPKGTYPE 227483 . 230941)) (242976 260451 (FINDCALLERS 242986 . 243616 +) (EDITCALLERS 243618 . 254335) (EDITFROMFILE 254337 . 259766) (FINDATS 259768 . 260040) (LOOKIN +260042 . 260449)) (260452 262123 (SEPRCASE 260462 . 262121)) (262640 267643 (IMPORTFILE 262650 . +263620) (IMPORTEVAL 263622 . 264508) (IMPORTFILESCAN 264510 . 264923) (CHECKIMPORTS 264925 . 266181) ( +GATHEREXPORTS 266183 . 267051) (\DUMPEXPORTS 267053 . 267641)) (267981 270051 (CLEARFILEPKG 267991 . +270049))))) STOP diff --git a/sources/FILEPKG.LCOM b/sources/FILEPKG.LCOM index eb99cb773298c62138708db33f2ad2883e322ff8..493eb857c10e1384cc8a7355230812e09b016678 100644 GIT binary patch delta 2863 zcmcguU2G%O754Sm*(K%231JhGC7d;|B_92tw37DV;`#arKm{!2qfA^BO$d?`_OZ*$NPg& zB_7%+@|=6_J%8Uh_nbTU_1Is2HTJXalwwt!r@m8BWtD=WRw=D2%Fn;K)>ju{ynMr^ zQdO)f)yi=0{FC2$>WTY%u={N&H`~4s*PmNnUM@rLYfpc@2cIWzlo!Vrnx600W7kRD z#%B(xRZXjER++s^DmUpWsHSO{l$|BznU=HVa=}HYMzP!R!gf+=pb9oYX2>{ukDQY9 z#c}qhqsI>J$-iQpY;?VrA3BX@kTm^uXo3z)Q5@D?w^6A(iJL4T&tT5XT^MU_p&;eR z&iSJgrQBC@_}8A@eUg7WvlEi!-Nebs$NBGIr<7Yz*(b&fd#PSvTlTFt>rf5CxaA-a zGW%&~W(-3_OxWh{POw9}d79gSde~~YK{|BBgd4p>2Yxb^&*f{qJQ-TKw3^S8o>m+D zvWA4PFYSF<>~(KtYj4f(++MqoKbLb3R(lf@c~3el)JjA;JmTfI_dX?^!KHsr$i>>; zT#q~|J-3OB-}K1q{^60Wo!PTL+B*40UON1^RjOey28G0{R%17D({|AHf(Ga|oN0A@ zFG)dX5FBT3S8t!B_GizrQxAT0_J+U|8#;(X6I2<(*jvYN7oqUi+s1OFCLK<9=ZDd~ zDm}Ab_-;*vRU+Mc2bX5L^Y{_`$7;Ld9O*0jg^-bY)+9js0t7w{UXy{7JU+P)z>8UVrF^6FR#Wml zwz78lmS?VX=X)9M>a(>eXC|EFUj0_^!pYgpQdr9Gy)!&_u{*ypc=hQ__1;pCd}XR9 zy+|(I9ZsPrJ5!q@Z?o^$R>+UpVeJ%IU?0|&^P0g<1k;lVUNudDr2TN@crh+i4)PQd ziVW*+nuZZaQBf>~pJyMm3S%gvm|T3WfRu&;GgtYt#rZ`nKT8kY|u#49t0!!sa=Oi#~tn$0^rj-?YQ8G1~mFlySsqpU{;XB8R2^c~Z z>NKd1vQz9r{V3rkIZNRz5d%MoH$=Fq+Z0$Syfd#`JoX~!y2crI6hI%M#G^wAT@&sg zJ5w~+IwI+^IaEV!MW~VJ$OTFTW++L8o;d)j7;wf5MAr#h$=U;6v)*v)z7xAZWsU;+ zsTmx^X_V895lcif&E9ki!)R^>O;*5n@LH(+UhoVQB~`wfrTZ~UwhFPEHsi3x^Tg9B zU^TBHOob&b%f8Vp_hlWhp{40|!)>;ldK~gpQxmwqNXoVaxWg$+1~2f^juZ10R!~MM zSW9kt8f;Ss_YqWgcJaqMh^jlHyvtkelo9?R9@! zD6~~w7#}VWysJiS*&N!mbQ2uWA1rE&C{5>^>2~CTg)WKx1Wdyk%9uI@CyLylArzZb z2dB{(+BeZYhLF0g$j6=zCb}?MpbCY8x1218Q4A)+mC;yErUnrh#*JYcSW3u6d@>gd z^%^P5kb$gQHYfX7^!SgJ#+3~z#BFp4y&N(r<{@KJQyDR_Q+iF2V5-Z42~<@@@ACq@ z!xV3HR%`cFL9nFtt#!F8qW&4|VAN<1GBsTVY;afJ~aGC)jIL#(VZUYC?PKorS=X&Jy;G#3^ z>>K$<_WsVtXx7EppSO-<(-=EAv!y)o1tvHB;*;A3wrbD)mzn+O|7KqI|6lVOugWOJ zspI*MEMw17E%tu(OP@c&=MFyly?4)pOW0(bwx3o;53PzDbi6nWcvksa$p%pnm}?mV zr-cu(TyLzHBi#~fz8m+ax|1TgV$AYKl5J#lgjEaJr@7w1?edjjL)cEEHa;&bPVou@ zY$O>|!wZCcBEo_lu?!(z!AE1mjj#6%-&**9srz?^iQ8Pmem;^=&5SxY{a*Bdq*Ckh w%eRnMj*e?Kb_Wbbvo5!fk;R?ol|H#J4GS#@JRd*krYL#wbNP-wdFdsQWBtMU{fKtld$WFmyDzVL#Os1W6)Ra1oez>_QWx#HYAJc&%6(m~Of)rye?X>@-mE zVF#3oDi_iEjhSPh*Dw@=t_a2F>V7)_6hlTbYTK7MIpaBsaTM6C6swGE7C^ciQJWZ zW?CV1y*5r~twH*BVQR3^aoa85ZZy59*_xw&Elkm$Sb`%JllcG(BJGpKW%BhD2Aoo2}*r>FzOCT;BLhxXh&Xwmut@`>Gpf zy23Z5+ZPiiefRe#r~cW_SHUCQK#^Oigihqdi(bd|8b~MT+4fS)jbfx3slR=6@ZMkz z6CFV=+Kv~4zX;3P(W6Gbpi0H)p%}~e#_8(|qqOji&1lJPp(er>@7Hfg+hH!wMU$31$i3#-RoD;`>z_O09r2>DH-n9D#6MzMJ z**+$!Oqet2LTysSGQD1#%tDzprbNOr0nrJ`vRE6R7EOknIAN+fQyqkUfK0;eNv6yo zqx5pSPckemlh?c>y^cRgB z51ZLkleqgLqynA^5kmJG;|BtY!LyZ(kfI+lxu>ImQdI8OR~6YnEgPN<(ZMN5DFjdC zB&YYC{>MxdI&m}f+bsVFDKieUrzJ%J9Gz+wd)P!Ua^iTo;WXQJJ@g|0>N1~7jKuJ| zoF-7Rr6AXHV?ML63>qJJrK*h58zLik=L>+q%2651#K?IDj75>_dl9l=EZDs;w3m^k znIP#!vF*ihp;~C(4@0-sa=1ZkVB^|u*bQkt{|Jw78B-0O2L?b z%Xm3(kcq)EyN^)MFw_KOK+tv&I9`M6Ff@$pMoNQy2q|{jL5odg16^OA5 z;bWk$E)=%kzi3>2XgNt97`Cj+2G0$#0u%j)+N(v=-DVNP8DW`w=AY93JhI!uks$@B|*h^q706B+Y z0eyeTfq$&n$sovIjDy7(>6lThIS`DKl&NUQhZi0o!f%*Yx=eE!^^M$u0|CCC%?%xnh XVc^!E*MzZKpR5V?&d=8b_mTeqwQkFm