From 882fbacf59922f4eac688b09e9855db300c4ed69 Mon Sep 17 00:00:00 2001 From: Larry Masinter Date: Mon, 10 Oct 2022 18:56:43 -0700 Subject: [PATCH] when constructing a stream, it might not have a FDEV -- allow it to print (#984) * when constructing a stream, it might not have a FDEV -- alow it to print * Stream with no FDEV just prints as Stream --- sources/FILEIO | 106 +++++++++++++++++++++++--------------------- sources/FILEIO.LCOM | Bin 44443 -> 44374 bytes 2 files changed, 56 insertions(+), 50 deletions(-) diff --git a/sources/FILEIO b/sources/FILEIO index 7e063100..2618b8ed 100644 --- a/sources/FILEIO +++ b/sources/FILEIO @@ -1,12 +1,10 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "24-Jul-2022 09:28:20"  -{DSK}kaplan>local>medley3.5>working-medley>sources>FILEIO.;116 160597 +(FILECREATED "10-Oct-2022 15:58:01" {DSK}larry>medley>sources>FILEIO.;6 161404 - :CHANGES-TO (VARS FILEIOCOMS) + :CHANGES-TO (FNS \STREAM.DEFPRINT) - :PREVIOUS-DATE "19-Jul-2022 23:23:39" -{DSK}kaplan>local>medley3.5>working-medley>sources>FILEIO.;115) + :PREVIOUS-DATE " 9-Oct-2022 17:31:40" {DSK}larry>medley>sources>FILEIO.;5) (* ; " @@ -668,22 +666,30 @@ Copyright (c) 1981-1993, 1999, 2020-2022 by Venue & Xerox Corporation. T]) (\STREAM.DEFPRINT - [LAMBDA (STRM OUTSTREAM) (* ; "Edited 19-Aug-88 14:01 by bvm") + [LAMBDA (STRM OUTSTREAM) (* ; "Edited 10-Oct-2022 15:57 by lmm") + (* ; "Edited 9-Oct-2022 08:58 by lmm") + (* ; "Edited 19-Aug-88 14:01 by bvm") (LET ((TYPE (SELECTC (fetch ACCESSBITS of STRM) (ReadBit "Input") (OutputBits "Output") (BothBits "IO") (AppendBit "Append") "Closed"))) - (\DEFPRINT.BY.NAME STRM OUTSTREAM NIL - (COND - ((fetch (STREAM NAMEDP) of STRM) (* ; "Use file name") - (CONCAT TYPE " Stream on " (fetch (STREAM FULLFILENAME) of STRM))) - (T (* ; "Name the device") - (CONCAT TYPE " " [CL:STRING-CAPITALIZE (STRING (fetch (FDEV DEVICENAME) - of (fetch DEVICE - of STRM] - " Stream"]) + (\DEFPRINT.BY.NAME STRM OUTSTREAM NIL (COND + ((fetch (STREAM NAMEDP) of STRM) + (* ; "Use file name") + (CONCAT TYPE " Stream on " (fetch (STREAM + FULLFILENAME + ) + of STRM))) + ((TYPE? FDEV (FETCH DEVICE OF STRM)) + (* ; "Name the device") + (CONCAT TYPE " " + [CL:STRING-CAPITALIZE + (STRING (fetch (FDEV DEVICENAME) + of (fetch DEVICE of STRM] + " Stream")) + (T (CONCAT TYPE " Stream"]) (\FDEV.DEFPRINT [LAMBDA (DEV STREAM) (* ; "Edited 8-May-87 15:55 by bvm") @@ -3078,39 +3084,39 @@ 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 (27848 31654 (STREAMPROP 27858 . 28292) (GETSTREAMPROP 28294 . 28889) (PUTSTREAMPROP -28891 . 31502) (STREAMP 31504 . 31652)) (31697 34216 (\DEFPRINT.BY.NAME 31707 . 32859) ( -\STREAM.DEFPRINT 32861 . 33909) (\FDEV.DEFPRINT 33911 . 34214)) (34474 39515 (\GETACCESS 34484 . 34938 -) (\SETACCESS 34940 . 39513)) (59741 65710 (\DEFINEDEVICE 59751 . 62067) (\GETDEVICEFROMNAME 62069 . -62542) (\GETDEVICEFROMHOSTNAME 62544 . 63588) (\REMOVEDEVICE 63590 . 64713) (\REMOVEDEVICE.NAMES 64715 - . 65708)) (65750 90641 (\CLOSEFILE 65760 . 66585) (\DELETEFILE 66587 . 66881) (\DEVICEEVENT 66883 . -68653) (\GENERATEFILES 68655 . 69602) (\GENERATENEXTFILE 69604 . 70255) (\GENERATEFILEINFO 70257 . -70718) (\GETFILENAME 70720 . 71109) (\GENERIC.OUTFILEP 71111 . 71581) (\OPENFILE 71583 . 74161) ( -\DO.PARAMS.AT.OPEN 74163 . 76478) (\RENAMEFILE 76480 . 76904) (\REVALIDATEFILE 76906 . 79508) ( -\PAGED.REVALIDATEFILELST 79510 . 81068) (\PAGED.REVALIDATEFILES 81070 . 82789) (\PAGED.REVALIDATEFILE -82791 . 85074) (\BUFFERED.REVALIDATEFILE 85076 . 87362) (\BUFFERED.REVALIDATEFILELST 87364 . 88548) ( -\PRINT-REVALIDATION-RESULT 88550 . 88965) (\TRUNCATEFILE 88967 . 89358) (\FILE-CONFLICT 89360 . 90639) -) (90677 95340 (\GENERATENOFILES 90687 . 92783) (\NULLFILEGENERATOR 92785 . 93029) (\NOFILESNEXTFILEFN - 93031 . 95022) (\NOFILESINFOFN 95024 . 95338)) (95459 97367 (\FILE.NOT.OPEN 95469 . 95982) ( -\FILE.WONT.OPEN 95984 . 96312) (\ILLEGAL.DEVICEOP 96314 . 96596) (\IS.NOT.RANDACCESSP 96598 . 97044) ( -\STREAM.NOT.OPEN 97046 . 97365)) (97502 99800 (\FDEVINSTANCE 97512 . 99798)) (101002 108376 (CNDIR -101012 . 102317) (DIRECTORYNAME 102319 . 106502) (DIRECTORYNAMEP 106504 . 107120) (HOSTNAMEP 107122 . -107929) (\ADD.CONNECTED.DIR 107931 . 108374)) (108421 136694 (\BACKFILEPTR 108431 . 108619) ( -\BACKPEEKBIN 108621 . 108982) (\BACKBIN 108984 . 109335) (BIN 109337 . 109554) (\BIN 109556 . 109833) -(\BINS 109835 . 110121) (BOUT 110123 . 110485) (\BOUT 110487 . 110802) (\BOUTS 110804 . 111115) ( -COPYBYTES 111117 . 114449) (COPYCHARS 114451 . 118117) (COPYFILE 118119 . 119183) (\COPYOPENFILE -119185 . 122384) (\INFER.FILE.TYPE 122386 . 123340) (EOFP 123342 . 123639) (FORCEOUTPUT 123641 . -123888) (\FLUSH.OPEN.STREAMS 123890 . 124246) (CHARSET 124248 . 125912) (ACCESS-CHARSET 125914 . -126131) (GETEOFPTR 126133 . 126383) (GETFILEINFO 126385 . 129578) (\TYPE.FROM.FILETYPE 129580 . 130050 -) (\FILETYPE.FROM.TYPE 130052 . 130231) (GETFILEPTR 130233 . 130485) (SETFILEINFO 130487 . 134593) ( -SETFILEPTR 134595 . 136314) (BOUT16 136316 . 136501) (BIN16 136503 . 136692)) (136797 142113 ( -\GENERIC.BINS 136807 . 137087) (\GENERIC.BOUTS 137089 . 137354) (\GENERIC.RENAMEFILE 137356 . 139187) -(\GENERIC.OPENP 139189 . 140504) (\GENERIC.READP 140506 . 141658) (\GENERIC.CHARSET 141660 . 142111)) -(142114 142453 (\MAP-OPEN-STREAMS 142124 . 142451)) (144245 146325 (\EOF.ACTION 144255 . 144506) ( -\EOSERROR 144508 . 144701) (\GETEOFPTR 144703 . 144885) (\INCFILEPTR 144887 . 145237) (\PEEKBIN 145239 - . 145430) (\SETCLOSEDFILELENGTH 145432 . 145766) (\SETEOFPTR 145768 . 145956) (\SETFILEPTR 145958 . -146323)) (146326 146868 (\FIXPOUT 146336 . 146636) (\FIXPIN 146638 . 146866)) (146869 147435 (\BOUTEOL - 146879 . 147433)) (150331 160195 (\BUFFERED.BIN 150341 . 151193) (\BUFFERED.PEEKBIN 151195 . 151977) -(\BUFFERED.BOUT 151979 . 152839) (\BUFFERED.BINS 152841 . 156526) (\BUFFERED.BOUTS 156528 . 158329) ( -\BUFFERED.COPYBYTES 158331 . 160193))))) + (FILEMAP (NIL (27795 31601 (STREAMPROP 27805 . 28239) (GETSTREAMPROP 28241 . 28836) (PUTSTREAMPROP +28838 . 31449) (STREAMP 31451 . 31599)) (31644 35023 (\DEFPRINT.BY.NAME 31654 . 32806) ( +\STREAM.DEFPRINT 32808 . 34716) (\FDEV.DEFPRINT 34718 . 35021)) (35281 40322 (\GETACCESS 35291 . 35745 +) (\SETACCESS 35747 . 40320)) (60548 66517 (\DEFINEDEVICE 60558 . 62874) (\GETDEVICEFROMNAME 62876 . +63349) (\GETDEVICEFROMHOSTNAME 63351 . 64395) (\REMOVEDEVICE 64397 . 65520) (\REMOVEDEVICE.NAMES 65522 + . 66515)) (66557 91448 (\CLOSEFILE 66567 . 67392) (\DELETEFILE 67394 . 67688) (\DEVICEEVENT 67690 . +69460) (\GENERATEFILES 69462 . 70409) (\GENERATENEXTFILE 70411 . 71062) (\GENERATEFILEINFO 71064 . +71525) (\GETFILENAME 71527 . 71916) (\GENERIC.OUTFILEP 71918 . 72388) (\OPENFILE 72390 . 74968) ( +\DO.PARAMS.AT.OPEN 74970 . 77285) (\RENAMEFILE 77287 . 77711) (\REVALIDATEFILE 77713 . 80315) ( +\PAGED.REVALIDATEFILELST 80317 . 81875) (\PAGED.REVALIDATEFILES 81877 . 83596) (\PAGED.REVALIDATEFILE +83598 . 85881) (\BUFFERED.REVALIDATEFILE 85883 . 88169) (\BUFFERED.REVALIDATEFILELST 88171 . 89355) ( +\PRINT-REVALIDATION-RESULT 89357 . 89772) (\TRUNCATEFILE 89774 . 90165) (\FILE-CONFLICT 90167 . 91446) +) (91484 96147 (\GENERATENOFILES 91494 . 93590) (\NULLFILEGENERATOR 93592 . 93836) (\NOFILESNEXTFILEFN + 93838 . 95829) (\NOFILESINFOFN 95831 . 96145)) (96266 98174 (\FILE.NOT.OPEN 96276 . 96789) ( +\FILE.WONT.OPEN 96791 . 97119) (\ILLEGAL.DEVICEOP 97121 . 97403) (\IS.NOT.RANDACCESSP 97405 . 97851) ( +\STREAM.NOT.OPEN 97853 . 98172)) (98309 100607 (\FDEVINSTANCE 98319 . 100605)) (101809 109183 (CNDIR +101819 . 103124) (DIRECTORYNAME 103126 . 107309) (DIRECTORYNAMEP 107311 . 107927) (HOSTNAMEP 107929 . +108736) (\ADD.CONNECTED.DIR 108738 . 109181)) (109228 137501 (\BACKFILEPTR 109238 . 109426) ( +\BACKPEEKBIN 109428 . 109789) (\BACKBIN 109791 . 110142) (BIN 110144 . 110361) (\BIN 110363 . 110640) +(\BINS 110642 . 110928) (BOUT 110930 . 111292) (\BOUT 111294 . 111609) (\BOUTS 111611 . 111922) ( +COPYBYTES 111924 . 115256) (COPYCHARS 115258 . 118924) (COPYFILE 118926 . 119990) (\COPYOPENFILE +119992 . 123191) (\INFER.FILE.TYPE 123193 . 124147) (EOFP 124149 . 124446) (FORCEOUTPUT 124448 . +124695) (\FLUSH.OPEN.STREAMS 124697 . 125053) (CHARSET 125055 . 126719) (ACCESS-CHARSET 126721 . +126938) (GETEOFPTR 126940 . 127190) (GETFILEINFO 127192 . 130385) (\TYPE.FROM.FILETYPE 130387 . 130857 +) (\FILETYPE.FROM.TYPE 130859 . 131038) (GETFILEPTR 131040 . 131292) (SETFILEINFO 131294 . 135400) ( +SETFILEPTR 135402 . 137121) (BOUT16 137123 . 137308) (BIN16 137310 . 137499)) (137604 142920 ( +\GENERIC.BINS 137614 . 137894) (\GENERIC.BOUTS 137896 . 138161) (\GENERIC.RENAMEFILE 138163 . 139994) +(\GENERIC.OPENP 139996 . 141311) (\GENERIC.READP 141313 . 142465) (\GENERIC.CHARSET 142467 . 142918)) +(142921 143260 (\MAP-OPEN-STREAMS 142931 . 143258)) (145052 147132 (\EOF.ACTION 145062 . 145313) ( +\EOSERROR 145315 . 145508) (\GETEOFPTR 145510 . 145692) (\INCFILEPTR 145694 . 146044) (\PEEKBIN 146046 + . 146237) (\SETCLOSEDFILELENGTH 146239 . 146573) (\SETEOFPTR 146575 . 146763) (\SETFILEPTR 146765 . +147130)) (147133 147675 (\FIXPOUT 147143 . 147443) (\FIXPIN 147445 . 147673)) (147676 148242 (\BOUTEOL + 147686 . 148240)) (151138 161002 (\BUFFERED.BIN 151148 . 152000) (\BUFFERED.PEEKBIN 152002 . 152784) +(\BUFFERED.BOUT 152786 . 153646) (\BUFFERED.BINS 153648 . 157333) (\BUFFERED.BOUTS 157335 . 159136) ( +\BUFFERED.COPYBYTES 159138 . 161000))))) STOP diff --git a/sources/FILEIO.LCOM b/sources/FILEIO.LCOM index 38d6168c6104929d35cc4c28e4008b9de201a778..f764e31b4cad136548770b88603891bfef73bb57 100644 GIT binary patch delta 664 zcmZ`%O>5gg5OsVAL224Tp}h_Z1^FPMl~%H~6ca@siKrtPOHD`#1=SKwK(>r5A3`ai z*Pa4C7Wx}Xa_gmsp8N-TX#YijK}WbYX-W66`(}1{^XBb-{Mr2eqj`1Qriv5}D@j#U z6{ybj4p%4vkqnE` zcwJ^|hT&N&=G5unt>xmS@{ w2L#$|om>7IT?b<4#WYI^Fs!jAlWdGwL+pnHR0Bvjt0uDw8MT{}2Ya7>1H&4wY5)KL delta 709 zcmbVKUu)A)6t5LzwDS*G?1L}I3qp&eSnr_jo8A(=QZ`m5OEKNe1q9Wq6 zFT>hLW#Bgu_vk0s7w|#9j3-v7gT3f|`knJT=Xd_x^YvTx{rBqI#~zb}hqG8u7PH58-p#&7XlYrL&Ni-R#voK)7|mg zpzV6r(02EHp@$s+q3VUnad@u&+ZJ)J^LgVcrSjtV!`;(n^`u^ZccoIPZd|M2TYR~$ z)1T;U<#Tg8EqzPoY^7crpB`Lr)|OfKZrrJ_mh`Pki%NX)@y+dh$`vr(foTLl8A3<% z1J53838t}Y2Zm$sTS#zNdO?+cMdQ-(o1x#chCoHN