github.com/Interlisp.medley
1
0
Fork 0
mirror of synced 2026-03-13 22:19:30 +00:00
Code Issues Projects Releases Wiki Activity

reduce changes: no separate MAKEFILE-NEW but fix so it will not copy from previous version if you do MAKEFILE(something NEW).

Browse Source
This commit is contained in:
Larry Masinter
2024-04-18 12:57:42 -07:00
parent 929690c6a3
commit 90c81b6f60
2 changed files with 51 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

172
sources/FILEPKG
View File

@@ -1,13 +1,13 @@
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
(FILECREATED "30-Jan-2024 15:03:40" {DSK}<home>larry>il>medley>sources>FILEPKG.;5 277737
(FILECREATED "18-Apr-2024 12:53:26" {DSK}<home>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}<home>larry>il>medley>sources>FILEPKG.;1)
:PREVIOUS-DATE "18-Apr-2024 12:33:38" {DSK}<home>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

BIN
sources/FILEPKG.LCOM
View File

Binary file not shown.