From eb33dcc7eb3368e6b6a0b8058759f5361794bb49 Mon Sep 17 00:00:00 2001 From: rmkaplan Date: Sun, 24 Apr 2022 13:36:31 -0700 Subject: [PATCH] FILEIO: Added DEPTh parameter to \GENERATEFILES Binds FILING.ENUMERATION.DEPTH, uses free value of DEPTH not specified --- sources/FILEIO | 95 ++++++++++++++++++++++++-------------------- sources/FILEIO.LCOM | Bin 45452 -> 45612 bytes 2 files changed, 52 insertions(+), 43 deletions(-) diff --git a/sources/FILEIO b/sources/FILEIO index 24dd4816..92669732 100644 --- a/sources/FILEIO +++ b/sources/FILEIO @@ -1,10 +1,11 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED " 7-Mar-2022 21:22:44" {DSK}larry>medley>sources>FILEIO.;2 160473 +(FILECREATED "29-Mar-2022 08:52:23" {DSK}kaplan>Local>medley3.5>my-medley>sources>FILEIO.;107 160995 - :CHANGES-TO (RECORDS FDEV) + :CHANGES-TO (FNS \GENERATEFILES) - :PREVIOUS-DATE "13-Jan-2022 19:45:36" {DSK}larry>medley>sources>FILEIO.;1) + :PREVIOUS-DATE " 7-Mar-2022 21:22:44" +{DSK}kaplan>Local>medley3.5>my-medley>sources>FILEIO.;106) (* ; " @@ -1324,13 +1325,21 @@ Copyright (c) 1981-1993, 1999, 2020-2022 by Venue & Xerox Corporation. T]) (\GENERATEFILES - [LAMBDA (PATTERN DESIREDPROPS OPTIONS) (* bvm%: "27-Apr-84 23:21") + [LAMBDA (PATTERN DESIREDPROPS OPTIONS DEPTH) - (* ;; "Returns a file-generator object that will generate all files whose names match PATTERN. A gen-object consists of a device dependent NEXTFILEFN and GENFILESTATE") + (* ;; "Edited 29-Mar-2022 08:52 by rmk: Added local DEPTH parameter, defaults to the free FILING.ENUMERATION.DEPTH.") + (* bvm%: "27-Apr-84 23:21") + + (* ;; "Returns a file-generator object that will generate all files whose names match PATTERN. A gen-object consists of a device dependent NEXTFILEFN and GENFILESTATE") (SETQ PATTERN (\ADD.CONNECTED.DIR PATTERN)) - (PROG ((FDEV (\GETDEVICEFROMNAME PATTERN))) - (RETURN (FDEVOP 'GENERATEFILES FDEV FDEV PATTERN DESIREDPROPS OPTIONS]) + (LET ((FDEV (\GETDEVICEFROMNAME PATTERN)) + (FILING.ENUMERATION.DEPTH (IF (FIXP DEPTH) + ELSEIF DEPTH + THEN MAX.SMALLP + ELSE FILING.ENUMERATION.DEPTH))) + (DECLARE (SPECVARS FILING.ENUMERATION.DEPTH)) + (FDEVOP 'GENERATEFILES FDEV FDEV PATTERN DESIREDPROPS OPTIONS]) (\GENERATENEXTFILE [LAMBDA (GENOBJ NAMEONLY) (* bvm%: " 8-Jul-85 19:30") @@ -3088,40 +3097,40 @@ update the map") (PUTPROPS FILEIO COPYRIGHT ("Venue & Xerox Corporation" 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1999 2020 2021 2022)) (DECLARE%: DONTCOPY - (FILEMAP (NIL (26807 30285 (STREAMPROP 26817 . 27251) (GETSTREAMPROP 27253 . 27722) (PUTSTREAMPROP -27724 . 30133) (STREAMP 30135 . 30283)) (30328 32847 (\DEFPRINT.BY.NAME 30338 . 31490) ( -\STREAM.DEFPRINT 31492 . 32540) (\FDEV.DEFPRINT 32542 . 32845)) (33105 38146 (\GETACCESS 33115 . 33569 -) (\SETACCESS 33571 . 38144)) (58308 64277 (\DEFINEDEVICE 58318 . 60634) (\GETDEVICEFROMNAME 60636 . -61109) (\GETDEVICEFROMHOSTNAME 61111 . 62155) (\REMOVEDEVICE 62157 . 63280) (\REMOVEDEVICE.NAMES 63282 - . 64275)) (64317 88594 (\CLOSEFILE 64327 . 65152) (\DELETEFILE 65154 . 65448) (\DEVICEEVENT 65450 . -67220) (\GENERATEFILES 67222 . 67700) (\GENERATENEXTFILE 67702 . 68353) (\GENERATEFILEINFO 68355 . -68816) (\GETFILENAME 68818 . 69207) (\GENERIC.OUTFILEP 69209 . 69679) (\OPENFILE 69681 . 72259) ( -\DO.PARAMS.AT.OPEN 72261 . 74431) (\RENAMEFILE 74433 . 74857) (\REVALIDATEFILE 74859 . 77461) ( -\PAGED.REVALIDATEFILELST 77463 . 79021) (\PAGED.REVALIDATEFILES 79023 . 80742) (\PAGED.REVALIDATEFILE -80744 . 83027) (\BUFFERED.REVALIDATEFILE 83029 . 85315) (\BUFFERED.REVALIDATEFILELST 85317 . 86501) ( -\PRINT-REVALIDATION-RESULT 86503 . 86918) (\TRUNCATEFILE 86920 . 87311) (\FILE-CONFLICT 87313 . 88592) -) (88630 93293 (\GENERATENOFILES 88640 . 90736) (\NULLFILEGENERATOR 90738 . 90982) (\NOFILESNEXTFILEFN - 90984 . 92975) (\NOFILESINFOFN 92977 . 93291)) (93412 95320 (\FILE.NOT.OPEN 93422 . 93935) ( -\FILE.WONT.OPEN 93937 . 94265) (\ILLEGAL.DEVICEOP 94267 . 94549) (\IS.NOT.RANDACCESSP 94551 . 94997) ( -\STREAM.NOT.OPEN 94999 . 95318)) (95455 97753 (\FDEVINSTANCE 95465 . 97751)) (98955 106329 (CNDIR -98965 . 100270) (DIRECTORYNAME 100272 . 104455) (DIRECTORYNAMEP 104457 . 105073) (HOSTNAMEP 105075 . -105882) (\ADD.CONNECTED.DIR 105884 . 106327)) (106374 134254 (\BACKFILEPTR 106384 . 106572) ( -\BACKPEEKBIN 106574 . 106935) (\BACKBIN 106937 . 107288) (BIN 107290 . 107507) (\BIN 107509 . 107786) -(\BINS 107788 . 108074) (BOUT 108076 . 108438) (\BOUT 108440 . 108755) (\BOUTS 108757 . 109068) ( -COPYBYTES 109070 . 112402) (COPYCHARS 112404 . 116070) (COPYFILE 116072 . 116869) (\COPYOPENFILE -116871 . 119944) (\INFER.FILE.TYPE 119946 . 120900) (EOFP 120902 . 121199) (FORCEOUTPUT 121201 . -121448) (\FLUSH.OPEN.STREAMS 121450 . 121806) (CHARSET 121808 . 123472) (ACCESS-CHARSET 123474 . -123691) (GETEOFPTR 123693 . 123943) (GETFILEINFO 123945 . 127138) (\TYPE.FROM.FILETYPE 127140 . 127610 -) (\FILETYPE.FROM.TYPE 127612 . 127791) (GETFILEPTR 127793 . 128045) (SETFILEINFO 128047 . 132153) ( -SETFILEPTR 132155 . 133874) (BOUT16 133876 . 134061) (BIN16 134063 . 134252)) (134357 139562 ( -\GENERIC.BINS 134367 . 134647) (\GENERIC.BOUTS 134649 . 134914) (\GENERIC.RENAMEFILE 134916 . 136747) -(\GENERIC.OPENP 136749 . 138064) (\GENERIC.READP 138066 . 139107) (\GENERIC.CHARSET 139109 . 139560)) -(139563 139902 (\MAP-OPEN-STREAMS 139573 . 139900)) (141686 143766 (\EOF.ACTION 141696 . 141947) ( -\EOSERROR 141949 . 142142) (\GETEOFPTR 142144 . 142326) (\INCFILEPTR 142328 . 142678) (\PEEKBIN 142680 - . 142871) (\SETCLOSEDFILELENGTH 142873 . 143207) (\SETEOFPTR 143209 . 143397) (\SETFILEPTR 143399 . -143764)) (143767 144309 (\FIXPOUT 143777 . 144077) (\FIXPIN 144079 . 144307)) (144310 144876 (\BOUTEOL - 144320 . 144874)) (147772 157636 (\BUFFERED.BIN 147782 . 148634) (\BUFFERED.PEEKBIN 148636 . 149418) -(\BUFFERED.BOUT 149420 . 150280) (\BUFFERED.BINS 150282 . 153967) (\BUFFERED.BOUTS 153969 . 155770) ( -\BUFFERED.COPYBYTES 155772 . 157634)) (157665 160017 (\NULLDEVICE 157675 . 159693) (\NULL.OPENFILE -159695 . 160015))))) + (FILEMAP (NIL (26860 30338 (STREAMPROP 26870 . 27304) (GETSTREAMPROP 27306 . 27775) (PUTSTREAMPROP +27777 . 30186) (STREAMP 30188 . 30336)) (30381 32900 (\DEFPRINT.BY.NAME 30391 . 31543) ( +\STREAM.DEFPRINT 31545 . 32593) (\FDEV.DEFPRINT 32595 . 32898)) (33158 38199 (\GETACCESS 33168 . 33622 +) (\SETACCESS 33624 . 38197)) (58361 64330 (\DEFINEDEVICE 58371 . 60687) (\GETDEVICEFROMNAME 60689 . +61162) (\GETDEVICEFROMHOSTNAME 61164 . 62208) (\REMOVEDEVICE 62210 . 63333) (\REMOVEDEVICE.NAMES 63335 + . 64328)) (64370 89116 (\CLOSEFILE 64380 . 65205) (\DELETEFILE 65207 . 65501) (\DEVICEEVENT 65503 . +67273) (\GENERATEFILES 67275 . 68222) (\GENERATENEXTFILE 68224 . 68875) (\GENERATEFILEINFO 68877 . +69338) (\GETFILENAME 69340 . 69729) (\GENERIC.OUTFILEP 69731 . 70201) (\OPENFILE 70203 . 72781) ( +\DO.PARAMS.AT.OPEN 72783 . 74953) (\RENAMEFILE 74955 . 75379) (\REVALIDATEFILE 75381 . 77983) ( +\PAGED.REVALIDATEFILELST 77985 . 79543) (\PAGED.REVALIDATEFILES 79545 . 81264) (\PAGED.REVALIDATEFILE +81266 . 83549) (\BUFFERED.REVALIDATEFILE 83551 . 85837) (\BUFFERED.REVALIDATEFILELST 85839 . 87023) ( +\PRINT-REVALIDATION-RESULT 87025 . 87440) (\TRUNCATEFILE 87442 . 87833) (\FILE-CONFLICT 87835 . 89114) +) (89152 93815 (\GENERATENOFILES 89162 . 91258) (\NULLFILEGENERATOR 91260 . 91504) (\NOFILESNEXTFILEFN + 91506 . 93497) (\NOFILESINFOFN 93499 . 93813)) (93934 95842 (\FILE.NOT.OPEN 93944 . 94457) ( +\FILE.WONT.OPEN 94459 . 94787) (\ILLEGAL.DEVICEOP 94789 . 95071) (\IS.NOT.RANDACCESSP 95073 . 95519) ( +\STREAM.NOT.OPEN 95521 . 95840)) (95977 98275 (\FDEVINSTANCE 95987 . 98273)) (99477 106851 (CNDIR +99487 . 100792) (DIRECTORYNAME 100794 . 104977) (DIRECTORYNAMEP 104979 . 105595) (HOSTNAMEP 105597 . +106404) (\ADD.CONNECTED.DIR 106406 . 106849)) (106896 134776 (\BACKFILEPTR 106906 . 107094) ( +\BACKPEEKBIN 107096 . 107457) (\BACKBIN 107459 . 107810) (BIN 107812 . 108029) (\BIN 108031 . 108308) +(\BINS 108310 . 108596) (BOUT 108598 . 108960) (\BOUT 108962 . 109277) (\BOUTS 109279 . 109590) ( +COPYBYTES 109592 . 112924) (COPYCHARS 112926 . 116592) (COPYFILE 116594 . 117391) (\COPYOPENFILE +117393 . 120466) (\INFER.FILE.TYPE 120468 . 121422) (EOFP 121424 . 121721) (FORCEOUTPUT 121723 . +121970) (\FLUSH.OPEN.STREAMS 121972 . 122328) (CHARSET 122330 . 123994) (ACCESS-CHARSET 123996 . +124213) (GETEOFPTR 124215 . 124465) (GETFILEINFO 124467 . 127660) (\TYPE.FROM.FILETYPE 127662 . 128132 +) (\FILETYPE.FROM.TYPE 128134 . 128313) (GETFILEPTR 128315 . 128567) (SETFILEINFO 128569 . 132675) ( +SETFILEPTR 132677 . 134396) (BOUT16 134398 . 134583) (BIN16 134585 . 134774)) (134879 140084 ( +\GENERIC.BINS 134889 . 135169) (\GENERIC.BOUTS 135171 . 135436) (\GENERIC.RENAMEFILE 135438 . 137269) +(\GENERIC.OPENP 137271 . 138586) (\GENERIC.READP 138588 . 139629) (\GENERIC.CHARSET 139631 . 140082)) +(140085 140424 (\MAP-OPEN-STREAMS 140095 . 140422)) (142208 144288 (\EOF.ACTION 142218 . 142469) ( +\EOSERROR 142471 . 142664) (\GETEOFPTR 142666 . 142848) (\INCFILEPTR 142850 . 143200) (\PEEKBIN 143202 + . 143393) (\SETCLOSEDFILELENGTH 143395 . 143729) (\SETEOFPTR 143731 . 143919) (\SETFILEPTR 143921 . +144286)) (144289 144831 (\FIXPOUT 144299 . 144599) (\FIXPIN 144601 . 144829)) (144832 145398 (\BOUTEOL + 144842 . 145396)) (148294 158158 (\BUFFERED.BIN 148304 . 149156) (\BUFFERED.PEEKBIN 149158 . 149940) +(\BUFFERED.BOUT 149942 . 150802) (\BUFFERED.BINS 150804 . 154489) (\BUFFERED.BOUTS 154491 . 156292) ( +\BUFFERED.COPYBYTES 156294 . 158156)) (158187 160539 (\NULLDEVICE 158197 . 160215) (\NULL.OPENFILE +160217 . 160537))))) STOP diff --git a/sources/FILEIO.LCOM b/sources/FILEIO.LCOM index 7416487ba526d726a471e9f4204b6e63cd60724b..1e8a6641d2ae69e8903d159c50311849b8e62ad5 100644 GIT binary patch delta 592 zcmeBq%(UhS(}ZweBTHT1#3EfI10y2^0}CrtBP$~lB?S$oa$z|zuG!OGdg(a+sA zSU1F9LBq{27|qF=3RVF@u3?`3p~1Q?K-+;KW{%{4Ly-SXfWb;+Fhas~@=-=1CIhp{ z`xZ!V{=~RLhQnCF#Wf(rLt*kNIpunV00lz@pocyE-1S`jLVZEu=jrdK2T|gtV2o2z zQ-MLBnUR6Tfs+9Uk{D9Jv~!BF!qUlk|Nl1x3korLuz}=GO6>A*aCFLH@!}I;&@eOx d`8vb}=uc(3Qxx*^6qFRIU4p%9Z8Gw6Q|)pRi;61k zCJQi$*Bfana49L6>iQ-Y=^7ar87UYVS{YhcnHni6Bo(E?O-Rm2%u7!#R<%;d%P+~u z%u83u1e)m<>f@t;tXWS_Pe~yqu>@!*R#Q!tG`Td~Jbhf9gIpa$TwN3%gLPei<|!x{ z8tZx`=0Sa8X=P$+Wo(As>k^aW7D{h+W!fP#nN?m{Pg8+Gg^7WI*@2S*2$C35z_g$s pqX!#E;H1P(4+lr592QSL0R|1j$qCA$lQ+nVGZ`6eJ}I9(2>=*&Wa$6^