From c94e044bf33e3be659df0c5fc62efa3b3f9d245f Mon Sep 17 00:00:00 2001 From: rmkaplan Date: Thu, 5 Aug 2021 14:44:01 -0700 Subject: [PATCH] FILEIO: Fix bad IF statement in \EXTERNALFORMAT --- sources/FILEIO | 98 ++++++++++++++++++++++---------------------- sources/FILEIO.LCOM | Bin 49811 -> 49804 bytes 2 files changed, 48 insertions(+), 50 deletions(-) diff --git a/sources/FILEIO b/sources/FILEIO index 5d6a5624..487940f6 100644 --- a/sources/FILEIO +++ b/sources/FILEIO @@ -1,12 +1,11 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10 FORMAT XCCS) -(FILECREATED " 2-Aug-2021 10:13:47"  -{DSK}kaplan>Local>medley3.5>git-medley>sources>FILEIO.;68 180948 +(FILECREATED " 5-Aug-2021 14:42:41"  +{DSK}kaplan>Local>medley3.5>git-medley>sources>FILEIO.;72 180878 - changes to%: (FNS \INSTALL.EXTERNALFORMAT \EXTERNALFORMAT) - (RECORDS FDEV STREAM) + changes to%: (FNS \INSTALL.EXTERNALFORMAT) - previous date%: " 1-Aug-2021 23:16:14" -{DSK}kaplan>Local>medley3.5>git-medley>sources>FILEIO.;64) + previous date%: " 2-Aug-2021 10:13:47" +{DSK}kaplan>Local>medley3.5>git-medley>sources>FILEIO.;71) (* ; " @@ -1278,7 +1277,7 @@ Copyright (c) 1981-1993, 1999, 2020-2021 by Venue & Xerox Corporation. (DEFINEQ (\INSTALL.EXTERNALFORMAT - [LAMBDA (EXTFORMAT/NAME EXTERNALFORMAT) (* ; "Edited 2-Aug-2021 10:13 by rmk:") + [LAMBDA (EXTFORMAT/NAME EXTERNALFORMAT) (* ; "Edited 5-Aug-2021 14:22 by rmk:") (* ;;; "Register an instance of the datatype EXTERNALFORMAT.") @@ -1299,9 +1298,8 @@ Copyright (c) 1981-1993, 1999, 2020-2021 by Venue & Xerox Corporation. ELSE (SETQ EXTERNALFORMAT EXTFORMAT/NAME) (SETQ NAME (FETCH (EXTERNALFORMAT NAME) OF EXTERNALFORMAT))) (IF (type? EXTERNALFORMAT EXTERNALFORMAT) - (\REMOVE.EXTERNALFORMAT NAME) - (push *EXTERNALFORMATS* EXTERNALFORMAT) - NAME + THEN (\REMOVE.EXTERNALFORMAT NAME) + (push *EXTERNALFORMATS* EXTERNALFORMAT) ELSE (ERROR "INVALID EXTERNALFORMAT " EXTERNALFORMAT)) EXTERNALFORMAT]) @@ -3417,44 +3415,44 @@ 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)) (DECLARE%: DONTCOPY - (FILEMAP (NIL (28483 31973 (STREAMPROP 28493 . 28927) (GETSTREAMPROP 28929 . 29402) (PUTSTREAMPROP -29404 . 31821) (STREAMP 31823 . 31971)) (32016 34535 (\DEFPRINT.BY.NAME 32026 . 33178) ( -\STREAM.DEFPRINT 33180 . 34228) (\FDEV.DEFPRINT 34230 . 34533)) (34793 39834 (\GETACCESS 34803 . 35257 -) (\SETACCESS 35259 . 39832)) (62838 64091 (MAKE-EXTERNALFORMAT 62848 . 64089)) (65277 72720 ( -\INSTALL.EXTERNALFORMAT 65287 . 66748) (\REMOVE.EXTERNALFORMAT 66750 . 67581) (FIND-FORMAT 67583 . -68134) (\EXTERNALFORMAT 68136 . 72718)) (73043 74862 (\CREATE.THROUGH.EXTERNALFORMAT 73053 . 73855) ( -\THROUGHIN 73857 . 74263) (\THROUGHBACKCCODE 74265 . 74510) (\THROUGHOUTCHARFN 74512 . 74860)) (74970 -80939 (\DEFINEDEVICE 74980 . 77296) (\GETDEVICEFROMNAME 77298 . 77771) (\GETDEVICEFROMHOSTNAME 77773 - . 78817) (\REMOVEDEVICE 78819 . 79942) (\REMOVEDEVICE.NAMES 79944 . 80937)) (80979 105639 (\CLOSEFILE - 80989 . 81814) (\DELETEFILE 81816 . 82110) (\DEVICEEVENT 82112 . 83882) (\GENERATEFILES 83884 . 84362 -) (\GENERATENEXTFILE 84364 . 85015) (\GENERATEFILEINFO 85017 . 85478) (\GETFILENAME 85480 . 85869) ( -\GENERIC.OUTFILEP 85871 . 86341) (\OPENFILE 86343 . 88921) (\DO.PARAMS.AT.OPEN 88923 . 91476) ( -\RENAMEFILE 91478 . 91902) (\REVALIDATEFILE 91904 . 94506) (\PAGED.REVALIDATEFILELST 94508 . 96066) ( -\PAGED.REVALIDATEFILES 96068 . 97787) (\PAGED.REVALIDATEFILE 97789 . 100072) (\BUFFERED.REVALIDATEFILE - 100074 . 102360) (\BUFFERED.REVALIDATEFILELST 102362 . 103546) (\PRINT-REVALIDATION-RESULT 103548 . -103963) (\TRUNCATEFILE 103965 . 104356) (\FILE-CONFLICT 104358 . 105637)) (105675 110338 ( -\GENERATENOFILES 105685 . 107781) (\NULLFILEGENERATOR 107783 . 108027) (\NOFILESNEXTFILEFN 108029 . -110020) (\NOFILESINFOFN 110022 . 110336)) (110457 112365 (\FILE.NOT.OPEN 110467 . 110980) ( -\FILE.WONT.OPEN 110982 . 111310) (\ILLEGAL.DEVICEOP 111312 . 111594) (\IS.NOT.RANDACCESSP 111596 . -112042) (\STREAM.NOT.OPEN 112044 . 112363)) (112500 114798 (\FDEVINSTANCE 112510 . 114796)) (116348 -123722 (CNDIR 116358 . 117663) (DIRECTORYNAME 117665 . 121848) (DIRECTORYNAMEP 121850 . 122466) ( -HOSTNAMEP 122468 . 123275) (\ADD.CONNECTED.DIR 123277 . 123720)) (123767 154410 (\BACKFILEPTR 123777 - . 123965) (\BACKPEEKBIN 123967 . 124328) (\BACKBIN 124330 . 124681) (BIN 124683 . 124900) (\BIN -124902 . 125179) (\BINS 125181 . 125467) (BOUT 125469 . 125831) (\BOUT 125833 . 126148) (\BOUTS 126150 - . 126461) (COPYBYTES 126463 . 129795) (COPYCHARS 129797 . 136719) (COPYFILE 136721 . 137518) ( -\COPYOPENFILE 137520 . 140593) (\INFER.FILE.TYPE 140595 . 141549) (EOFP 141551 . 141848) (FORCEOUTPUT -141850 . 142097) (\FLUSH.OPEN.STREAMS 142099 . 142455) (CHARSET 142457 . 144121) (ACCESS-CHARSET -144123 . 144340) (GETEOFPTR 144342 . 144592) (GETFILEINFO 144594 . 147787) (\TYPE.FROM.FILETYPE 147789 - . 148259) (\FILETYPE.FROM.TYPE 148261 . 148440) (GETFILEPTR 148442 . 148694) (SETFILEINFO 148696 . -152309) (SETFILEPTR 152311 . 154030) (BOUT16 154032 . 154217) (BIN16 154219 . 154408)) (154513 159718 -(\GENERIC.BINS 154523 . 154803) (\GENERIC.BOUTS 154805 . 155070) (\GENERIC.RENAMEFILE 155072 . 156903) - (\GENERIC.OPENP 156905 . 158220) (\GENERIC.READP 158222 . 159263) (\GENERIC.CHARSET 159265 . 159716)) - (159719 160058 (\MAP-OPEN-STREAMS 159729 . 160056)) (161928 164008 (\EOF.ACTION 161938 . 162189) ( -\EOSERROR 162191 . 162384) (\GETEOFPTR 162386 . 162568) (\INCFILEPTR 162570 . 162920) (\PEEKBIN 162922 - . 163113) (\SETCLOSEDFILELENGTH 163115 . 163449) (\SETEOFPTR 163451 . 163639) (\SETFILEPTR 163641 . -164006)) (164009 164551 (\FIXPOUT 164019 . 164319) (\FIXPIN 164321 . 164549)) (164552 165160 (\BOUTEOL - 164562 . 165158)) (168252 178116 (\BUFFERED.BIN 168262 . 169114) (\BUFFERED.PEEKBIN 169116 . 169898) -(\BUFFERED.BOUT 169900 . 170760) (\BUFFERED.BINS 170762 . 174447) (\BUFFERED.BOUTS 174449 . 176250) ( -\BUFFERED.COPYBYTES 176252 . 178114)) (178145 180497 (\NULLDEVICE 178155 . 180173) (\NULL.OPENFILE -180175 . 180495))))) + (FILEMAP (NIL (28425 31915 (STREAMPROP 28435 . 28869) (GETSTREAMPROP 28871 . 29344) (PUTSTREAMPROP +29346 . 31763) (STREAMP 31765 . 31913)) (31958 34477 (\DEFPRINT.BY.NAME 31968 . 33120) ( +\STREAM.DEFPRINT 33122 . 34170) (\FDEV.DEFPRINT 34172 . 34475)) (34735 39776 (\GETACCESS 34745 . 35199 +) (\SETACCESS 35201 . 39774)) (62780 64033 (MAKE-EXTERNALFORMAT 62790 . 64031)) (65219 72650 ( +\INSTALL.EXTERNALFORMAT 65229 . 66678) (\REMOVE.EXTERNALFORMAT 66680 . 67511) (FIND-FORMAT 67513 . +68064) (\EXTERNALFORMAT 68066 . 72648)) (72973 74792 (\CREATE.THROUGH.EXTERNALFORMAT 72983 . 73785) ( +\THROUGHIN 73787 . 74193) (\THROUGHBACKCCODE 74195 . 74440) (\THROUGHOUTCHARFN 74442 . 74790)) (74900 +80869 (\DEFINEDEVICE 74910 . 77226) (\GETDEVICEFROMNAME 77228 . 77701) (\GETDEVICEFROMHOSTNAME 77703 + . 78747) (\REMOVEDEVICE 78749 . 79872) (\REMOVEDEVICE.NAMES 79874 . 80867)) (80909 105569 (\CLOSEFILE + 80919 . 81744) (\DELETEFILE 81746 . 82040) (\DEVICEEVENT 82042 . 83812) (\GENERATEFILES 83814 . 84292 +) (\GENERATENEXTFILE 84294 . 84945) (\GENERATEFILEINFO 84947 . 85408) (\GETFILENAME 85410 . 85799) ( +\GENERIC.OUTFILEP 85801 . 86271) (\OPENFILE 86273 . 88851) (\DO.PARAMS.AT.OPEN 88853 . 91406) ( +\RENAMEFILE 91408 . 91832) (\REVALIDATEFILE 91834 . 94436) (\PAGED.REVALIDATEFILELST 94438 . 95996) ( +\PAGED.REVALIDATEFILES 95998 . 97717) (\PAGED.REVALIDATEFILE 97719 . 100002) (\BUFFERED.REVALIDATEFILE + 100004 . 102290) (\BUFFERED.REVALIDATEFILELST 102292 . 103476) (\PRINT-REVALIDATION-RESULT 103478 . +103893) (\TRUNCATEFILE 103895 . 104286) (\FILE-CONFLICT 104288 . 105567)) (105605 110268 ( +\GENERATENOFILES 105615 . 107711) (\NULLFILEGENERATOR 107713 . 107957) (\NOFILESNEXTFILEFN 107959 . +109950) (\NOFILESINFOFN 109952 . 110266)) (110387 112295 (\FILE.NOT.OPEN 110397 . 110910) ( +\FILE.WONT.OPEN 110912 . 111240) (\ILLEGAL.DEVICEOP 111242 . 111524) (\IS.NOT.RANDACCESSP 111526 . +111972) (\STREAM.NOT.OPEN 111974 . 112293)) (112430 114728 (\FDEVINSTANCE 112440 . 114726)) (116278 +123652 (CNDIR 116288 . 117593) (DIRECTORYNAME 117595 . 121778) (DIRECTORYNAMEP 121780 . 122396) ( +HOSTNAMEP 122398 . 123205) (\ADD.CONNECTED.DIR 123207 . 123650)) (123697 154340 (\BACKFILEPTR 123707 + . 123895) (\BACKPEEKBIN 123897 . 124258) (\BACKBIN 124260 . 124611) (BIN 124613 . 124830) (\BIN +124832 . 125109) (\BINS 125111 . 125397) (BOUT 125399 . 125761) (\BOUT 125763 . 126078) (\BOUTS 126080 + . 126391) (COPYBYTES 126393 . 129725) (COPYCHARS 129727 . 136649) (COPYFILE 136651 . 137448) ( +\COPYOPENFILE 137450 . 140523) (\INFER.FILE.TYPE 140525 . 141479) (EOFP 141481 . 141778) (FORCEOUTPUT +141780 . 142027) (\FLUSH.OPEN.STREAMS 142029 . 142385) (CHARSET 142387 . 144051) (ACCESS-CHARSET +144053 . 144270) (GETEOFPTR 144272 . 144522) (GETFILEINFO 144524 . 147717) (\TYPE.FROM.FILETYPE 147719 + . 148189) (\FILETYPE.FROM.TYPE 148191 . 148370) (GETFILEPTR 148372 . 148624) (SETFILEINFO 148626 . +152239) (SETFILEPTR 152241 . 153960) (BOUT16 153962 . 154147) (BIN16 154149 . 154338)) (154443 159648 +(\GENERIC.BINS 154453 . 154733) (\GENERIC.BOUTS 154735 . 155000) (\GENERIC.RENAMEFILE 155002 . 156833) + (\GENERIC.OPENP 156835 . 158150) (\GENERIC.READP 158152 . 159193) (\GENERIC.CHARSET 159195 . 159646)) + (159649 159988 (\MAP-OPEN-STREAMS 159659 . 159986)) (161858 163938 (\EOF.ACTION 161868 . 162119) ( +\EOSERROR 162121 . 162314) (\GETEOFPTR 162316 . 162498) (\INCFILEPTR 162500 . 162850) (\PEEKBIN 162852 + . 163043) (\SETCLOSEDFILELENGTH 163045 . 163379) (\SETEOFPTR 163381 . 163569) (\SETFILEPTR 163571 . +163936)) (163939 164481 (\FIXPOUT 163949 . 164249) (\FIXPIN 164251 . 164479)) (164482 165090 (\BOUTEOL + 164492 . 165088)) (168182 178046 (\BUFFERED.BIN 168192 . 169044) (\BUFFERED.PEEKBIN 169046 . 169828) +(\BUFFERED.BOUT 169830 . 170690) (\BUFFERED.BINS 170692 . 174377) (\BUFFERED.BOUTS 174379 . 176180) ( +\BUFFERED.COPYBYTES 176182 . 178044)) (178075 180427 (\NULLDEVICE 178085 . 180103) (\NULL.OPENFILE +180105 . 180425))))) STOP diff --git a/sources/FILEIO.LCOM b/sources/FILEIO.LCOM index f94a25e29cd4298026153c1124ec4985bcc68677..0a6d02f9b18f8b47a1fbe351a81eebb0cc1e8781 100644 GIT binary patch delta 311 zcmbQ-%G}e+JRw!sRM)XIUDwFK$WX!1#LC3T%EWMDMWDX9k*0!@0;;5enU#sTl0s5Z zYI1&VL1s>BiUL<^ML|)qs@3E(G7^)y7`X$Hbm-~nDJi5RmH?GuG0D_eNs~*%&C|!# zImp#9#MK2u5!fwClLeUU#m$WrxC|`}EX*wwk~0$X(o>5SO7elW7R;8_(o`rYN-fLG zFD(XJrfLN=$Oy?(23Cf~V0Uv(7G$zxGB?~D$W$Q0m^b;5SeVp)#{>o-kP-)xUHKr= ckqb;tHWasIG?{EDDa>SH0irff7yq*g0C;yzD*ylh delta 401 zcmeBaWuDy1JRw!sNY}A6UDwFK$WX!1z{=3j%FtwDMPR*|xu$}W0+OVGft87=m9eFg zLQ+v`a(-?>W=?8~0#|ZIVqSV`v8t6qjB7-QYmlF#kDGsxuVaWpW}bqQTd0qZ0?SubYBQOcOs?G}y*Y&`RD>~i@-DG3 qNyh{RAdnIVksbp1Aj**oL{8Qcw-qy1&_WHRU@Zj;^Uby5{Hp<{pJ#&r