From 8266980c222fcf6b9a6264dd89d66aef583b2f7e Mon Sep 17 00:00:00 2001 From: rmkaplan Date: Thu, 25 Nov 2021 08:13:15 -0800 Subject: [PATCH] FILEPKG: SHOWDEF uses reader environment, better COMPAREDEFS formatting --- sources/FILEPKG | 360 +++++++++++++++++++++---------------------- sources/FILEPKG.LCOM | Bin 102874 -> 102913 bytes 2 files changed, 180 insertions(+), 180 deletions(-) diff --git a/sources/FILEPKG b/sources/FILEPKG index 2e65e312..51d74d28 100644 --- a/sources/FILEPKG +++ b/sources/FILEPKG @@ -1,12 +1,11 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "10-Oct-2021 20:36:54"  -{DSK}kaplan>Local>medley3.5>git-medley>sources>FILEPKG.;10 284821 +(FILECREATED " 8-Nov-2021 10:52:49" {DSK}kaplan>Local>medley3.5>my-medley>sources>FILEPKG.;15 284792 - changes to%: (FNS MAKEFILE) + changes to%: (FNS COMPAREDEFS) - previous date%: " 8-Oct-2021 23:56:39" -{DSK}kaplan>Local>medley3.5>git-medley>sources>FILEPKG.;9) + previous date%: "30-Oct-2021 20:03:07" +{DSK}kaplan>Local>medley3.5>my-medley>sources>FILEPKG.;14) (* ; " @@ -21,7 +20,7 @@ with the terms of said license. (RPAQQ FILEPKGCOMS [(COMS (* ; - "standard records for accessing file package type/command parts. Exported for PRETTY") + "standard records for accessing file package type/command parts. Exported for PRETTY") (VARS FILEPKGTYPEPROPS) (EXPORT (DECLARE%: EVAL@COMPILE DONTCOPY (RECORDS * FILEPKGRECORDS))) (FNS SEARCHPRETTYTYPELST PRETTYDEFMACROS FILEPKGCOMPROPS) @@ -87,7 +86,7 @@ with the terms of said license. (MOVD? 'MOVETOFILE 'MOVEITEM NIL T)) (ADDVARS (SYSPROPS PROPTYPE VARTYPE))) [COMS (* ; - "functions for doing things and marking them changed and auxiliary functions") + "functions for doing things and marking them changed and auxiliary functions") (FNS SAVEPUT) [DECLARE%: DONTEVAL@LOAD DOCOPY (P (OR (CHANGENAME 'PUTPROPS 'PUTPROP 'SAVEPUT) (CHANGENAME 'PUTPROPS '/PUT 'SAVEPUT] @@ -95,7 +94,7 @@ with the terms of said license. (ADDVARS (LISPXFNS (PUT . SAVEPUT) (PUTPROP . SAVEPUT] (COMS (* ; - "sub-functions for file package commands & types") + "sub-functions for file package commands & types") (FNS ALISTS.GETDEF ALISTS.WHENCHANGED CLEARCLISPARRAY EXPRESSIONS.WHENCHANGED MAKEALISTCOMS MAKEFILESCOMS MAKELISPXMACROSCOMS MAKEPROPSCOMS MAKEUSERMACROSCOMS PROPS.WHENCHANGED FILEGETDEF.LISPXMACROS FILEGETDEF.ALISTS FILEGETDEF.RECORDS @@ -109,7 +108,7 @@ with the terms of said license. LISPXHISTORYMACROS LISPXMACROS PRETTYDEFMACROS PRETTYEQUIVLST PRETTYPRINTMACROS PRETTYPRINTYPEMACROS USERMACROS)) (COMS (* ; - "Define the commands below AFTER the various properties have been established.") + "Define the commands below AFTER the various properties have been established.") (USERMACROS M)) (COMS (* ; "GETDEF methods") (FNS RENAME CHANGECALLERS) @@ -120,7 +119,7 @@ with the terms of said license. (* ; "Must come after PUTDEF") (FNS FIXEDITDATE EDITDATE?) (* ; - "Edit date support for all kinds of definers (from PARC 6/10/92)") + "Edit date support for all kinds of definers (from PARC 6/10/92)") [VARS (EDITDATE-ARGLIST-DEFINERS '(FUNCTIONS TYPES)) (EDITDATE-NAME-DEFINERS '(STRUCTURES VARIABLES] (GLOBALVARS EDITDATE-ARGLIST-DEFINERS EDITDATE-NAME-DEFINERS) @@ -211,99 +210,91 @@ with the terms of said license. (* ; "standard records for accessing file package type/command parts. Exported for PRETTY") -(RPAQQ FILEPKGTYPEPROPS (NEWCOM WHENFILED WHENUNFILED GETDEF NULLDEF DELDEF PUTDEF WHENCHANGED - HASDEF EDITDEF CANFILEDEF FILEGETDEF)) +(RPAQQ FILEPKGTYPEPROPS (NEWCOM WHENFILED WHENUNFILED GETDEF NULLDEF DELDEF PUTDEF WHENCHANGED HASDEF + EDITDEF CANFILEDEF FILEGETDEF)) (* "FOLLOWING DEFINITIONS EXPORTED")(DECLARE%: EVAL@COMPILE DONTCOPY (RPAQQ FILEPKGRECORDS (FILEPKGCOM FILEPKGTYPE FILE FILEDATEPAIR FILEPROP)) (DECLARE%: EVAL@COMPILE (ACCESSFNS FILEPKGCOM [[ADD (GETPROP DATUM 'ADDTOPRETTYCOM) - (UNDOABLE (COND - (NEWVALUE (/PUTPROP DATUM 'ADDTOPRETTYCOM NEWVALUE)) - (T (/REMPROP DATUM 'ADDTOPRETTYCOM] - [DELETE (GETPROP DATUM 'DELFROMPRETTYCOM) - (UNDOABLE (COND - (NEWVALUE (/PUTPROP DATUM 'DELFROMPRETTYCOM NEWVALUE)) - (T (/REMPROP DATUM 'DELFROMPRETTYCOM] - [PRETTYTYPE (GETPROP DATUM 'PRETTYTYPE) - (UNDOABLE (COND - (NEWVALUE (/PUTPROP DATUM 'PRETTYTYPE NEWVALUE)) - (T (/REMPROP DATUM 'PRETTYTYPE] - [CONTENTS (GETPROP DATUM 'FILEPKGCONTENTS) - (UNDOABLE (COND - (NEWVALUE (/PUTPROP DATUM 'FILEPKGCONTENTS NEWVALUE)) - (T (/REMPROP DATUM 'FILEPKGCONTENTS] - (MACRO [CDR (FASSOC DATUM (GETTOPVAL 'PRETTYDEFMACROS] - (STANDARD [COND - [NEWVALUE (PUTASSOC DATUM NEWVALUE - (OR (LISTP (GETTOPVAL + (UNDOABLE (COND + (NEWVALUE (/PUTPROP DATUM 'ADDTOPRETTYCOM NEWVALUE)) + (T (/REMPROP DATUM 'ADDTOPRETTYCOM] + [DELETE (GETPROP DATUM 'DELFROMPRETTYCOM) + (UNDOABLE (COND + (NEWVALUE (/PUTPROP DATUM 'DELFROMPRETTYCOM NEWVALUE)) + (T (/REMPROP DATUM 'DELFROMPRETTYCOM] + [PRETTYTYPE (GETPROP DATUM 'PRETTYTYPE) + (UNDOABLE (COND + (NEWVALUE (/PUTPROP DATUM 'PRETTYTYPE NEWVALUE)) + (T (/REMPROP DATUM 'PRETTYTYPE] + [CONTENTS (GETPROP DATUM 'FILEPKGCONTENTS) + (UNDOABLE (COND + (NEWVALUE (/PUTPROP DATUM 'FILEPKGCONTENTS NEWVALUE)) + (T (/REMPROP DATUM 'FILEPKGCONTENTS] + (MACRO [CDR (FASSOC DATUM (GETTOPVAL 'PRETTYDEFMACROS] + (STANDARD [COND + [NEWVALUE (PUTASSOC DATUM NEWVALUE + (OR (LISTP (GETTOPVAL 'PRETTYDEFMACROS)) + (SETTOPVAL 'PRETTYDEFMACROS + (LIST (LIST DATUM] + (T (SETTOPVAL 'PRETTYDEFMACROS + (REMOVE (FASSOC DATUM (GETTOPVAL 'PRETTYDEFMACROS)) - (SETTOPVAL 'PRETTYDEFMACROS - (LIST (LIST DATUM] - (T (SETTOPVAL 'PRETTYDEFMACROS - (REMOVE (FASSOC DATUM (GETTOPVAL - 'PRETTYDEFMACROS)) - (GETTOPVAL 'PRETTYDEFMACROS] - UNDOABLE - (COND - [NEWVALUE (/PUTASSOC DATUM NEWVALUE - (OR (LISTP (GETTOPVAL 'PRETTYDEFMACROS)) - (/SETTOPVAL 'PRETTYDEFMACROS - (LIST (LIST DATUM] - (T (/SETTOPVAL 'PRETTYDEFMACROS - (REMOVE (FASSOC DATUM (GETTOPVAL - 'PRETTYDEFMACROS)) - (GETTOPVAL 'PRETTYDEFMACROS] + (GETTOPVAL 'PRETTYDEFMACROS] + UNDOABLE + (COND + [NEWVALUE (/PUTASSOC DATUM NEWVALUE + (OR (LISTP (GETTOPVAL 'PRETTYDEFMACROS)) + (/SETTOPVAL 'PRETTYDEFMACROS + (LIST (LIST DATUM] + (T (/SETTOPVAL 'PRETTYDEFMACROS + (REMOVE (FASSOC DATUM (GETTOPVAL 'PRETTYDEFMACROS)) + (GETTOPVAL 'PRETTYDEFMACROS] (* Not an atom record cause want - REMPROP on NILs.) + REMPROP on NILs.) (* NOTE%: PRETTCOM on PRETTY has - open-coded access to the MACRO - property.) - (INIT (FILEPKGCOMPROPS ADDTOPRETTYCOM DELFROMPRETTYCOM PRETTYTYPE - FILEPKGCONTENTS))) + open-coded access to the MACRO + property.) + (INIT (FILEPKGCOMPROPS ADDTOPRETTYCOM DELFROMPRETTYCOM PRETTYTYPE + FILEPKGCONTENTS))) -(ATOMRECORD FILEPKGTYPE (NEWCOM WHENFILED WHENUNFILED GETDEF NULLDEF DELDEF PUTDEF WHENCHANGED - HASDEF EDITDEF FILEGETDEF CANFILEDEF) - (ACCESSFNS FILEPKGTYPE [(CHANGEDLST (CAR (SEARCHPRETTYTYPELST DATUM)) - (CAR (SEARCHPRETTYTYPELST DATUM NEWVALUE)) - ) - (CHANGED (GETTOPVAL (CAR (SEARCHPRETTYTYPELST - DATUM))) - (STANDARD (SETTOPVAL (CAR ( - SEARCHPRETTYTYPELST - DATUM NEWVALUE) - ) - NEWVALUE) - UNDOABLE - (/SETTOPVAL (CAR ( - SEARCHPRETTYTYPELST - DATUM NEWVALUE)) - NEWVALUE))) - (DESCRIPTION (CAR (CDDR (SEARCHPRETTYTYPELST - DATUM))) - (CAR (RPLACA (CDDR (SEARCHPRETTYTYPELST - DATUM NEWVALUE)) - NEWVALUE))) - (ALLFIELDS NIL (/SETTOPVAL - 'PRETTYTYPELST - (REMOVE (SEARCHPRETTYTYPELST - DATUM) - (GETTOPVAL 'PRETTYTYPELST] +(ATOMRECORD FILEPKGTYPE (NEWCOM WHENFILED WHENUNFILED GETDEF NULLDEF DELDEF PUTDEF WHENCHANGED HASDEF + EDITDEF FILEGETDEF CANFILEDEF) + (ACCESSFNS FILEPKGTYPE [(CHANGEDLST (CAR (SEARCHPRETTYTYPELST DATUM)) + (CAR (SEARCHPRETTYTYPELST DATUM NEWVALUE))) + (CHANGED (GETTOPVAL (CAR (SEARCHPRETTYTYPELST DATUM)) + ) + (STANDARD (SETTOPVAL (CAR (SEARCHPRETTYTYPELST + DATUM NEWVALUE)) + NEWVALUE) + UNDOABLE + (/SETTOPVAL (CAR (SEARCHPRETTYTYPELST + DATUM NEWVALUE)) + NEWVALUE))) + (DESCRIPTION (CAR (CDDR (SEARCHPRETTYTYPELST DATUM))) + (CAR (RPLACA (CDDR (SEARCHPRETTYTYPELST DATUM + NEWVALUE)) + NEWVALUE))) + (ALLFIELDS NIL (/SETTOPVAL 'PRETTYTYPELST + (REMOVE (SEARCHPRETTYTYPELST + DATUM) + (GETTOPVAL + 'PRETTYTYPELST] (* NOTE%: PRETTYCOM on PRETTY has - open-coded access to GETDEF property) - (INIT [PROGN (SETQ SYSPROPS (UNION FILEPKGTYPEPROPS SYSPROPS)) - (MAPC FILEPKGTYPEPROPS (FUNCTION (LAMBDA (X) - (PUT X - 'PROPTYPE - 'FILEPKGCOMS] - (ADDTOVAR PRETTYTYPELST )))) + open-coded access to GETDEF property) + (INIT [PROGN (SETQ SYSPROPS (UNION FILEPKGTYPEPROPS SYSPROPS)) + (MAPC FILEPKGTYPEPROPS (FUNCTION (LAMBDA (X) + (PUT X 'PROPTYPE + 'FILEPKGCOMS] + (ADDTOVAR PRETTYTYPELST )))) (ATOMRECORD FILE (FILECHANGES FILEDATES FILEMAP) - [ACCESSFNS FILE ((FILEPROP (GETPROP DATUM 'FILE) - (STANDARD (PUTPROP DATUM 'FILE NEWVALUE) - UNDOABLE - (/PUTPROP DATUM 'FILE NEWVALUE]) + [ACCESSFNS FILE ((FILEPROP (GETPROP DATUM 'FILE) + (STANDARD (PUTPROP DATUM 'FILE NEWVALUE) + UNDOABLE + (/PUTPROP DATUM 'FILE NEWVALUE]) (RECORD FILEDATEPAIR (FILEDATE . DATEFILENAME)) @@ -956,12 +947,12 @@ compiling " T) (RPAQ? NILCOMS ) (ADDTOVAR MAKEFILEOPTIONS RC C LIST FAST CLISP CLISPIFY NIL REMAKE NEW NOCLISP CLISP% F ST STF - FORMAT (REC . RC) - (BREC . RC) - (TC . C) - (BC . C) - (TCOMPL . C) - (BCOMPL . C)) + FORMAT (REC . RC) + (BREC . RC) + (TC . C) + (BC . C) + (TCOMPL . C) + (BCOMPL . C)) (RPAQ? MAKEFILEREMAKEFLG T) @@ -2705,7 +2696,7 @@ compiling " T) ) (ADDTOVAR LISPXFNS (PUT . SAVEPUT) - (PUTPROP . SAVEPUT)) + (PUTPROP . SAVEPUT)) @@ -3119,14 +3110,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) @@ -3272,11 +3263,15 @@ compiling " T) (DEFINEQ (SHOWDEF - [LAMBDA (NAME TYPE FILE) (* ; "Edited 16-Apr-2018 21:35 by rmk:") - (* ; - "prettyprint NAME as it would be dumped as a TYPE") + [LAMBDA (NAME TYPE FILE) (* ; "Edited 26-Oct-2021 09:21 by rmk:") + (* ; "Edited 16-Apr-2018 21:35 by rmk:") + (* ; + "prettyprint NAME as it would be dumped as a TYPE (in the current reader environment)") (RESETLST - (PROG (ORIGFLG FNSLST FL PRETTYCOMSLST NEWFILEMAP) + (PROG (ORIGFLG FNSLST FL PRETTYCOMSLST NEWFILEMAP (SOURCEFILENV (MAKE-READER-ENVIRONMENT + + *DEFAULT-MAKEFILE-ENVIRONMENT* + ))) (DECLARE (SPECVARS . T)) [AND FILE (NEQ FILE (OUTPUT)) (if (SETQ FL (OPENP FILE 'OUTPUT)) @@ -3955,7 +3950,9 @@ compiling " T) (RETURN TYPE]) (COMPAREDEFS - [LAMBDA (NAME TYPE SOURCES) (* lmm " 4-Jul-85 14:37") + [LAMBDA (NAME TYPE SOURCES) (* ; "Edited 8-Nov-2021 10:52 by rmk:") + (* ; "Edited 30-Oct-2021 20:01 by rmk:") + (* lmm " 4-Jul-85 14:37") (COND ((AND (LISTP TYPE) (GETFILEPKGTYPE SOURCES NIL T)) @@ -3969,41 +3966,45 @@ compiling " T) (MEMBER NAME (CDR (ASSOC TYPE (fetch TOBEDUMPED of (fetch FILEPROP - of FILE] + of FILE] (push SRCS 'CURRENT] - (SETQ SRCS (for SRC in SRCS - when (COND - ((NEQ [SETQ DEF (GETDEF NAME TYPE SRC '(NOERROR NOCOPY] - (fetch NULLDEF of TYPE)) - (OR [SOME DEFS (FUNCTION (LAMBDA (DP) - (COMPARELST DEF (CDR DP] - (push DEFS (CONS SRC DEF))) - T) - (T (PRINTOUT T "No " SRC " definition found for " NAME T) - NIL)) collect SRC)) + (SETQ SRCS (for SRC in SRCS when (COND + ((NEQ [SETQ DEF (GETDEF NAME TYPE SRC + '(NOERROR NOCOPY] + (fetch NULLDEF of TYPE)) + (OR [SOME DEFS (FUNCTION (LAMBDA (DP) + (COMPARELST DEF + (CDR DP] + (push DEFS (CONS SRC DEF))) + T) + (T (PRINTOUT T "No " SRC " definition found for " NAME + T) + NIL)) collect SRC)) (RETURN (COND ((NULL SRCS) '(no definitions found)) ((NULL (CDR SRCS)) '(only one definition found)) ((CDR DEFS) - [for S1 on (DREVERSE DEFS) + [for S1 [FILECOL _ (IPLUS (NCHARS NAME) + (CONSTANT (NCHARS " from "] on (DREVERSE DEFS) do (for S2 on (CDR S1) do (PRIN2 NAME T T) - (AND (CAAR S1) - (PRIN1 " from " T) - (PRIN2 (CAAR S1) - T T)) - (PRIN1 " and " T) - (PRIN2 NAME T T) - (COND - ((CAAR S2) - (PRIN1 " from " T) - (PRIN2 (CAAR S2) - T T))) - (PRIN1 " differ:" T) - (TERPRI T) - (COMPARELISTS (CDAR S1) - (CDAR S2] + (AND (CAAR S1) + (PRIN1 " from " T) + (PRIN2 (CAAR S1) + T T)) + (TAB (IDIFFERENCE FILECOL (CONSTANT (NCHARS + " and " + ))) + NIL T) + (PRIN1 " and " T) + (COND + ((CAAR S2) + (PRIN2 (CAAR S2) + T T))) + (TERPRI T) + (COMPARELISTS (CDAR S1) + (CDAR S2] 'DIFFERENT) (T 'SAME]) @@ -4508,7 +4509,7 @@ compiling " T) (P (CONSTANTS . X]) (ADDTOVAR SHADOW-TYPES (FUNCTIONS FNS) - (VARIABLES VARS CONSTANTS)) + (VARIABLES VARS CONSTANTS)) (RPAQ? SAVEDDEFS ) @@ -4971,10 +4972,10 @@ compiling " T) ) (ADDTOVAR GAINSPACEFORMS (FILELST "erase filepkg information" (CLEARFILEPKG RESPONSE) - ((Y "es") - (N "o") - (E . "verything") - (F "ilemaps only + ((Y "es") + (N "o") + (E . "verything") + (F "ilemaps only ")))) (DECLARE%: DOEVAL@COMPILE DONTCOPY @@ -5031,8 +5032,7 @@ compiling " T) (DECLARE%: DONTEVAL@LOAD DOEVAL@COMPILE DONTCOPY COMPILERVARS (ADDTOVAR NLAMA \DUMPEXPORTS MAKEUSERMACROSCOMS MAKEPROPSCOMS MAKELISPXMACROSCOMS MAKEFILESCOMS - MAKEALISTCOMS LISTFILES COMPILEFILES CLEANUP FILEPKGCOMPROPS - PRETTYDEFMACROS) + MAKEALISTCOMS LISTFILES COMPILEFILES CLEANUP FILEPKGCOMPROPS PRETTYDEFMACROS) (ADDTOVAR NLAML ) @@ -5041,46 +5041,46 @@ compiling " T) (PUTPROPS FILEPKG COPYRIGHT ("Venue & Xerox Corporation" T 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1995 2018 2020 2021)) (DECLARE%: DONTCOPY - (FILEMAP (NIL (20618 22323 (SEARCHPRETTYTYPELST 20628 . 21607) (PRETTYDEFMACROS 21609 . 22067) ( -FILEPKGCOMPROPS 22069 . 22321)) (23125 57943 (CLEANUP 23135 . 24523) (COMPILEFILES 24525 . 24801) ( -COMPILEFILES0 24803 . 25523) (CONTINUEDIT 25525 . 26945) (MAKEFILE 26947 . 39284) (FILECHANGES 39286 - . 41621) (FILEPKG.MERGECHANGES 41623 . 42446) (FILEPKG.CHANGEDFNS 42448 . 42760) (MAKEFILE1 42762 . -46989) (COMPILE-FILE? 46991 . 48548) (MAKEFILES 48550 . 50243) (ADDFILE 50245 . 52766) (ADDFILE0 52768 - . 56904) (LISTFILES 56906 . 57941)) (58639 93879 (FILEPKGCHANGES 58649 . 59999) (GETFILEPKGTYPE 60001 - . 63074) (MARKASCHANGED 63076 . 64713) (FILECOMS 64715 . 65099) (WHEREIS 65101 . 66521) ( -SMASHFILECOMS 66523 . 66758) (FILEFNSLST 66760 . 66922) (FILECOMSLST 66924 . 67408) (UPDATEFILES 67410 - . 72710) (INFILECOMS? 72712 . 74615) (INFILECOMTAIL 74617 . 75757) (INFILECOMS 75759 . 75920) ( -INFILECOM 75922 . 86131) (INFILECOMSVALS 86133 . 86460) (INFILECOMSVAL 86462 . 87464) (INFILECOMSPROP -87466 . 88295) (IFCPROPS 88297 . 89558) (IFCEXPRTYPE 89560 . 90071) (IFCPROPSCAN 90073 . 91126) ( -IFCDECLARE 91128 . 92439) (INFILEPAIRS 92441 . 92773) (INFILECOMSMACRO 92775 . 93877)) (93914 125334 ( -FILES? 93924 . 96117) (FILES?1 96119 . 96817) (FILES?PRINTLST 96819 . 97601) (ADDTOFILES? 97603 . -108649) (ADDTOFILE 108651 . 109567) (WHATIS 109569 . 111545) (ADDTOCOMS 111547 . 113191) (ADDTOCOM -113193 . 119740) (ADDTOCOM1 119742 . 120913) (ADDNEWCOM 120915 . 121965) (MAKENEWCOM 121967 . 123810) -(DEFAULTMAKENEWCOM 123812 . 125332)) (125404 128221 (MERGEINSERT 125414 . 127757) (MERGEINSERT1 127759 - . 128219)) (128375 129732 (ADDTOFILEKEYLST 128385 . 129730)) (129849 140761 (DELFROMFILES 129859 . -130709) (DELFROMCOMS 130711 . 132390) (DELFROMCOM 132392 . 138260) (DELFROMCOM1 138262 . 139059) ( -REMOVEITEM 139061 . 139935) (MOVETOFILE 139937 . 140759)) (140975 143344 (SAVEPUT 140985 . 143342)) ( -143469 151793 (UNMARKASCHANGED 143479 . 145187) (PREEDITFN 145189 . 147700) (POSTEDITPROPS 147702 . -150203) (POSTEDITALISTS 150205 . 151791)) (151942 172496 (ALISTS.GETDEF 151952 . 152331) ( -ALISTS.WHENCHANGED 152333 . 152977) (CLEARCLISPARRAY 152979 . 154153) (EXPRESSIONS.WHENCHANGED 154155 - . 154529) (MAKEALISTCOMS 154531 . 155604) (MAKEFILESCOMS 155606 . 157043) (MAKELISPXMACROSCOMS 157045 - . 159063) (MAKEPROPSCOMS 159065 . 159763) (MAKEUSERMACROSCOMS 159765 . 161565) (PROPS.WHENCHANGED -161567 . 162188) (FILEGETDEF.LISPXMACROS 162190 . 163632) (FILEGETDEF.ALISTS 163634 . 164253) ( -FILEGETDEF.RECORDS 164255 . 165186) (FILEGETDEF.PROPS 165188 . 165980) (FILEGETDEF.MACROS 165982 . -167042) (FILEGETDEF.VARS 167044 . 167460) (FILEGETDEF.FNS 167462 . 168826) (FILEPKGCOMS.PUTDEF 168828 - . 171268) (FILES.PUTDEF 171270 . 172227) (VARS.PUTDEF 172229 . 172372) (FILES.WHENCHANGED 172374 . -172494)) (174518 181951 (RENAME 174528 . 175929) (CHANGECALLERS 175931 . 181949)) (181952 229900 ( -SHOWDEF 181962 . 182755) (COPYDEF 182757 . 185231) (GETDEF 185233 . 187509) (GETDEFCOM 187511 . 188477 -) (GETDEFCOM0 188479 . 189825) (GETDEFCURRENT 189827 . 196247) (GETDEFERR 196249 . 197550) ( -GETDEFFROMFILE 197552 . 201832) (GETDEFSAVED 201834 . 202938) (PUTDEF 202940 . 203643) (EDITDEF 203645 - . 204622) (DEFAULT.EDITDEF 204624 . 207460) (EDITDEF.FILES 207462 . 207663) (LOADDEF 207665 . 207841) - (DWIMDEF 207843 . 208697) (DELDEF 208699 . 211713) (DELFROMLIST 211715 . 212219) (HASDEF 212221 . -218543) (GETFILEDEF 218545 . 219067) (SAVEDEF 219069 . 220728) (UNSAVEDEF 220730 . 221626) ( -COMPAREDEFS 221628 . 224930) (COMPARE 224932 . 225636) (TYPESOF 225638 . 229898)) (229967 235010 ( -FIXEDITDATE 229977 . 233480) (EDITDATE? 233482 . 235008)) (235429 244200 (FILEPKGCOM 235439 . 240372) -(FILEPKGTYPE 240374 . 244198)) (256237 271169 (FINDCALLERS 256247 . 256762) (EDITCALLERS 256764 . -264674) (EDITFROMFILE 264676 . 270484) (FINDATS 270486 . 270758) (LOOKIN 270760 . 271167)) (271170 -272897 (SEPRCASE 271180 . 272895)) (273414 278971 (IMPORTFILE 273424 . 274398) (IMPORTEVAL 274400 . -275280) (IMPORTFILESCAN 275282 . 275703) (CHECKIMPORTS 275705 . 277041) (GATHEREXPORTS 277043 . 278381 -) (\DUMPEXPORTS 278383 . 278969)) (279309 281517 (CLEARFILEPKG 279319 . 281515))))) + (FILEMAP (NIL (19760 21465 (SEARCHPRETTYTYPELST 19770 . 20749) (PRETTYDEFMACROS 20751 . 21209) ( +FILEPKGCOMPROPS 21211 . 21463)) (22267 57085 (CLEANUP 22277 . 23665) (COMPILEFILES 23667 . 23943) ( +COMPILEFILES0 23945 . 24665) (CONTINUEDIT 24667 . 26087) (MAKEFILE 26089 . 38426) (FILECHANGES 38428 + . 40763) (FILEPKG.MERGECHANGES 40765 . 41588) (FILEPKG.CHANGEDFNS 41590 . 41902) (MAKEFILE1 41904 . +46131) (COMPILE-FILE? 46133 . 47690) (MAKEFILES 47692 . 49385) (ADDFILE 49387 . 51908) (ADDFILE0 51910 + . 56046) (LISTFILES 56048 . 57083)) (57757 92997 (FILEPKGCHANGES 57767 . 59117) (GETFILEPKGTYPE 59119 + . 62192) (MARKASCHANGED 62194 . 63831) (FILECOMS 63833 . 64217) (WHEREIS 64219 . 65639) ( +SMASHFILECOMS 65641 . 65876) (FILEFNSLST 65878 . 66040) (FILECOMSLST 66042 . 66526) (UPDATEFILES 66528 + . 71828) (INFILECOMS? 71830 . 73733) (INFILECOMTAIL 73735 . 74875) (INFILECOMS 74877 . 75038) ( +INFILECOM 75040 . 85249) (INFILECOMSVALS 85251 . 85578) (INFILECOMSVAL 85580 . 86582) (INFILECOMSPROP +86584 . 87413) (IFCPROPS 87415 . 88676) (IFCEXPRTYPE 88678 . 89189) (IFCPROPSCAN 89191 . 90244) ( +IFCDECLARE 90246 . 91557) (INFILEPAIRS 91559 . 91891) (INFILECOMSMACRO 91893 . 92995)) (93032 124452 ( +FILES? 93042 . 95235) (FILES?1 95237 . 95935) (FILES?PRINTLST 95937 . 96719) (ADDTOFILES? 96721 . +107767) (ADDTOFILE 107769 . 108685) (WHATIS 108687 . 110663) (ADDTOCOMS 110665 . 112309) (ADDTOCOM +112311 . 118858) (ADDTOCOM1 118860 . 120031) (ADDNEWCOM 120033 . 121083) (MAKENEWCOM 121085 . 122928) +(DEFAULTMAKENEWCOM 122930 . 124450)) (124522 127339 (MERGEINSERT 124532 . 126875) (MERGEINSERT1 126877 + . 127337)) (127493 128850 (ADDTOFILEKEYLST 127503 . 128848)) (128967 139879 (DELFROMFILES 128977 . +129827) (DELFROMCOMS 129829 . 131508) (DELFROMCOM 131510 . 137378) (DELFROMCOM1 137380 . 138177) ( +REMOVEITEM 138179 . 139053) (MOVETOFILE 139055 . 139877)) (140093 142462 (SAVEPUT 140103 . 142460)) ( +142587 150911 (UNMARKASCHANGED 142597 . 144305) (PREEDITFN 144307 . 146818) (POSTEDITPROPS 146820 . +149321) (POSTEDITALISTS 149323 . 150909)) (151056 171610 (ALISTS.GETDEF 151066 . 151445) ( +ALISTS.WHENCHANGED 151447 . 152091) (CLEARCLISPARRAY 152093 . 153267) (EXPRESSIONS.WHENCHANGED 153269 + . 153643) (MAKEALISTCOMS 153645 . 154718) (MAKEFILESCOMS 154720 . 156157) (MAKELISPXMACROSCOMS 156159 + . 158177) (MAKEPROPSCOMS 158179 . 158877) (MAKEUSERMACROSCOMS 158879 . 160679) (PROPS.WHENCHANGED +160681 . 161302) (FILEGETDEF.LISPXMACROS 161304 . 162746) (FILEGETDEF.ALISTS 162748 . 163367) ( +FILEGETDEF.RECORDS 163369 . 164300) (FILEGETDEF.PROPS 164302 . 165094) (FILEGETDEF.MACROS 165096 . +166156) (FILEGETDEF.VARS 166158 . 166574) (FILEGETDEF.FNS 166576 . 167940) (FILEPKGCOMS.PUTDEF 167942 + . 170382) (FILES.PUTDEF 170384 . 171341) (VARS.PUTDEF 171343 . 171486) (FILES.WHENCHANGED 171488 . +171608)) (173632 181065 (RENAME 173642 . 175043) (CHANGECALLERS 175045 . 181063)) (181066 229922 ( +SHOWDEF 181076 . 182269) (COPYDEF 182271 . 184745) (GETDEF 184747 . 187023) (GETDEFCOM 187025 . 187991 +) (GETDEFCOM0 187993 . 189339) (GETDEFCURRENT 189341 . 195761) (GETDEFERR 195763 . 197064) ( +GETDEFFROMFILE 197066 . 201346) (GETDEFSAVED 201348 . 202452) (PUTDEF 202454 . 203157) (EDITDEF 203159 + . 204136) (DEFAULT.EDITDEF 204138 . 206974) (EDITDEF.FILES 206976 . 207177) (LOADDEF 207179 . 207355) + (DWIMDEF 207357 . 208211) (DELDEF 208213 . 211227) (DELFROMLIST 211229 . 211733) (HASDEF 211735 . +218057) (GETFILEDEF 218059 . 218581) (SAVEDEF 218583 . 220242) (UNSAVEDEF 220244 . 221140) ( +COMPAREDEFS 221142 . 224952) (COMPARE 224954 . 225658) (TYPESOF 225660 . 229920)) (229989 235032 ( +FIXEDITDATE 229999 . 233502) (EDITDATE? 233504 . 235030)) (235451 244222 (FILEPKGCOM 235461 . 240394) +(FILEPKGTYPE 240396 . 244220)) (256255 271187 (FINDCALLERS 256265 . 256780) (EDITCALLERS 256782 . +264692) (EDITFROMFILE 264694 . 270502) (FINDATS 270504 . 270776) (LOOKIN 270778 . 271185)) (271188 +272915 (SEPRCASE 271198 . 272913)) (273432 278989 (IMPORTFILE 273442 . 274416) (IMPORTEVAL 274418 . +275298) (IMPORTFILESCAN 275300 . 275721) (CHECKIMPORTS 275723 . 277059) (GATHEREXPORTS 277061 . 278399 +) (\DUMPEXPORTS 278401 . 278987)) (279327 281535 (CLEARFILEPKG 279337 . 281533))))) STOP diff --git a/sources/FILEPKG.LCOM b/sources/FILEPKG.LCOM index 83298c1ca400570cad176c5dffb6a56b8dcaa239..c23fc0babc2f83b2734dba63d0ccfde81ce50bf8 100644 GIT binary patch delta 1410 zcmaJ>-ESgQ6lbQ}W_Q*Q3YgtR-JTG;fd|OUo#9j67U`Xq7Um8!18idyD_}ussnFf* z)})B>MIVgKJdm`Bo2;7n*pHA+eBsZi8uisz=G0*D9^8okp`(1+MmRr`?%PLYm~%l!lkEtV3fP{Bj|ih0FYK zIP8bmI^4fw%i6!I@asjJ+TEi&=FHzM0s5Vt*{=H|)1`frgSOP(%zOlVo>%eY{ z$_vPfepzD>cG|TEjn@5+t%)N1A|E1^-O)ore3BQFe9Zirx%1Mq%1LLy{`w*N^tyR% zUtsgo=BxV)w>f2M;2}=;z3O1<;}geG%RzrGrtBRqrij-(+z;RIW_+u@@9M{*9cyqF zVn|~LA9&2)_dQ*2**zq#!7OptePvhKIaJuUPX4J8_noq9c>E{(%_!$8`{cy&`RX-` zzGz>YGvCj;uPSBN)S$U(xm|BAHmcVxizZ~4Q{SbEN0w(2bvCDes5fkAcX$ak%rVR% z{f~hSyO5QQ%`xmqIy*HuBrf*&vr$b)K%%R5u@l*hZs;KKaWJr^Y8h$@Ku-mM7?0YP z0Afr6BlS9nQ7hK9gHmD~6ek2;0wukY(sV$HI4o(nh&3GplF&Fi5+fHhgkob$nE3c{ zMIjcSDAWxQq6n6;p=v}0fsOFy(MRq1H~g|w>QTK=HuS2mjUqc_W=qn)t*HpOyReZG>@S8)zYu9DlPju-KFm0H&2QdVsV5kKH=q^yp)=hWe!b!(VRIJd>?Wl!I*z^$na4cah zgq31OBTA0WiGEU|F-T{Lj^zcQ!x`t`_^~PVf03EF=O{AB=_{l}zhM2pGt6t|&GUy0 zXC9n;u2`Y7Z_ihr^mq4|=lhTMnD`4^I;BA%UmymCd%<830>=2Zzp%#$Pe0vb@;Ckk DvQ1!D delta 1321 zcmaJ>-*4Mg6pr1|jdZC(7t%FD>XBhp^3cfkbrL6=x<>7FNEiQ*?X0u{qLQRd#M+dk zLt|*^GV#D8lZAqi_A=NTLj9o%2_fYLUJ%pXHfeA07fihJFpixjs}Pzc`(B^#obPSuGU#*JpV+L}}H z1!`Q)#V-kb3^+)?4CMKYkjn5p2Ol-7<;LcA{d%6qUMj)V^{vyVS# ze?992+5)>a>dd#VOpoc~BS+`-;KX~CqmjG&zWWUyUO}c5?#*ZQuyem1pA6?COOc;z zd&I-)e%GUi*kA3L)o>})(8Zzlqg z$-tKEqi9Q{1~w@%@Y^N*5DXUjFgo%AESmHhH7yFFG)yFtK_XFP2+7J+B+0i@GjOa8vQ||=uRHCES zKnFoeLR8bKY3e3u`hsq(#6TdT^F!x66FB^>^M!R;0*x-ar$x;gV1WBYsco-dAFKk_ zWq=4u0T%&q?E4lTbTgk*3c2nl5_6%OA7w7&L4g!#ZgC38V6PZ72EO-SJLO~EFisT@ za>X-ltDhgv6}@hIqp*5#&U@)kTrCo*?M)S(=_ixB*COS!z2))cpy%feWG(26%5FoB z)d4o&{ZF8J)Cx%v^rCGPZNSfjJMZ^F(gPz-mTpiD%kWV2iv^-MDhmbOqRJH@Wax?2 y`8_7|hy|Q~p8V2%lx5BzK7RV{gYNIQm^+gYRYA)aaKZfGWpW=s{dkM9CjSKrNK?!J