From 3cb051ea7befd2743dddb718673c0adb7a971faf Mon Sep 17 00:00:00 2001 From: Larry Masinter Date: Wed, 19 Apr 2023 19:47:11 -0700 Subject: [PATCH] Allow (CLOSALL) to work after all (#1164) --- sources/AOFD | 93 ++++++++++++++++++++++------------------------ sources/AOFD.LCOM | Bin 14332 -> 14249 bytes 2 files changed, 44 insertions(+), 49 deletions(-) diff --git a/sources/AOFD b/sources/AOFD index d4d64b75..dbbf0c53 100644 --- a/sources/AOFD +++ b/sources/AOFD @@ -1,23 +1,20 @@ -(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10 FORMAT XCCS) -(FILECREATED " 9-Aug-2021 23:30:19" {DSK}kaplan>Local>medley3.5>git-medley>sources>AOFD.;5 38301 +(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) - changes to%: (VARS AOFDCOMS) - (FNS \STRINGSTREAM.INIT) +(FILECREATED "19-Apr-2023 08:05:54" {DSK}larry>il>medley>sources>AOFD.;2 37842 - previous date%: " 8-Aug-2021 00:11:00" -{DSK}kaplan>Local>medley3.5>git-medley>sources>AOFD.;4) + :EDIT-BY "lmm" + :CHANGES-TO (FNS CLOSEALL) + + :PREVIOUS-DATE " 9-Aug-2021 23:30:19" {DSK}larry>il>medley>sources>AOFD.;1) -(* ; " -Copyright (c) 1981-1987, 1990, 2021 by Venue & Xerox Corporation. -") (PRETTYCOMPRINT AOFDCOMS) (RPAQQ AOFDCOMS [ -(* ;;; "streams (= OpenFileDescriptors)") +(* ;;; "streams (= OpenFileDescriptors)") (COMS (FNS \ADD-OPEN-STREAM \GENERIC-UNREGISTER-STREAM) (INITVARS (*ISSUE-CLOSE-WARNINGS* NIL)) @@ -28,7 +25,7 @@ Copyright (c) 1981-1987, 1990, 2021 by Venue & Xerox Corporation. (\OPENFILES)) (GLOBALVARS DEFAULTEOFCLOSE \OPENFILES)) (COMS - (* ;; "STREAM interface to Read and Write to random memory") + (* ;; "STREAM interface to Read and Write to random memory") (DECLARE%: DONTCOPY (EXPORT (RECORDS BASEBYTESTREAM))) (FNS \BASEBYTES.IO.INIT \MAKEBASEBYTESTREAM \MBS.OUTCHARFN \BASEBYTES.NAME.FROM.STREAM @@ -39,11 +36,11 @@ Copyright (c) 1981-1987, 1990, 2021 by Venue & Xerox Corporation. (FNS OPENSTRINGSTREAM MAKE-STRING-FORMAT) (P (MAKE-STRING-FORMAT))) (COMS - (* ;; "STREAM interface for old-style strings. However (RMK), it appears never to be used, and even commonlisp string-streams are created using the Interlisp OPENSTRINGSTREAM above. For now, keep the function, but don't execute it") + (* ;; "STREAM interface for old-style strings. However (RMK), it appears never to be used, and even commonlisp string-streams are created using the Interlisp OPENSTRINGSTREAM above. For now, keep the function, but don't execute it") (FNS \STRINGSTREAM.INIT) - (* ;; "(DECLARE%%: DONTEVAL@LOAD DOCOPY (P (\STRINGSTREAM.INIT)))") + (* ;; "(DECLARE%%: DONTEVAL@LOAD DOCOPY (P (\STRINGSTREAM.INIT)))") ) (COMS (FNS GETSTREAM \ADDOFD \CLEAROFD \DELETEOFD \GETSTREAM \SEARCHOPENFILES) (DECLARE%: DONTCOPY (EXPORT (MACROS \INSTREAMARG \OUTSTREAMARG \STREAMARG))) @@ -87,15 +84,17 @@ Copyright (c) 1981-1987, 1990, 2021 by Venue & Xerox Corporation. (CLOSEALL [LAMBDA (ALLFLG) - (DECLARE (LOCALVARS . T)) (* hdj "11-Jul-86 10:33") - (if MULTIPLE.STREAMS.PER.FILE.ALLOWED - then (ERROR "CLOSEALL no longer supported") - else (for STREAM in (PROG1 (APPEND \OPENFILES) (* ; - "Need to APPEND because CLOSEF will remove things from \OPENFILES") - ) when [AND (fetch USERVISIBLE of STREAM) - (\IOMODEP STREAM NIL T) - (OR ALLFLG (NOT (STREAMPROP STREAM 'CLOSEALL] - collect (CLOSEF STREAM]) + (DECLARE (LOCALVARS . T)) (* ; "Edited 19-Apr-2023 08:05 by lmm") + (* hdj "11-Jul-86 10:33") + + (* ;; "(if MULTIPLE.STREAMS.PER.FILE.ALLOWED then (ERROR 'CLOSEALL no longer supported'))") + + (* ;; "Need to APPEND because CLOSEF will remove things from \OPENFILES") + + (for STREAM in (APPEND \OPENFILES) when [AND (fetch USERVISIBLE of STREAM) + (\IOMODEP STREAM NIL T) + (OR ALLFLG (NOT (STREAMPROP STREAM 'CLOSEALL] + collect (CLOSEF STREAM]) (CLOSEF [LAMBDA (FILE) (* ; "Edited 13-Jun-2021 11:26 by rmk:") @@ -257,15 +256,12 @@ Copyright (c) 1981-1987, 1990, 2021 by Venue & Xerox Corporation. (* "FOLLOWING DEFINITIONS EXPORTED")(DECLARE%: EVAL@COMPILE (RECORD BASEBYTESTREAM STREAM (SUBRECORD STREAM) - [ACCESSFNS ((BIASOFFST (fetch (STREAM FW6) of DATUM) - (replace (STREAM FW6) of DATUM - with NEWVALUE)) - (BBSNCHARS (fetch (STREAM FW7) of DATUM) - (replace (STREAM FW7) of DATUM - with NEWVALUE)) - (WRITEXTENSIONFN (fetch (STREAM F1) of DATUM) - (replace (STREAM F1) of DATUM - with NEWVALUE]) + [ACCESSFNS ((BIASOFFST (fetch (STREAM FW6) of DATUM) + (replace (STREAM FW6) of DATUM with NEWVALUE)) + (BBSNCHARS (fetch (STREAM FW7) of DATUM) + (replace (STREAM FW7) of DATUM with NEWVALUE)) + (WRITEXTENSIONFN (fetch (STREAM F1) of DATUM) + (replace (STREAM F1) of DATUM with NEWVALUE]) ) (* "END EXPORTED DEFINITIONS") @@ -770,15 +766,15 @@ Copyright (c) 1981-1987, 1990, 2021 by Venue & Xerox Corporation. (* "FOLLOWING DEFINITIONS EXPORTED")(DECLARE%: EVAL@COMPILE (PUTPROPS \INSTREAMARG MACRO ((STRM NOERRORFLG) - (\GETSTREAM STRM 'INPUT NOERRORFLG))) + (\GETSTREAM STRM 'INPUT NOERRORFLG))) (PUTPROPS \OUTSTREAMARG MACRO ((STRM NOERRORFLG) - (\GETSTREAM STRM 'OUTPUT NOERRORFLG))) + (\GETSTREAM STRM 'OUTPUT NOERRORFLG))) (PUTPROPS \STREAMARG MACRO [OPENLAMBDA (STRM NOERRORFLG) - (COND - (NOERRORFLG (\GETSTREAM STRM NIL T)) - (T (\DTEST STRM 'STREAM]) + (COND + (NOERRORFLG (\GETSTREAM STRM NIL T)) + (T (\DTEST STRM 'STREAM]) ) (* "END EXPORTED DEFINITIONS") @@ -802,18 +798,17 @@ Copyright (c) 1981-1987, 1990, 2021 by Venue & Xerox Corporation. (ADDTOVAR LAMA WHENCLOSE) ) -(PUTPROPS AOFD COPYRIGHT ("Venue & Xerox Corporation" 1981 1982 1983 1984 1985 1986 1987 1990 2021)) (DECLARE%: DONTCOPY - (FILEMAP (NIL (2615 3722 (\ADD-OPEN-STREAM 2625 . 2902) (\GENERIC-UNREGISTER-STREAM 2904 . 3720)) ( -3763 11020 (CLOSEALL 3773 . 4478) (CLOSEF 4480 . 5676) (EOFCLOSEF 5678 . 5974) (INPUT 5976 . 6748) ( -OPENP 6750 . 7149) (OUTPUT 7151 . 7925) (POSITION 7927 . 8739) (RANDACCESSP 8741 . 9216) (\IOMODEP -9218 . 9855) (WHENCLOSE 9857 . 11018)) (11021 11143 (STREAMADDPROP 11031 . 11141)) (12307 25188 ( -\BASEBYTES.IO.INIT 12317 . 15513) (\MAKEBASEBYTESTREAM 15515 . 18827) (\MBS.OUTCHARFN 18829 . 19217) ( -\BASEBYTES.NAME.FROM.STREAM 19219 . 19682) (\BASEBYTES.BOUT 19684 . 20401) (\BASEBYTES.SETFILEPTR -20403 . 21024) (\BASEBYTES.READP 21026 . 21662) (\BASEBYTES.BIN 21664 . 22195) (\BASEBYTES.PEEKBIN -22197 . 23028) (\BASEBYTES.TRUNCATEFN 23030 . 23534) (\BASEBYTES.OPENFN 23536 . 24026) ( -\BASEBYTES.BLOCKIO 24028 . 25186)) (25311 28620 (OPENSTRINGSTREAM 25321 . 27038) (MAKE-STRING-FORMAT -27040 . 28618)) (28892 33553 (\STRINGSTREAM.INIT 28902 . 33551)) (33630 37202 (GETSTREAM 33640 . 33863 -) (\ADDOFD 33865 . 34152) (\CLEAROFD 34154 . 34435) (\DELETEOFD 34437 . 34588) (\GETSTREAM 34590 . -36754) (\SEARCHOPENFILES 36756 . 37200))))) + (FILEMAP (NIL (2459 3566 (\ADD-OPEN-STREAM 2469 . 2746) (\GENERIC-UNREGISTER-STREAM 2748 . 3564)) ( +3607 10891 (CLOSEALL 3617 . 4349) (CLOSEF 4351 . 5547) (EOFCLOSEF 5549 . 5845) (INPUT 5847 . 6619) ( +OPENP 6621 . 7020) (OUTPUT 7022 . 7796) (POSITION 7798 . 8610) (RANDACCESSP 8612 . 9087) (\IOMODEP +9089 . 9726) (WHENCLOSE 9728 . 10889)) (10892 11014 (STREAMADDPROP 10902 . 11012)) (11989 24870 ( +\BASEBYTES.IO.INIT 11999 . 15195) (\MAKEBASEBYTESTREAM 15197 . 18509) (\MBS.OUTCHARFN 18511 . 18899) ( +\BASEBYTES.NAME.FROM.STREAM 18901 . 19364) (\BASEBYTES.BOUT 19366 . 20083) (\BASEBYTES.SETFILEPTR +20085 . 20706) (\BASEBYTES.READP 20708 . 21344) (\BASEBYTES.BIN 21346 . 21877) (\BASEBYTES.PEEKBIN +21879 . 22710) (\BASEBYTES.TRUNCATEFN 22712 . 23216) (\BASEBYTES.OPENFN 23218 . 23708) ( +\BASEBYTES.BLOCKIO 23710 . 24868)) (24993 28302 (OPENSTRINGSTREAM 25003 . 26720) (MAKE-STRING-FORMAT +26722 . 28300)) (28574 33235 (\STRINGSTREAM.INIT 28584 . 33233)) (33312 36884 (GETSTREAM 33322 . 33545 +) (\ADDOFD 33547 . 33834) (\CLEAROFD 33836 . 34117) (\DELETEOFD 34119 . 34270) (\GETSTREAM 34272 . +36436) (\SEARCHOPENFILES 36438 . 36882))))) STOP diff --git a/sources/AOFD.LCOM b/sources/AOFD.LCOM index c03312e4e59f6cd064b0f96fb14e0df489911bb3..e993afbc70083bd98565ca0b5d770922ca33f106 100644 GIT binary patch delta 632 zcma)4y=&V*6qi$XsMwY5|=*W;|&Wpf=^D^{`?|J6Jf=JEL&KU*h<7G77J^d&ax<>#aXDl+ODm<@_CH5v#$WI}>2*Qmp2a5NUvCls3851Gw5OeE1;5z83?vlQHU z9E%L53rR48O~`V&j6fX?W>VchTvdu|sPuo6%MF*ecLipBr$T@-$Lr~@4gkeTA~n!v z%kJ#5Q1AJmxt;LFObKYvWp6zHb*MWsXc?i*c|O)j0}}&?NzHXA>a8^xt6=M_u_vL@STA^%})YWd0o5haD)hjnwu1o*` delta 614 zcmb7?PfO!K7>85Xi$P&8;=#+y;4TT6kUvdL!cvH7s=={Yk|-7m65FAMO*0`)#Zs32 z3M>5-d)AL9%g$8L#nbNPISj-5`#m%7FZxV>o{pq`hyy#t6p;U{maFi)bsAQtSYjyi|IHkx-&8<$kJ4;?lfck5*!cHAW_3e4F_Qgqa=;P!3ksFoxdFA ztV;g^WB9wYs;USkS;MM|+~)dCXA^AbNEY8YJBqiMzBn7EYib+ke^)%PKs0Sr(_ws@ zl~Xc@hB681(u))DqJGbh&Xcuk?MGEj?sB@AZwj(22<*3LjpgdDrv2CRw%U)sTTiXS zZ9x!PltI|y_$WvY1aTb2^3EW{I})@3`8Y}f5976>?L7`ZU~|1X60dnd@T0H8I6OH` z*;ikZazWrTT#=gIgHP*<)>)I&5`pg6Y%Lty;4nGb92Q51z>%