From ee93291c92f86f4d921687bb1c3b5e482b1292bf Mon Sep 17 00:00:00 2001 From: rmkaplan Date: Mon, 27 Apr 2026 08:37:05 -0700 Subject: [PATCH] Include revised \DO.PARAMS.AT.OPEN --- sources/FILEIO | 111 +++++++++++++++++++------------------------- sources/FILEIO.LCOM | Bin 45822 -> 45848 bytes 2 files changed, 49 insertions(+), 62 deletions(-) diff --git a/sources/FILEIO b/sources/FILEIO index 3c049fec..45dab841 100644 --- a/sources/FILEIO +++ b/sources/FILEIO @@ -1,12 +1,12 @@ (DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10) -(FILECREATED "26-Apr-2026 21:00:55" {WMEDLEY}FILEIO.;145 166582 +(FILECREATED "26-Apr-2026 23:27:40" {WMEDLEY}FILEIO.;146 165936 :EDIT-BY rmk - :CHANGES-TO (FNS \RENAMEFILE) + :CHANGES-TO (FNS \DO.PARAMS.AT.OPEN) - :PREVIOUS-DATE "21-Apr-2026 20:57:55" {WMEDLEY}FILEIO.;144) + :PREVIOUS-DATE "26-Apr-2026 21:00:55" {WMEDLEY}FILEIO.;145) (PRETTYCOMPRINT FILEIOCOMS) @@ -1446,7 +1446,8 @@ (GO RETRY]) (\DO.PARAMS.AT.OPEN - [LAMBDA (STREAM ACCESS PARAMETERS) (* ; "Edited 21-Apr-2026 20:57 by mth") + [LAMBDA (STREAM ACCESS PARAMETERS) (* ; "Edited 26-Apr-2026 23:27 by rmk") + (* ; "Edited 21-Apr-2026 20:57 by mth") (* ; "Edited 20-Apr-2026 17:36 by mth") (* ; "Edited 25-Dec-2024 10:54 by rmk") (* ; "Edited 15-Jul-2024 22:29 by rmk") @@ -1484,37 +1485,23 @@ (CHARSET (CHARSET STREAM VAL)) ((FORMAT EXTERNALFORMAT :EXTERNAL-FORMAT) (* ;; - "Ignore the case of the non-LISTP X setting VAL to T") + "This allows an EOL and format to be intermixed, the last ones of each are installed") - [if (LISTP X) - then - (* ;; - "VAL can be :UTF-8, CR, (UTF:8 CR), i.e. specify either one or both") - - (for V in (MKLIST VAL) do - (* ;; - "FIND-FORMAT doesn't know about :DEFAULT, so...") - - (if (OR (EQ V :DEFAULT) - (FIND-FORMAT V T)) - then (\EXTERNALFORMAT STREAM V) - else (SETQ EOL V]) + (for V inside VAL do (if (MEMB V '(LF CR CRLF ANY)) + then (SETQ EOL V) + else (\EXTERNALFORMAT STREAM V)))) (CONVHANKAKU (CONVHANKAKU STREAM VAL)) ((EOL EOLCONVENTION EOLC) (SETQ EOL VAL)) NIL) finally - (* ;; - "If not specified, default EOL to ANY--SETFILEINFO checks for output streams") + (* ;; "If EOL is not specified, default input streams to ANY. ") - (* ;; - " Cannot depend on SETFILEINFO checking for ANY on output stream, because it ERRORs!") - - (CL:WHEN (OR (NEQ (SETQ EOL (OR EOL 'ANY)) - 'ANY) - (EQ ACCESS 'INPUT)) + (CL:UNLESS (OR EOL (\GETSTREAM STREAM 'OUTPUT T)) + (SETQ EOL 'ANY)) + (CL:WHEN EOL (SETFILEINFO STREAM 'EOL EOL))) - (FOR FN IN STREAM-AFTER-OPEN-FNS DO (APPLY* FN STREAM ACCESS PARAMETERS]) + (for FN in STREAM-AFTER-OPEN-FNS do (APPLY* FN STREAM ACCESS PARAMETERS]) (\RENAMEFILE [LAMBDA (OLDFILE NEWFILE) (* ; "Edited 25-Apr-2026 16:03 by rmk") @@ -3173,39 +3160,39 @@ update the map") (ADDTOVAR LAMA \IS.NOT.RANDACCESSP \ILLEGAL.DEVICEOP STREAMPROP) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (27704 31820 (STREAMPROP 27714 . 28148) (GETSTREAMPROP 28150 . 28899) (PUTSTREAMPROP -28901 . 31668) (STREAMP 31670 . 31818)) (31863 35242 (\DEFPRINT.BY.NAME 31873 . 33025) ( -\STREAM.DEFPRINT 33027 . 34935) (\FDEV.DEFPRINT 34937 . 35240)) (35500 40541 (\GETACCESS 35510 . 35964 -) (\SETACCESS 35966 . 40539)) (60767 66736 (\DEFINEDEVICE 60777 . 63093) (\GETDEVICEFROMNAME 63095 . -63568) (\GETDEVICEFROMHOSTNAME 63570 . 64614) (\REMOVEDEVICE 64616 . 65739) (\REMOVEDEVICE.NAMES 65741 - . 66734)) (66776 94572 (\CLOSEFILE 66786 . 67611) (\DELETEFILE 67613 . 67907) (\DEVICEEVENT 67909 . -69679) (\GENERATEFILES 69681 . 70628) (\GENERATENEXTFILE 70630 . 71281) (\GENERATEFILEINFO 71283 . -71744) (\GETFILENAME 71746 . 72135) (\GENERIC.OUTFILEP 72137 . 72607) (\OPENFILE 72609 . 75187) ( -\DO.PARAMS.AT.OPEN 75189 . 79311) (\RENAMEFILE 79313 . 80408) (\REVALIDATEFILE 80410 . 83012) ( -\PAGED.REVALIDATEFILELST 83014 . 84572) (\PAGED.REVALIDATEFILES 84574 . 86293) (\PAGED.REVALIDATEFILE -86295 . 88578) (\BUFFERED.REVALIDATEFILE 88580 . 90866) (\BUFFERED.REVALIDATEFILELST 90868 . 92052) ( -\PRINT-REVALIDATION-RESULT 92054 . 92896) (\TRUNCATEFILE 92898 . 93289) (\FILE-CONFLICT 93291 . 94570) -) (94608 99271 (\GENERATENOFILES 94618 . 96714) (\NULLFILEGENERATOR 96716 . 96960) (\NOFILESNEXTFILEFN - 96962 . 98953) (\NOFILESINFOFN 98955 . 99269)) (99390 101298 (\FILE.NOT.OPEN 99400 . 99913) ( -\FILE.WONT.OPEN 99915 . 100243) (\ILLEGAL.DEVICEOP 100245 . 100527) (\IS.NOT.RANDACCESSP 100529 . -100975) (\STREAM.NOT.OPEN 100977 . 101296)) (101433 103731 (\FDEVINSTANCE 101443 . 103729)) (104933 -111904 (CNDIR 104943 . 106248) (DIRECTORYNAME 106250 . 110030) (DIRECTORYNAMEP 110032 . 110648) ( -HOSTNAMEP 110650 . 111457) (\ADD.CONNECTED.DIR 111459 . 111902)) (111949 140896 (\BACKFILEPTR 111959 - . 112147) (\BACKPEEKBIN 112149 . 112510) (\BACKBIN 112512 . 112863) (BIN 112865 . 113082) (\BIN -113084 . 113361) (\BINS 113363 . 113649) (BOUT 113651 . 114013) (\BOUT 114015 . 114330) (\BOUTS 114332 - . 114643) (COPYBYTES 114645 . 117977) (COPYCHARS 117979 . 121777) (COPYFILE 121779 . 123139) ( -\COPYOPENFILE 123141 . 126340) (\INFER.FILE.TYPE 126342 . 127296) (EOFP 127298 . 127595) (FORCEOUTPUT -127597 . 127844) (\FLUSH.OPEN.STREAMS 127846 . 128202) (CHARSET 128204 . 129563) (ACCESS-CHARSET -129565 . 130202) (GETEOFPTR 130204 . 130454) (GETFILEINFO 130456 . 133649) (\TYPE.FROM.FILETYPE 133651 - . 134121) (\FILETYPE.FROM.TYPE 134123 . 134302) (GETFILEPTR 134304 . 134556) (SETFILEINFO 134558 . -138795) (SETFILEPTR 138797 . 140516) (BOUT16 140518 . 140703) (BIN16 140705 . 140894)) (140999 148179 -(\GENERIC.BINS 141009 . 141289) (\GENERIC.BOUTS 141291 . 141556) (\GENERIC.RENAMEFILE 141558 . 143806) - (\GENERIC.OPENP 143808 . 145123) (\GENERIC.READP 145125 . 146277) (\GENERIC.CHARSET 146279 . 148177)) - (148180 148519 (\MAP-OPEN-STREAMS 148190 . 148517)) (150374 152454 (\EOF.ACTION 150384 . 150635) ( -\EOSERROR 150637 . 150830) (\GETEOFPTR 150832 . 151014) (\INCFILEPTR 151016 . 151366) (\PEEKBIN 151368 - . 151559) (\SETCLOSEDFILELENGTH 151561 . 151895) (\SETEOFPTR 151897 . 152085) (\SETFILEPTR 152087 . -152452)) (152455 152997 (\FIXPOUT 152465 . 152765) (\FIXPIN 152767 . 152995)) (152998 153564 (\BOUTEOL - 153008 . 153562)) (156460 166324 (\BUFFERED.BIN 156470 . 157322) (\BUFFERED.PEEKBIN 157324 . 158106) -(\BUFFERED.BOUT 158108 . 158968) (\BUFFERED.BINS 158970 . 162655) (\BUFFERED.BOUTS 162657 . 164458) ( -\BUFFERED.COPYBYTES 164460 . 166322))))) + (FILEMAP (NIL (27711 31827 (STREAMPROP 27721 . 28155) (GETSTREAMPROP 28157 . 28906) (PUTSTREAMPROP +28908 . 31675) (STREAMP 31677 . 31825)) (31870 35249 (\DEFPRINT.BY.NAME 31880 . 33032) ( +\STREAM.DEFPRINT 33034 . 34942) (\FDEV.DEFPRINT 34944 . 35247)) (35507 40548 (\GETACCESS 35517 . 35971 +) (\SETACCESS 35973 . 40546)) (60774 66743 (\DEFINEDEVICE 60784 . 63100) (\GETDEVICEFROMNAME 63102 . +63575) (\GETDEVICEFROMHOSTNAME 63577 . 64621) (\REMOVEDEVICE 64623 . 65746) (\REMOVEDEVICE.NAMES 65748 + . 66741)) (66783 93926 (\CLOSEFILE 66793 . 67618) (\DELETEFILE 67620 . 67914) (\DEVICEEVENT 67916 . +69686) (\GENERATEFILES 69688 . 70635) (\GENERATENEXTFILE 70637 . 71288) (\GENERATEFILEINFO 71290 . +71751) (\GETFILENAME 71753 . 72142) (\GENERIC.OUTFILEP 72144 . 72614) (\OPENFILE 72616 . 75194) ( +\DO.PARAMS.AT.OPEN 75196 . 78665) (\RENAMEFILE 78667 . 79762) (\REVALIDATEFILE 79764 . 82366) ( +\PAGED.REVALIDATEFILELST 82368 . 83926) (\PAGED.REVALIDATEFILES 83928 . 85647) (\PAGED.REVALIDATEFILE +85649 . 87932) (\BUFFERED.REVALIDATEFILE 87934 . 90220) (\BUFFERED.REVALIDATEFILELST 90222 . 91406) ( +\PRINT-REVALIDATION-RESULT 91408 . 92250) (\TRUNCATEFILE 92252 . 92643) (\FILE-CONFLICT 92645 . 93924) +) (93962 98625 (\GENERATENOFILES 93972 . 96068) (\NULLFILEGENERATOR 96070 . 96314) (\NOFILESNEXTFILEFN + 96316 . 98307) (\NOFILESINFOFN 98309 . 98623)) (98744 100652 (\FILE.NOT.OPEN 98754 . 99267) ( +\FILE.WONT.OPEN 99269 . 99597) (\ILLEGAL.DEVICEOP 99599 . 99881) (\IS.NOT.RANDACCESSP 99883 . 100329) +(\STREAM.NOT.OPEN 100331 . 100650)) (100787 103085 (\FDEVINSTANCE 100797 . 103083)) (104287 111258 ( +CNDIR 104297 . 105602) (DIRECTORYNAME 105604 . 109384) (DIRECTORYNAMEP 109386 . 110002) (HOSTNAMEP +110004 . 110811) (\ADD.CONNECTED.DIR 110813 . 111256)) (111303 140250 (\BACKFILEPTR 111313 . 111501) ( +\BACKPEEKBIN 111503 . 111864) (\BACKBIN 111866 . 112217) (BIN 112219 . 112436) (\BIN 112438 . 112715) +(\BINS 112717 . 113003) (BOUT 113005 . 113367) (\BOUT 113369 . 113684) (\BOUTS 113686 . 113997) ( +COPYBYTES 113999 . 117331) (COPYCHARS 117333 . 121131) (COPYFILE 121133 . 122493) (\COPYOPENFILE +122495 . 125694) (\INFER.FILE.TYPE 125696 . 126650) (EOFP 126652 . 126949) (FORCEOUTPUT 126951 . +127198) (\FLUSH.OPEN.STREAMS 127200 . 127556) (CHARSET 127558 . 128917) (ACCESS-CHARSET 128919 . +129556) (GETEOFPTR 129558 . 129808) (GETFILEINFO 129810 . 133003) (\TYPE.FROM.FILETYPE 133005 . 133475 +) (\FILETYPE.FROM.TYPE 133477 . 133656) (GETFILEPTR 133658 . 133910) (SETFILEINFO 133912 . 138149) ( +SETFILEPTR 138151 . 139870) (BOUT16 139872 . 140057) (BIN16 140059 . 140248)) (140353 147533 ( +\GENERIC.BINS 140363 . 140643) (\GENERIC.BOUTS 140645 . 140910) (\GENERIC.RENAMEFILE 140912 . 143160) +(\GENERIC.OPENP 143162 . 144477) (\GENERIC.READP 144479 . 145631) (\GENERIC.CHARSET 145633 . 147531)) +(147534 147873 (\MAP-OPEN-STREAMS 147544 . 147871)) (149728 151808 (\EOF.ACTION 149738 . 149989) ( +\EOSERROR 149991 . 150184) (\GETEOFPTR 150186 . 150368) (\INCFILEPTR 150370 . 150720) (\PEEKBIN 150722 + . 150913) (\SETCLOSEDFILELENGTH 150915 . 151249) (\SETEOFPTR 151251 . 151439) (\SETFILEPTR 151441 . +151806)) (151809 152351 (\FIXPOUT 151819 . 152119) (\FIXPIN 152121 . 152349)) (152352 152918 (\BOUTEOL + 152362 . 152916)) (155814 165678 (\BUFFERED.BIN 155824 . 156676) (\BUFFERED.PEEKBIN 156678 . 157460) +(\BUFFERED.BOUT 157462 . 158322) (\BUFFERED.BINS 158324 . 162009) (\BUFFERED.BOUTS 162011 . 163812) ( +\BUFFERED.COPYBYTES 163814 . 165676))))) STOP diff --git a/sources/FILEIO.LCOM b/sources/FILEIO.LCOM index bdde3d6f3b7f1e194d8486cf324458ea24d2883a..e53409e67143b77bc55c98a3f6f4864e45adacd6 100644 GIT binary patch delta 742 zcmZXQ&5P4O7{)WLxJ!lAW!YuD)OVG-?V;Ud^3~+jX*;pqCX@Y6U(MF9B;4J-BO!)#OaiXUvk@&4ZrQJCVi}h8I)ZZ zg?lKws)3}bhOC7F+SxfZS^%@{(SxQNbc%K2)9@lvCtuLv6{LrkK5iKWK)Dqpq$`I4 z|1#09x_;+uBRvKC)mZqO)bE~)8a)3Q%erIXYxp#`i{6E!+~)0P`@Oh)^k!aZ#TKK- zNnx_Np9CKkl23Tv>d$V?o#~m8mwxZe`cE7*b5ft#gXoBOI%M6^uL?_?euVj};$X{u zn~>Ns$$aDb+KV1qM?!^E@24B**EUk==~4fJkjI(^9qL<6n>Lx{@^{st=CXqZVJ*@M z0E-fI=?$NHjM$dzIm8F4Y=A?ZDoB`%8^q%VAc^|YXb?G-)ny)~vI^a6)bIEnB@S1g zbS-2!iwM-U0V`6p*8t0M9B>}W{HDtQV>OY8T@4NZu{{g%uz0v>x delta 706 zcmZ8f&ubGw6yC{Ft0`DRF0F#Rw4_a>i#wB@%?~e`B(r4AW;SkigN4-7LR(M}uO6yb zJ!sg26~u$!!Gn-AUm1J-p~B0(Qz zlnZGdDjkRSOxx=!4d!y#AoyZBQ7g0CJsV#@|n? zt!Vu4dGI~Et{11Ke6rW_<#EnG$sXJsW_+|4OTV=J!$^8Ot+u1&MSq%*C#ORt$Zn}e zOFl{=smf}P<>u=3bjZvOZb&&&(4cOMUXzIyYk5F0hCYAjaz`-Bu$?w@A>1?=rf4W< zH7=B)-egXfyMS>S!h61UQy4asiwh;y&dNtIjn&K3^T`~cCE&JI2SU{-3H@;4nzjI< zkvRf{&;^^gOrX->2J@`YgRTWHSJFq6!X@We)8U_K^1tZJloE_{tJq@v>*Tg