From d5a7d144bd521b92fbe95401c513ca2fba5ed34b Mon Sep 17 00:00:00 2001 From: rmkaplan Date: Sun, 24 Apr 2022 13:51:26 -0700 Subject: [PATCH] COMPAREDIRECTORIES: A little bit better on DEPTH --- lispusers/COMPAREDIRECTORIES | 75 ++++++++++++++---------------- lispusers/COMPAREDIRECTORIES.LCOM | Bin 40082 -> 40150 bytes 2 files changed, 36 insertions(+), 39 deletions(-) diff --git a/lispusers/COMPAREDIRECTORIES b/lispusers/COMPAREDIRECTORIES index 46ffd005..5a2e2446 100644 --- a/lispusers/COMPAREDIRECTORIES +++ b/lispusers/COMPAREDIRECTORIES @@ -1,12 +1,12 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED " 6-Mar-2022 19:53:40"  -{DSK}kaplan>Local>medley3.5>my-medley>lispusers>COMPAREDIRECTORIES.;214 123835 +(FILECREATED "29-Mar-2022 11:53:34"  +{DSK}kaplan>Local>medley3.5>my-medley>lispusers>COMPAREDIRECTORIES.;215 123553 - :CHANGES-TO (FNS CD.COMMANDSELECTEDFN) + :CHANGES-TO (FNS COMPAREDIRECTORIES COMPAREDIRECTORIES.INFOS) - :PREVIOUS-DATE " 5-Mar-2022 15:10:31" -{DSK}kaplan>Local>medley3.5>my-medley>lispusers>COMPAREDIRECTORIES.;213) + :PREVIOUS-DATE " 6-Mar-2022 19:53:40" +{DSK}kaplan>Local>medley3.5>my-medley>lispusers>COMPAREDIRECTORIES.;214) (* ; " @@ -66,10 +66,8 @@ Copyright (c) 1985-1988, 1990, 1994, 1998, 2018, 2020-2021 by Venue & Xerox Corp (COMPAREDIRECTORIES [LAMBDA (DIR1 DIR2 SELECT INCLUDEDFILES EXCLUDEDFILES USEDIRECTORYDATE OUTPUTFILE ALLVERSIONS - FIXDIRECTORYDATES) (* ; "Edited 23-Feb-2022 21:10 by rmk") - (* ; "Edited 4-Feb-2022 13:44 by rmk") - (* ; "Edited 31-Jan-2022 21:52 by rmk") - (* ; "Edited 26-Jan-2022 13:33 by rmk") + FIXDIRECTORYDATES) (* ; "Edited 29-Mar-2022 11:50 by rmk") + (* ; "Edited 23-Feb-2022 21:10 by rmk") (* ; "Edited 4-Jan-2022 12:09 by rmk") (* ; "Edited 31-Oct-2021 11:01 by rmk:") (* ; "Edited 7-Jan-2021 23:21 by rmk:") @@ -121,12 +119,10 @@ Copyright (c) 1985-1988, 1990, 1994, 1998, 2018, 2020-2021 by Venue & Xerox Corp (FIX-DIRECTORY-DATES DIR2)) (CDPRINT.HEADER DIR1 DIR2 SELECT DATE T) (PRINTOUT T " ... ") - (SETQ INFOS1 (COMPAREDIRECTORIES.INFOS (CDFILES DIR1 INCLUDEDFILES EXCLUDEDFILES - ALLVERSIONS DEPTH1) - USEDIRECTORYDATE DIR1 ALLVERSIONS)) - (SETQ INFOS2 (COMPAREDIRECTORIES.INFOS (CDFILES DIR2 INCLUDEDFILES EXCLUDEDFILES - ALLVERSIONS DEPTH2) - USEDIRECTORYDATE DIR2 ALLVERSIONS)) + (SETQ INFOS1 (COMPAREDIRECTORIES.INFOS DIR1 INCLUDEDFILES EXCLUDEDFILES ALLVERSIONS DEPTH1 + USEDIRECTORYDATE)) + (SETQ INFOS2 (COMPAREDIRECTORIES.INFOS DIR2 INCLUDEDFILES EXCLUDEDFILES ALLVERSIONS DEPTH2 + USEDIRECTORYDATE)) (* ;; "The CAR of each info is the atomic match-name, the CDR is a list of infos with that matchname, only 1 unless AllVERSIONS. ") @@ -152,13 +148,14 @@ Copyright (c) 1985-1988, 1990, 1994, 1998, 2018, 2020-2021 by Venue & Xerox Corp (RETURN (CDPRINT CDVALUE OUTPUTFILE NIL (MEMB 'AUTHOR SELECT]) (COMPAREDIRECTORIES.INFOS - [LAMBDA (FILES USEDIRECTORYDATE DIR ALLVERSIONS) + [LAMBDA (DIR INCLUDEDFILES EXCLUDEDFILES ALLVERSIONS DEPTH USEDIRECTORYDATE) - (* ;; "Edited 24-Feb-2022 09:19 by rmk: is a list of CDINFOS with the match-name consed on to the front. If ALLVERSIONS") + (* ;; "Edited 29-Mar-2022 11:53 by rmk: Produces a list of CDINFOS with the match-name consed on to the front.") - (* ;; "Value is a list of the form (matchname . CDINFOS). CDINFOS is guaranteed to be a singleton, unless ALLVERSIONS. ") + (* ;; "Each entry is a list of the form (matchname . CDINFOS). CDINFOS is guaranteed to be a singleton, unless ALLVERSIONS. ") - (FOR FULLNAME TYPE LDATE STREAM (STARTPOS _ (ADD1 (NCHARS DIR))) IN FILES + (FOR FULLNAME TYPE LDATE STREAM (STARTPOS _ (ADD1 (NCHARS DIR))) + IN (CDFILES DIR INCLUDEDFILES EXCLUDEDFILES ALLVERSIONS DEPTH) COLLECT (* ;; "GDATE/IDATE in case Y2K") @@ -2102,24 +2099,24 @@ Copyright (c) 1985-1988, 1990, 1994, 1998, 2018, 2020-2021 by Venue & Xerox Corp (PUTPROPS COMPAREDIRECTORIES COPYRIGHT ("Venue & Xerox Corporation" 1985 1986 1987 1988 1990 1994 1998 2018 2020 2021)) (DECLARE%: DONTCOPY - (FILEMAP (NIL (2610 22171 (COMPAREDIRECTORIES 2620 . 7847) (COMPAREDIRECTORIES.INFOS 7849 . 10611) ( -COMPAREDIRECTORIES.CANDIDATES 10613 . 13998) (CDENTRIES.SELECT 14000 . 18775) ( -COMPAREDIRECTORIES.INFOS.TYPE 18777 . 19405) (MATCHNAME 19407 . 20087) (CD.INSURECDVALUE 20089 . 21703 -) (CD.UPDATEWIDTHS 21705 . 22169)) (22172 31711 (CDFILES 22182 . 27805) (CDFILES.MATCH 27807 . 29432) -(CDFILES.PATS 29434 . 31709)) (31712 46797 (CDPRINT 31722 . 34067) (CDPRINT.HEADER 34069 . 34966) ( -CDPRINT.LINE 34968 . 37524) (CDPRINT.MAXWIDTHS 37526 . 41641) (CDPRINT.COLHEADERS 41643 . 42281) ( -CDPRINT.COLUMNS 42283 . 46162) (CDTEDIT 46164 . 46795)) (46798 55167 (CDMAP 46808 . 48240) (CDENTRY -48242 . 48551) (CDSUBSET 48553 . 49992) (CDMERGE 49994 . 53848) (CDMERGE.COMMON 53850 . 55165)) (55168 - 62706 (BINCOMP 55178 . 59467) (EOLTYPE 59469 . 62031) (EOLTYPE.SHOW 62033 . 62704)) (63234 76441 ( -FIND-UNCOMPILED-FILES 63244 . 66887) (FIND-UNSOURCED-FILES 66889 . 69698) (FIND-SOURCE-FILES 69700 . -71404) (FIND-COMPILED-FILES 71406 . 73484) (FIND-UNLOADED-FILES 73486 . 74230) (FIND-LOADED-FILES -74232 . 74786) (FIND-MULTICOMPILED-FILES 74788 . 76439)) (76442 84644 (CREATED-AS 76452 . 81249) ( -SOURCE-FOR-COMPILED-P 81251 . 83949) (COMPILE-SOURCE-DATE-DIFF 83951 . 84642)) (84645 94951 ( -FIX-DIRECTORY-DATES 84655 . 87648) (FIX-EQUIV-DATES 87650 . 89175) (COPY-COMPARED-FILES 89177 . 90998) - (COPY-MISSING-FILES 91000 . 93157) (COMPILED-ON-SAME-SOURCE 93159 . 94949)) (95145 102491 (CDBROWSER -95155 . 99082) (CDBROWSER.STRINGS 99084 . 102489)) (102653 104389 (CD.TABLEITEM 102663 . 102883) ( -CD.TABLEITEM.PRINTFN 102885 . 103084) (CD.TABLEITEM.COPYFN 103086 . 104144) ( -CDTABLEBROWSER.HEADING.REPAINTFN 104146 . 104387)) (104390 123251 (CDTABLEBROWSER.WHENSELECTEDFN -104400 . 104868) (CD.COMMANDSELECTEDFN 104870 . 109971) (CD-MENUFN 109973 . 116336) (CDBROWSER-COPY -116338 . 119709) (CDBROWSER-DELETE-FILE 119711 . 122730) (CD-SWAPDIRS 122732 . 123249))))) + (FILEMAP (NIL (2633 21889 (COMPAREDIRECTORIES 2643 . 7476) (COMPAREDIRECTORIES.INFOS 7478 . 10329) ( +COMPAREDIRECTORIES.CANDIDATES 10331 . 13716) (CDENTRIES.SELECT 13718 . 18493) ( +COMPAREDIRECTORIES.INFOS.TYPE 18495 . 19123) (MATCHNAME 19125 . 19805) (CD.INSURECDVALUE 19807 . 21421 +) (CD.UPDATEWIDTHS 21423 . 21887)) (21890 31429 (CDFILES 21900 . 27523) (CDFILES.MATCH 27525 . 29150) +(CDFILES.PATS 29152 . 31427)) (31430 46515 (CDPRINT 31440 . 33785) (CDPRINT.HEADER 33787 . 34684) ( +CDPRINT.LINE 34686 . 37242) (CDPRINT.MAXWIDTHS 37244 . 41359) (CDPRINT.COLHEADERS 41361 . 41999) ( +CDPRINT.COLUMNS 42001 . 45880) (CDTEDIT 45882 . 46513)) (46516 54885 (CDMAP 46526 . 47958) (CDENTRY +47960 . 48269) (CDSUBSET 48271 . 49710) (CDMERGE 49712 . 53566) (CDMERGE.COMMON 53568 . 54883)) (54886 + 62424 (BINCOMP 54896 . 59185) (EOLTYPE 59187 . 61749) (EOLTYPE.SHOW 61751 . 62422)) (62952 76159 ( +FIND-UNCOMPILED-FILES 62962 . 66605) (FIND-UNSOURCED-FILES 66607 . 69416) (FIND-SOURCE-FILES 69418 . +71122) (FIND-COMPILED-FILES 71124 . 73202) (FIND-UNLOADED-FILES 73204 . 73948) (FIND-LOADED-FILES +73950 . 74504) (FIND-MULTICOMPILED-FILES 74506 . 76157)) (76160 84362 (CREATED-AS 76170 . 80967) ( +SOURCE-FOR-COMPILED-P 80969 . 83667) (COMPILE-SOURCE-DATE-DIFF 83669 . 84360)) (84363 94669 ( +FIX-DIRECTORY-DATES 84373 . 87366) (FIX-EQUIV-DATES 87368 . 88893) (COPY-COMPARED-FILES 88895 . 90716) + (COPY-MISSING-FILES 90718 . 92875) (COMPILED-ON-SAME-SOURCE 92877 . 94667)) (94863 102209 (CDBROWSER +94873 . 98800) (CDBROWSER.STRINGS 98802 . 102207)) (102371 104107 (CD.TABLEITEM 102381 . 102601) ( +CD.TABLEITEM.PRINTFN 102603 . 102802) (CD.TABLEITEM.COPYFN 102804 . 103862) ( +CDTABLEBROWSER.HEADING.REPAINTFN 103864 . 104105)) (104108 122969 (CDTABLEBROWSER.WHENSELECTEDFN +104118 . 104586) (CD.COMMANDSELECTEDFN 104588 . 109689) (CD-MENUFN 109691 . 116054) (CDBROWSER-COPY +116056 . 119427) (CDBROWSER-DELETE-FILE 119429 . 122448) (CD-SWAPDIRS 122450 . 122967))))) STOP diff --git a/lispusers/COMPAREDIRECTORIES.LCOM b/lispusers/COMPAREDIRECTORIES.LCOM index d66465987ff13922b347aa0bb588c58fbb4e4e1d..990c0e425159c3742579537a14af430c8ec00354 100644 GIT binary patch delta 749 zcmZuvzi-n(6pkI$rHL9rnhXRao+2TUA(qeQvtuvRwJ)(H|B~%cMX1n_Mx_D*DvU^- zkUAmCjSTz)3`m(e@)xl2pD?j-PFj>m+;Do|yZgTP?tAz7Qv7u(e%f!SW;Yz4c2z}H z0U?WE3zLf%hYIOHd-Y7|S%g@c+OEK})9K{(t2ZYvr$;b(KAs&<-`=;_SlVG1gqg zZ%wZ*G;5`jv}^A+Uy?!_r@9bbEm WR2>!{#*d?A%Sc^M=<|arx%dl#JiBcG delta 844 zcmZuv&rj4q6lM!3?Bd24F6!mWCK~pzOQ+K*+a83{&h9qpwoPXi!oft4jUoOb=)sHO zk&O2&XgJKImAcWr4Y# z;GS)syneB4x6y*Qab|l~&okXt9Xkh;m+#;1@4cDqV)AMK;KLIS1^c`xvG)$G{y2_t zv$EUmwy?YXk#7Hok=dfvtrfAYW)1zXx3`W=V#MjYOQ;-Q?%sTpt(>6&;1}AG}8xH zuupK|%pM&I2SJ$SQKBIP!$^+SA-G9kcbt`in^CBT3WD{ZWllFKWGE{bY}dVxIAWO$ z^bmGWK&82cz2Xv$OmrSe)m4(-U4k4zI?DW9hEXny1!J!G(P&KDmUU`8ybqhvc~}lf zfx9kY4cg0oN~}1#^V6_Jv2*uqT9~4knfv{W!;j+)nX4#G6e3t4V%izTs?rE_nr~IJ zi(sOnZll&{PEF0MtrwH|t(sqapa1rlxg;H@O7>U5RvgGQ)?1kbbILXjyH|;cfz%~S zl=M?DyLUV14hEGN;|$SdWO1mQHRj5#8hT!7rNkde^f*So4u(}ivnquul0(P-o6xVN znM{->BaL8lgyaz#fdqNG8oq;s43#T#91{ZmSP#>jy1o7;#^~ouAJW(^yELua0NEi* Qvau$Lc0D-%+E_aI0}D&eSpWb4