From 1c877f35d879325698451675bc23166b19569535 Mon Sep 17 00:00:00 2001 From: rmkaplan Date: Sun, 10 May 2026 13:31:49 -0700 Subject: [PATCH] Logic of pathname case for OPENTEXTSTREAM wasn't quite right --- library/tedit/TEDIT-STREAM | 82 ++++++++++++++++---------------- library/tedit/TEDIT-STREAM.LCOM | Bin 37928 -> 37930 bytes 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/library/tedit/TEDIT-STREAM b/library/tedit/TEDIT-STREAM index 3860eb4d..e4059266 100644 --- a/library/tedit/TEDIT-STREAM +++ b/library/tedit/TEDIT-STREAM @@ -1,12 +1,12 @@ (DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10) -(FILECREATED " 1-May-2026 08:15:56" {MEDLEY}tedit>TEDIT-STREAM.;956 190971 +(FILECREATED "10-May-2026 13:26:30" {MEDLEY}TEDIT>TEDIT-STREAM.;957 191002 :EDIT-BY rmk - :CHANGES-TO (RECORDS PIECE) + :CHANGES-TO (FNS \TEDIT.OPENTEXTFILE) - :PREVIOUS-DATE "26-Apr-2026 23:46:38" {MEDLEY}tedit>TEDIT-STREAM.;955) + :PREVIOUS-DATE " 1-May-2026 08:15:56" {MEDLEY}TEDIT>TEDIT-STREAM.;956) (PRETTYCOMPRINT TEDIT-STREAMCOMS) @@ -1642,7 +1642,8 @@ (SETTOBJ TEXTOBJ DEFAULTPARALOOKS PARALOOKS]) (\TEDIT.OPENTEXTFILE - [LAMBDA (TEXT PROPS ERROR) (* ; "Edited 2-Dec-2025 17:49 by rmk") + [LAMBDA (TEXT PROPS ERROR) (* ; "Edited 10-May-2026 12:57 by rmk") + (* ; "Edited 2-Dec-2025 17:49 by rmk") (* ; "Edited 16-Sep-2025 00:28 by rmk") (* ; "Edited 8-Sep-2025 21:52 by rmk") (* ; "Edited 21-Nov-2024 11:38 by rmk") @@ -1658,16 +1659,15 @@ (STRINGP TEXT) (CL:PATHNAMEP TEXT) (STREAMP TEXT)) - (CAR (NLSETQ (OPENSTREAM (if (STREAMP TEXT) - elseif (CL:PATHNAMEP TEXT) - then (FINDFILE TEXT T) - elseif (FINDFILE-WITH-EXTENSIONS TEXT NIL - *TEDIT-EXTENSIONS*) - else TEXT) + (CAR (NLSETQ (OPENSTREAM (OR (STREAMP TEXT) + (AND (CL:PATHNAMEP TEXT) + (FINDFILE TEXT T)) + (FINDFILE-WITH-EXTENSIONS TEXT NIL + *TEDIT-EXTENSIONS*) + TEXT) 'INPUT 'OLD - `((TYPE TEXT) - (FORMAT ,(LISTGET PROPS 'FORMAT] + `((FORMAT ,(LISTGET PROPS 'FORMAT] elseif ERROR then (ERROR "File not found:" TEXT)))]) @@ -3084,33 +3084,33 @@ (ADDTOVAR LAMA TEXTPROP) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (36156 66033 (\TEDIT.TEXTBIN 36166 . 46068) (\TEDIT.TEXTPEEKBIN 46070 . 51495) ( -\TEDIT.TEXTBACKFILEPTR 51497 . 57204) (\TEDIT.TEXTBOUT 57206 . 61823) (\TEDIT.INSTALL.FILEBUFFER 61825 - . 66031)) (66931 71222 (\TEDIT.TEXTOUTCHARFN 66941 . 68497) (\TEDIT.TEXTINCCODEFN 68499 . 69238) ( -\TEDIT.TEXTBACKCCODEFN 69240 . 69832) (\TEDIT.TEXTFORMATBYTESTREAM 69834 . 70671) ( -\TEDIT.TEXTFORMATBYTESTRING 70673 . 71220)) (71269 83344 (OPENTEXTSTREAM 71279 . 78255) ( -COPYTEXTSTREAM 78257 . 82567) (TEDIT.STREAMCHANGEDP 82569 . 82871) (TXTFILE 82873 . 83342)) (83345 -106550 (\TEDIT.REOPENTEXTSTREAM 83355 . 84707) (\TEDIT.OPENTEXTSTREAM.PIECES 84709 . 89637) ( -\TEDIT.OPENTEXTSTREAM.PROPS 89639 . 90741) (\TEDIT.OPENTEXTSTREAM.SETUP.SEL 90743 . 96193) ( -\TEDIT.OPENTEXTSTREAM.WINDOW 96195 . 98986) (\TEDIT.OPENTEXTSTREAM.DEFAULTLOOKS 98988 . 100927) ( -\TEDIT.OPENTEXTFILE 100929 . 103061) (\TEDIT.CREATE.TEXTSTREAM 103063 . 104210) (\TEDIT.REOPEN.STREAM -104212 . 106548)) (106551 114883 (\TEDIT.STREAMINIT 106561 . 114700) (TEDIT.IMAGESTREAM.OPEN 114702 . -114881)) (115071 116259 (\TEDIT.TTYBOUT 115081 . 116257)) (116377 138060 (\TEDIT.TEXTCLOSEF 116387 . -117711) (\TEDIT.TEXTDSPFONT 117713 . 118911) (\TEDIT.TEXTEOFP 118913 . 120668) (\TEDIT.TEXTGETEOFPTR -120670 . 120993) (\TEDIT.TEXTSETEOFPTR 120995 . 122282) (\TEDIT.TEXTGETFILEPTR 122284 . 125119) ( -\TEDIT.TEXTSETFILEINFO 125121 . 125629) (\TEDIT.TEXTOPENF 125631 . 126562) (\TEDIT.TEXTSETEOF 126564 - . 127180) (\TEDIT.TEXTSETFILEPTR 127182 . 129292) (\TEDIT.TEXTDSPXPOSITION 129294 . 131997) ( -\TEDIT.TEXTDSPYPOSITION 131999 . 132740) (\TEDIT.TEXTLEFTMARGIN 132742 . 133333) (\TEDIT.TEXTCOLOR -133335 . 133918) (\TEDIT.TEXTRIGHTMARGIN 133920 . 137209) (\TEDIT.TEXTDSPCHARWIDTH 137211 . 137515) ( -\TEDIT.TEXTDSPSTRINGWIDTH 137517 . 137823) (\TEDIT.TEXTDSPLINEFEED 137825 . 138058)) (138098 150332 ( -\TEDIT.NTHCHARCODE 138108 . 139634) (\TEDIT.PIECE.NTHCHARCODE 139636 . 143204) (\TEDIT.RPLCHARCODE -143206 . 144764) (\TEDIT.PIECE.RPLCHARCODE 144766 . 149977) (\TEDIT.NTHCHARLOOKS 149979 . 150330)) ( -151379 172254 (\TEDIT.DELETE.SELPIECES 151389 . 155014) (\TEDIT.INSERTCH 155016 . 162821) ( -\TEDIT.INSERTCH.HISTORY 162823 . 166287) (\TEDIT.INSERTEOL 166289 . 168114) (\TEDIT.INSERTCH.INSERTION - 168116 . 170953) (\TEDIT.INSERTCH.EXTEND 170955 . 172252)) (172255 173862 (\TEDIT.NEXTCHANGEABLE.CHNO - 172265 . 172980) (\TEDIT.LASTCHANGEABLE.CHNO 172982 . 173860)) (173863 178652 (\TEDIT.INSTALL.PIECE -173873 . 178650)) (178690 188156 (TEXTPROP 178700 . 179047) (GETTEXTPROP 179049 . 179293) (PUTTEXTPROP - 179295 . 179552) (GETTEXTPROPS 179554 . 179998) (PUTTEXTPROPS 180000 . 180904) (TEXTPROP.ADD 180906 - . 181169) (\TEDIT.TEXTPROP 181171 . 188154)) (188157 190534 (\TEDIT.TEXTOBJ.PROPNAMES 188167 . 189426 -) (\TEDIT.TEXTOBJ.PROPFETCHFN 189428 . 189944) (\TEDIT.TEXTOBJ.PROPSTOREFN 189946 . 190532))))) + (FILEMAP (NIL (36166 66043 (\TEDIT.TEXTBIN 36176 . 46078) (\TEDIT.TEXTPEEKBIN 46080 . 51505) ( +\TEDIT.TEXTBACKFILEPTR 51507 . 57214) (\TEDIT.TEXTBOUT 57216 . 61833) (\TEDIT.INSTALL.FILEBUFFER 61835 + . 66041)) (66941 71232 (\TEDIT.TEXTOUTCHARFN 66951 . 68507) (\TEDIT.TEXTINCCODEFN 68509 . 69248) ( +\TEDIT.TEXTBACKCCODEFN 69250 . 69842) (\TEDIT.TEXTFORMATBYTESTREAM 69844 . 70681) ( +\TEDIT.TEXTFORMATBYTESTRING 70683 . 71230)) (71279 83354 (OPENTEXTSTREAM 71289 . 78265) ( +COPYTEXTSTREAM 78267 . 82577) (TEDIT.STREAMCHANGEDP 82579 . 82881) (TXTFILE 82883 . 83352)) (83355 +106581 (\TEDIT.REOPENTEXTSTREAM 83365 . 84717) (\TEDIT.OPENTEXTSTREAM.PIECES 84719 . 89647) ( +\TEDIT.OPENTEXTSTREAM.PROPS 89649 . 90751) (\TEDIT.OPENTEXTSTREAM.SETUP.SEL 90753 . 96203) ( +\TEDIT.OPENTEXTSTREAM.WINDOW 96205 . 98996) (\TEDIT.OPENTEXTSTREAM.DEFAULTLOOKS 98998 . 100937) ( +\TEDIT.OPENTEXTFILE 100939 . 103092) (\TEDIT.CREATE.TEXTSTREAM 103094 . 104241) (\TEDIT.REOPEN.STREAM +104243 . 106579)) (106582 114914 (\TEDIT.STREAMINIT 106592 . 114731) (TEDIT.IMAGESTREAM.OPEN 114733 . +114912)) (115102 116290 (\TEDIT.TTYBOUT 115112 . 116288)) (116408 138091 (\TEDIT.TEXTCLOSEF 116418 . +117742) (\TEDIT.TEXTDSPFONT 117744 . 118942) (\TEDIT.TEXTEOFP 118944 . 120699) (\TEDIT.TEXTGETEOFPTR +120701 . 121024) (\TEDIT.TEXTSETEOFPTR 121026 . 122313) (\TEDIT.TEXTGETFILEPTR 122315 . 125150) ( +\TEDIT.TEXTSETFILEINFO 125152 . 125660) (\TEDIT.TEXTOPENF 125662 . 126593) (\TEDIT.TEXTSETEOF 126595 + . 127211) (\TEDIT.TEXTSETFILEPTR 127213 . 129323) (\TEDIT.TEXTDSPXPOSITION 129325 . 132028) ( +\TEDIT.TEXTDSPYPOSITION 132030 . 132771) (\TEDIT.TEXTLEFTMARGIN 132773 . 133364) (\TEDIT.TEXTCOLOR +133366 . 133949) (\TEDIT.TEXTRIGHTMARGIN 133951 . 137240) (\TEDIT.TEXTDSPCHARWIDTH 137242 . 137546) ( +\TEDIT.TEXTDSPSTRINGWIDTH 137548 . 137854) (\TEDIT.TEXTDSPLINEFEED 137856 . 138089)) (138129 150363 ( +\TEDIT.NTHCHARCODE 138139 . 139665) (\TEDIT.PIECE.NTHCHARCODE 139667 . 143235) (\TEDIT.RPLCHARCODE +143237 . 144795) (\TEDIT.PIECE.RPLCHARCODE 144797 . 150008) (\TEDIT.NTHCHARLOOKS 150010 . 150361)) ( +151410 172285 (\TEDIT.DELETE.SELPIECES 151420 . 155045) (\TEDIT.INSERTCH 155047 . 162852) ( +\TEDIT.INSERTCH.HISTORY 162854 . 166318) (\TEDIT.INSERTEOL 166320 . 168145) (\TEDIT.INSERTCH.INSERTION + 168147 . 170984) (\TEDIT.INSERTCH.EXTEND 170986 . 172283)) (172286 173893 (\TEDIT.NEXTCHANGEABLE.CHNO + 172296 . 173011) (\TEDIT.LASTCHANGEABLE.CHNO 173013 . 173891)) (173894 178683 (\TEDIT.INSTALL.PIECE +173904 . 178681)) (178721 188187 (TEXTPROP 178731 . 179078) (GETTEXTPROP 179080 . 179324) (PUTTEXTPROP + 179326 . 179583) (GETTEXTPROPS 179585 . 180029) (PUTTEXTPROPS 180031 . 180935) (TEXTPROP.ADD 180937 + . 181200) (\TEDIT.TEXTPROP 181202 . 188185)) (188188 190565 (\TEDIT.TEXTOBJ.PROPNAMES 188198 . 189457 +) (\TEDIT.TEXTOBJ.PROPFETCHFN 189459 . 189975) (\TEDIT.TEXTOBJ.PROPSTOREFN 189977 . 190563))))) STOP diff --git a/library/tedit/TEDIT-STREAM.LCOM b/library/tedit/TEDIT-STREAM.LCOM index 083f02ec0881a97b10a1659d65c2fee80c9b394a..eccaf5a03ad00bb04de6b1329e3b0f97934d7e36 100644 GIT binary patch delta 564 zcmaix%SyvQ6o%XA#;Bm6AO-ah5gRliNt0+t5o0s4f!s)@UO2XLcw z#ArAIyNO^E_$SKFK{kN^Ei42N0c~0*y*#&Dp^LM_kAoP5_6gVczwyL-0OH2v|U#k9SSC5^#FV z(uM2{OaDJOovXfnX5ZOPKn+uwaBGsv`XiZmz0LX`Nq+J}I^B=^&0sWDLw+O4KY^rj zshP_)b7M)VnLDA=vx!W8RfL4K|3Oet!7v>?q2~5XQs!a{anbC~ugnz%K#uF%ngyx= nMxqEP^0$(U;95G!GMJ86At0`Sr;)Ow*|?iso_T#;{0ThfR delta 597 zcma)(&ubGw6vxxmi>n8PdI=uBOcAr#4cVXFj8fcYCuU)PF*~uzF>OM!v`xaAgGD6J zV^2yCUOfh{r5A7FALX^XDT+b`hhe_odGO|a-n_3XX|<9*?r%a`zBq%f)DzEp`R-e4(a-GdHZiXj--cndnW`o#!_xx1;8{rekDNkajl+@MmhhUMCn1ibA)%xhyyuM3HN4KVYq*d_e+o8!W;5ka+>? ze|UME9pr=jboU?Z(3*|rjt07JYOjy{GROH~o0##t-oUW%mavldf86VBfF zaW_@Hf&fIf|7zW|so@aF|4Cq7{@nPcEPK*jsgk{VByI3}m112z;Xg|K%rm*vb3RG$ zm*(mYAD6m5X1|?S-=9sY)nY#=!;|WvybeCB)OKvd35#xK2E#(zkG%31)qP)dRMxwA zzP%M#pi#_2H-K%TT{;2F`Q=Opap1u;;73VUKy#3|q7%6xD@Fp#Kuz=$2ElqlQ7*op LJ-+<1eLlVhUU8N6