Remove calls to openfile (#1333)
* Remove calls to OPENFILE OPENFILE is a residual Interlisp function that returns a litatom instead of a stream. In almost all cases, this immediate causes an error that litatom files are no longer supported. I have found (FINDCALLERS) all the examples in lispusers/sources/library/ and replaced OPENFILE with OPENSTREAM (except for the calls from \PEEKPUP and \PEEKNS, that I didn't track down). There was a trivai call in COMPILE.FILECHECK in COMPILE, but that function is not called anywhere. So I removed it. * ADIR: remove OPENFILE calls, also another stab at \COPYSYS With respect to \COPYSYS, this replaces the draft PR #1263. This applies TRUEFILENAME at the start, but remembers whether it was in fact a pseudohost and restores that for the return value. So if you start in a pseudo world you end up there. --------- Co-authored-by: Larry Masinter <lmm@acm.org>
This commit is contained in:
rmkaplan
GitHub
@@ -1,11 +1,12 @@
|
||||
(DEFINE-FILE-INFO READTABLE "INTERLISP" PACKAGE "INTERLISP")
|
||||
(FILECREATED "22-Jun-2021 10:52:34"
|
||||
{DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>READINTERPRESS.;4 10412
|
||||
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
|
||||
|
||||
changes to%: (FNS PRINTSEQUENCE)
|
||||
(FILECREATED "24-Sep-2023 13:52:48" {WMEDLEY}<lispusers>READINTERPRESS.;6 11350
|
||||
|
||||
previous date%: "22-Jun-2021 10:35:30"
|
||||
{DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>READINTERPRESS.;3)
|
||||
:EDIT-BY rmk
|
||||
|
||||
:CHANGES-TO (FNS SHOWFILE)
|
||||
|
||||
:PREVIOUS-DATE "22-Jun-2021 10:52:34" {WMEDLEY}<lispusers>READINTERPRESS.;4)
|
||||
|
||||
|
||||
(* ; "
|
||||
@@ -122,8 +123,53 @@ Copyright (c) 1983-1986, 1988, 2021 by Xerox Corporation.
|
||||
)
|
||||
|
||||
(SHOWFILE
|
||||
(LAMBDA (IPFILE OUTPUTFILE MAXZEROLINES) (* rmk%: "16-Jun-84 15:29") (OR MAXZEROLINES (SETQ MAXZEROLINES 5)) (RESETLST (PROG (STREAM) (RESETSAVE (SETQ STREAM (OPENFILE IPFILE (QUOTE INPUT))) (QUOTE (PROGN (CLOSEF? OLDVALUE)))) (SETQ STREAM (GETSTREAM STREAM)) (* Don't do an OPENSTREAM until (OPENP stream) is NIL if stream is closed.) (RESETSAVE (OUTPUT)) (RESETSAVE (SETQ OUTPUTFILE (OPENFILE OUTPUTFILE (QUOTE OUTPUT))) (QUOTE (PROGN (CLOSEF? OLDVALUE) (AND RESETSTATE (DELFILE OLDVALUE))))) (OUTPUT OUTPUTFILE) (printout NIL .FONT DEFAULTFONT (OPENP STREAM (QUOTE INPUT)) T T) (for I B1 B2 B3 B4 B5 B6 B7 B8 (NZEROLINES _ 0) from 1 by 8 until (\EOFP STREAM) do (printout NIL |.I5| I %,,) (SETQ B1 (SHOWBYTE STREAM)) (SETQ B2 (SHOWBYTE STREAM)) (SETQ B3 (SHOWBYTE STREAM)) (SETQ B4 (SHOWBYTE STREAM)) (printout NIL %,,) (SETQ B5 (SHOWBYTE STREAM)) (SETQ B6 (SHOWBYTE STREAM)) (SETQ B7 (SHOWBYTE STREAM)) (SETQ B8 (SHOWBYTE STREAM)) (TAB 23) (COND (B1 (printout NIL |.I4| B1))) (COND (B2 (printout NIL |.I4| B2))) (COND (B3 (printout NIL |.I4| B3))) (COND (B4 (printout NIL |.I4| B4))) (printout NIL %,,) (COND (B5 (printout NIL |.I4| B5))) (COND (B6 (printout NIL |.I4| B6))) (COND (B7 (printout NIL |.I4| B7))) (COND (B8 (printout NIL |.I4| B8 T)))) (RETURN (LIST (CLOSEF IPFILE) (CLOSEF OUTPUTFILE))))))
|
||||
)
|
||||
[LAMBDA (IPFILE OUTPUTFILE MAXZEROLINES) (* ; "Edited 24-Sep-2023 13:52 by rmk")
|
||||
(* rmk%: "16-Jun-84 15:29")
|
||||
(OR MAXZEROLINES (SETQ MAXZEROLINES 5))
|
||||
(RESETLST
|
||||
[PROG (STREAM)
|
||||
[RESETSAVE (SETQ STREAM (OPENSTREAM IPFILE 'INPUT))
|
||||
'(PROGN (CLOSEF? OLDVALUE] (* Don't do an OPENSTREAM until
|
||||
(OPENP stream) is NIL if stream is
|
||||
closed.)
|
||||
(RESETSAVE (OUTPUT))
|
||||
[RESETSAVE (SETQ OUTPUTFILE (OPENSTREAM OUTPUTFILE 'OUTPUT))
|
||||
'(PROGN (CLOSEF? OLDVALUE)
|
||||
(AND RESETSTATE (DELFILE OLDVALUE]
|
||||
(OUTPUT OUTPUTFILE)
|
||||
(printout NIL .FONT DEFAULTFONT (OPENP STREAM 'INPUT)
|
||||
T T)
|
||||
[for I B1 B2 B3 B4 B5 B6 B7 B8 (NZEROLINES _ 0) from 1 by 8 until (\EOFP STREAM)
|
||||
do (printout NIL .I5 I %,,)
|
||||
(SETQ B1 (SHOWBYTE STREAM))
|
||||
(SETQ B2 (SHOWBYTE STREAM))
|
||||
(SETQ B3 (SHOWBYTE STREAM))
|
||||
(SETQ B4 (SHOWBYTE STREAM))
|
||||
(printout NIL %,,)
|
||||
(SETQ B5 (SHOWBYTE STREAM))
|
||||
(SETQ B6 (SHOWBYTE STREAM))
|
||||
(SETQ B7 (SHOWBYTE STREAM))
|
||||
(SETQ B8 (SHOWBYTE STREAM))
|
||||
(TAB 23)
|
||||
(COND
|
||||
(B1 (printout NIL .I4 B1)))
|
||||
(COND
|
||||
(B2 (printout NIL .I4 B2)))
|
||||
(COND
|
||||
(B3 (printout NIL .I4 B3)))
|
||||
(COND
|
||||
(B4 (printout NIL .I4 B4)))
|
||||
(printout NIL %,,)
|
||||
(COND
|
||||
(B5 (printout NIL .I4 B5)))
|
||||
(COND
|
||||
(B6 (printout NIL .I4 B6)))
|
||||
(COND
|
||||
(B7 (printout NIL .I4 B7)))
|
||||
(COND
|
||||
(B8 (printout NIL .I4 B8 T]
|
||||
(RETURN (LIST (CLOSEF IPFILE)
|
||||
(CLOSEF OUTPUTFILE])])
|
||||
|
||||
(SHOWBYTE
|
||||
(LAMBDA (STREAM) (* rmk%: "13-JUL-82 18:01") (PROG ((BYTE (COND ((NOT (\EOFP STREAM)) (\BIN STREAM))))) (COND (BYTE (PRIN1 (COND ((AND (IGEQ BYTE (CHARCODE SPACE)) (ILESSP BYTE (CHARCODE DEL)) (NEQ BYTE 96)) (CHARACTER BYTE)) (T (QUOTE %.)))))) (RETURN BYTE)))
|
||||
@@ -132,14 +178,14 @@ Copyright (c) 1983-1986, 1988, 2021 by Xerox Corporation.
|
||||
(DECLARE%: EVAL@COMPILE
|
||||
|
||||
(PUTPROPS BIN.RIP MACRO [ARGS (LET ((ISTREAM (CAR ARGS))
|
||||
(OSTREAM (CADR ARGS)))
|
||||
`(LET [(C (BIN ,ISTREAM]
|
||||
(COND
|
||||
((IGREATERP (POSITION ,OSTREAM)
|
||||
15)
|
||||
(printout ,OSTREAM 5 "|" 8)))
|
||||
(printout ,OSTREAM .I3 C " ")
|
||||
C])
|
||||
(OSTREAM (CADR ARGS)))
|
||||
`(LET [(C (BIN ,ISTREAM]
|
||||
(COND
|
||||
((IGREATERP (POSITION ,OSTREAM)
|
||||
15)
|
||||
(printout ,OSTREAM 5 "|" 8)))
|
||||
(printout ,OSTREAM .I3 C " ")
|
||||
C])
|
||||
)
|
||||
(DECLARE%: EVAL@COMPILE DONTCOPY
|
||||
|
||||
@@ -156,8 +202,9 @@ Copyright (c) 1983-1986, 1988, 2021 by Xerox Corporation.
|
||||
)
|
||||
(PUTPROPS READINTERPRESS COPYRIGHT ("Xerox Corporation" 1983 1984 1985 1986 1988 2021))
|
||||
(DECLARE%: DONTCOPY
|
||||
(FILEMAP (NIL (1210 1896 (PRINTMASTER 1220 . 1894)) (1897 9430 (OPCODE 1907 . 2032) (TOKEN 2034 . 2606
|
||||
) (FINDNONPRIMNAME 2608 . 2713) (FINDOPNAME 2715 . 2972) (SHORTINT 2974 . 3167) (TOKENFORMAT 3169 .
|
||||
3411) (FINDSEQUENCETYPE 3413 . 3617) (PRINTTOKEN 3619 . 4570) (PRINTSEQUENCE 4572 . 7449) (
|
||||
SEARCHIPLIST 7451 . 7583) (READINT.IP 7585 . 7824) (SHOWFILE 7826 . 9150) (SHOWBYTE 9152 . 9428)))))
|
||||
(FILEMAP (NIL (1158 1844 (PRINTMASTER 1168 . 1842)) (1845 10432 (OPCODE 1855 . 1980) (TOKEN 1982 .
|
||||
2554) (FINDNONPRIMNAME 2556 . 2661) (FINDOPNAME 2663 . 2920) (SHORTINT 2922 . 3115) (TOKENFORMAT 3117
|
||||
. 3359) (FINDSEQUENCETYPE 3361 . 3565) (PRINTTOKEN 3567 . 4518) (PRINTSEQUENCE 4520 . 7397) (
|
||||
SEARCHIPLIST 7399 . 7531) (READINT.IP 7533 . 7772) (SHOWFILE 7774 . 10152) (SHOWBYTE 10154 . 10430))))
|
||||
)
|
||||
STOP
|
||||
|
||||
Reference in New Issue
Block a user