github.com/Interlisp.medley
1
0
Fork 0
mirror of synced 2026-01-12 00:42:56 +00:00
Code Issues Projects Releases Wiki Activity

PRINTFN DEXEC CMLEXEC: Cleanup PFCOPYBYTES interface

Browse Source 
Removed unused FLG argument in PFCOPYBYTES, tried to make sense of PFDEFAULT (in preparation for TEDIT-PF. CMLEXEC just to upgrade the filemap
This commit is contained in:
rmkaplan 2021-10-12 16:10:12 -07:00
parent e222743f74
commit 1beba945a2
6 changed files with 87 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
sources/CMLEXEC
View File

@ -1,13 +1,14 @@
(DEFINE-FILE-INFO READTABLE "INTERLISP" PACKAGE "INTERLISP")
(FILECREATED "21-Jan-93 11:16:01" {DSK}<python>lde>lispcore>sources>CMLEXEC.;2 92477
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
changes to%: (FUNCTIONS ADD-EXEC)
(FILECREATED " 8-Oct-2021 10:51:35" 
{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>CMLEXEC.;2 92464
previous date%: "25-Jun-91 12:22:29" {DSK}<python>lde>lispcore>sources>CMLEXEC.;1)
previous date%: "21-Jan-93 11:16:01"
{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>CMLEXEC.;1)
(* ; "
Copyright (c) 1985, 1986, 1987, 1988, 1990, 1991, 1993 by Venue & Xerox Corporation. All rights reserved.
Copyright (c) 1985-1988, 1990-1991, 1993, 2021 by Venue & Xerox Corporation.
")
(PRETTYCOMPRINT CMLEXECCOMS)
@ -1748,13 +1749,24 @@ Copyright (c) 1985, 1986, 1987, 1988, 1990, 1991, 1993 by Venue & Xerox Corporat
(ADDTOVAR LAMA )
)
(PUTPROPS CMLEXEC COPYRIGHT ("Venue & Xerox Corporation" 1985 1986 1987 1988 1990 1991 1993))
(PUTPROPS CMLEXEC COPYRIGHT ("Venue & Xerox Corporation" 1985 1986 1987 1988 1990 1991 1993 2021))
(DECLARE%: DONTCOPY
(FILEMAP (NIL (33304 34258 (COPY-CIRCLE 33314 . 34256)) (34336 37641 (EXEC-READ 34346 . 37507) (DIR
37509 . 37639)) (39903 67037 (DO-APPLY-EVENT 39913 . 40475) (DO-HISTORY-SEARCH 40477 . 41934) (
EVAL-INPUT 41936 . 47365) (EVENTS-INPUT 47367 . 48745) (EXEC-PRIN1 48747 . 48923) (EXEC-VALUE-OF 48925
. 49264) (GET-NEXT-HISTORY-EVENT 49266 . 50761) (HISTORY-ADD-TO-SPELLING-LISTS 50763 . 51751) (
HISTORY-NTH 51753 . 52503) (PRINT-HISTORY 52505 . 53126) (FIND-HISTORY-EVENTS 53128 . 58189) (
PRINT-EVENT 58191 . 62412) (PRINT-EVENT-PROMPT 62414 . 63618) (PROCESS-EXEC-ID 63620 . 64565) (
SEARCH-FOR-EVENT-NUMBER 64567 . 65195) (\PICK.EVALQT 65197 . 65708) (LISPXREPRINT 65710 . 67035)))))
(FILEMAP (NIL (3978 4383 (XCL::EXEC-CLOSEFN 3978 . 4383)) (4385 4721 (XCL::EXEC-SHRINKFN 4385 . 4721))
(4723 4963 (XCL::SETUP-EXEC-WINDOW 4723 . 4963)) (4965 5211 (XCL::EXEC-TITLE-FUNCTION 4965 . 5211)) (
5213 8519 (FIX-FORM 5213 . 8519)) (8521 8641 (XCL::GET-PROCESS-PROFILE 8521 . 8641)) (8643 8924 (
XCL::SAVE-CURRENT-EXEC-PROFILE 8643 . 8924)) (8926 9216 (XCL::SETF-GET-PROCESS-PROFILE 8926 . 9216)) (
9218 9785 (XCL:SET-EXEC-TYPE 9218 . 9785)) (9787 9869 (XCL:SET-DEFAULT-EXEC-TYPE 9787 . 9869)) (9871
10282 (XCL::ENTER-EXEC-FUNCTION 9871 . 10282)) (10357 16750 (DO-EVENT 10357 . 16750)) (16752 23543 (
EXEC 16752 . 23543)) (23545 24886 (EXEC-EVAL 23545 . 24886)) (24888 25619 (PRINT-ALL-DOCUMENTATION
24888 . 25619)) (25621 26063 (PRINT-DOCUMENTATION 25621 . 26063)) (26146 27230 (ADD-EXEC 26146 . 27230
)) (27232 30828 (EXEC-READ-LINE 27232 . 30828)) (30899 31385 (FIND-EXEC-COMMAND 30899 . 31385)) (31387
33285 (CIRCLAR-COPYER 31387 . 33285)) (33286 34240 (COPY-CIRCLE 33296 . 34238)) (34318 37623 (
EXEC-READ 34328 . 37489) (DIR 37491 . 37621)) (39885 67019 (DO-APPLY-EVENT 39895 . 40457) (
DO-HISTORY-SEARCH 40459 . 41916) (EVAL-INPUT 41918 . 47347) (EVENTS-INPUT 47349 . 48727) (EXEC-PRIN1
48729 . 48905) (EXEC-VALUE-OF 48907 . 49246) (GET-NEXT-HISTORY-EVENT 49248 . 50743) (
HISTORY-ADD-TO-SPELLING-LISTS 50745 . 51733) (HISTORY-NTH 51735 . 52485) (PRINT-HISTORY 52487 . 53108)
(FIND-HISTORY-EVENTS 53110 . 58171) (PRINT-EVENT 58173 . 62394) (PRINT-EVENT-PROMPT 62396 . 63600) (
PROCESS-EXEC-ID 63602 . 64547) (SEARCH-FOR-EVENT-NUMBER 64549 . 65177) (\PICK.EVALQT 65179 . 65690) (
LISPXREPRINT 65692 . 67017)) (68199 68298 (EXEC-PRINT 68199 . 68298)) (68300 68565 (EXEC-FORMAT 68300
. 68565)))))
STOP

BIN
sources/CMLEXEC.LCOM
View File

Binary file not shown.

49
sources/DEXEC
View File

@ -1,14 +1,15 @@
(DEFINE-FILE-INFO READTABLE "INTERLISP" PACKAGE "INTERLISP")
(FILECREATED "13-Aug-2020 12:36:18" {DSK}<Users>kaplan>Local>medley3.5>lispcore>sources>DEXEC.;10 5477
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
changes to%: (VARS DEXECCOMS)
(FILECREATED " 7-Oct-2021 14:29:56" {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>DEXEC.;4 5554
previous date%: "13-Aug-2020 12:31:18"
{DSK}<Users>kaplan>Local>medley3.5>lispcore>sources>DEXEC.;9)
changes to%: (FNS SEE* COPYALLBYTES)
previous date%: "13-Aug-2020 12:36:18"
{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>DEXEC.;1)
(* ; "
Copyright (c) 1982, 1983, 1984, 1985, 1986, 1990, 2018, 2020 by Venue & Xerox Corporation. All rights reserved.
Copyright (c) 1982-1986, 1990, 2018, 2020-2021 by Venue & Xerox Corporation.
The following program was created in 1982 but has not been published
within the meaning of the copyright law, is furnished under license,
and may not be used, copied and/or disclosed except in accordance
@ -20,7 +21,7 @@ with the terms of said license.
(RPAQQ DEXECCOMS
[
(* ;;; "Has to come after ADISPLAY and CMLEXEC.")
(* ;;; "Has to come after ADISPLAY and CMLEXEC.")
(COMMANDS "see" "see*" "ty" "type")
(INITVARS (/LAST.CONNECTED.DIRECTORY LOGINHOST/DIR))
@ -74,22 +75,24 @@ with the terms of said license.
(CNDIR HOST/DIR])
(COPYALLBYTES
[LAMBDA (FROMFILE TOFILE BYTESIZE EXTERNALFORMAT) (* ; "Edited 11-Aug-2020 20:35 by rmk:")
(* bvm%: "29-Jan-86 19:50")
[LAMBDA (FROMFILE TOFILE BYTESIZE FORMAT) (* ; "Edited 7-Oct-2021 13:15 by rmk:")
(* bvm%: "29-Jan-86 19:50")
(* ;; "RMK: Removed PFDEFAULT arg to PFCOPYBYTES. Probably should remove BYTESIZE test")
(RESETLST
[PROG (INF OUTF PTR)
[COND
(FROMFILE [RESETSAVE NIL (LIST 'CLOSEF (SETQ INF (OPENSTREAM
FROMFILE
'INPUT NIL
`((EXTERNALFORMAT ,EXTERNALFORMAT)
)
`((EXTERNALFORMAT ,FORMAT))
BYTESIZE]
(OR (EQ (GETFILEPTR INF)
0)
(SETFILEPTR INF 0)))
(T (SETQ INF (INPUT] (* close the files only if I opened
 them)
(T (SETQ INF (INPUT] (* close the files only if I opened
 them)
[COND
((NULL TOFILE)
(SETQ OUTF (OUTPUT)))
@ -98,7 +101,7 @@ with the terms of said license.
(COND
((AND (NULL BYTESIZE)
(DISPLAYP OUTF))
(PFCOPYBYTES INF OUTF NIL NIL PFDEFAULT))
(PFCOPYBYTES INF OUTF))
(T (COPYBYTES INF OUTF])])
(SEE
@ -110,11 +113,14 @@ with the terms of said license.
(CADDR LINE))))
(SEE*
[NLAMBDA LINE (* ; "Edited 1-May-2018 10:22 by rmk:")
[NLAMBDA LINE (* ; "Edited 7-Oct-2021 14:29 by rmk:")
(* ;; "RMK: RESETVARS because **COMMENT**FLG is global")
(SETQ LINE (NLAMBDA.ARGS LINE))
(LET ((**COMMENT**FLG NIL))
(APPLY (FUNCTION SEE)
LINE])
(RESETVARS (**COMMENT**FLG)
(APPLY (FUNCTION SEE)
LINE])
)
(RPAQ SAVINGCURSOR (CURSORCREATE (QUOTE #*(16 16)@@@@FDJ@HJJ@LJJ@BNJLJJD@LJD@@@@@@JDN@KEB@KE@@JMF@JMB@JEL@@@@@@@@
) (QUOTE NIL) 0 15))
@ -136,8 +142,9 @@ with the terms of said license.
(ADDTOVAR LAMA )
)
(PUTPROPS DEXEC COPYRIGHT ("Venue & Xerox Corporation" T 1982 1983 1984 1985 1986 1990 2018 2020))
(PUTPROPS DEXEC COPYRIGHT ("Venue & Xerox Corporation" T 1982 1983 1984 1985 1986 1990 2018 2020 2021)
)
(DECLARE%: DONTCOPY
(FILEMAP (NIL (2246 4697 (/CNDIR 2256 . 2693) (COPYALLBYTES 2695 . 4211) (SEE 4213 . 4457) (SEE* 4459
. 4695)))))
(FILEMAP (NIL (2230 4768 (/CNDIR 2240 . 2677) (COPYALLBYTES 2679 . 4203) (SEE 4205 . 4449) (SEE* 4451
. 4766)))))
STOP

BIN
sources/DEXEC.LCOM
View File

Binary file not shown.

74
sources/PRINTFN
View File

@ -1,12 +1,12 @@
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
(FILECREATED "28-Sep-2021 23:52:49" 
{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>PRINTFN.;24 13993
(FILECREATED " 8-Oct-2021 00:20:48" 
{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>PRINTFN.;27 13457
changes to%: (FNS PRINTFNDEF PFCOPYBYTES)
changes to%: (FNS PFCOPYBYTES)
previous date%: " 8-Aug-2021 15:15:00"
{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>PRINTFN.;17)
previous date%: " 7-Oct-2021 20:52:16"
{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>PRINTFN.;26)
(* ; "
@ -18,7 +18,8 @@ Copyright (c) 1986-1987, 1990, 1999, 2018, 2021 by Venue & Xerox Corporation.
(RPAQQ PRINTFNCOMS
[(* * PRINTFN)
(FNS PF PF* PMORE PRINTFN PRINTFNDEF FINDFNDEF PFCOPYBYTES DISPLAYP)
(INITVARS PFDEFAULT (LASTFNDEF))
(INITVARS (PFDEFAULT 'PFCOPYBYTES)
(LASTFNDEF))
(DECLARE%: DONTCOPY (MACROS PFPRINCHAR PFOUTCHAR))
(P (MOVD? 'COPYBYTES 'PFCOPYBYTES))
(USERMACROS PF)
@ -112,36 +113,29 @@ Copyright (c) 1986-1987, 1990, 1999, 2018, 2021 by Venue & Xerox Corporation.
(T (printout TOFILE FN " not found on " LOC "." T])
(PRINTFNDEF
[LAMBDA (SRCFIL DSTFIL START END TYPE) (* ; "Edited 28-Sep-2021 23:52 by rmk:")
[LAMBDA (SRCFIL DSTFIL START END TYPE) (* ; "Edited 7-Oct-2021 20:51 by rmk:")
(* ;; "RMK: It wasn't clear what PFDEFAULT was doing, or why. I've assigned it a meaning here: the name of the function to call to print a function on a display stream. Initialized to PFCOPYBYTES")
(RESETLST
(PROG (TEM)
[COND
((SETQ TEM (GETSTREAM DSTFIL 'OUTPUT T))
(SETQ DSTFIL TEM))
(T (RESETSAVE (SETQ DSTFIL (OPENSTREAM DSTFIL 'OUTPUT))
'(PROGN (CLOSEF? OLDVALUE]
[COND
((SETQ TEM (GETSTREAM SRCFIL 'INPUT T))
(RESETSAVE NIL (LIST 'SETFILEPTR TEM (GETFILEPTR TEM)))
(SETQ SRCFIL TEM))
(T (RESETSAVE (SETQ SRCFIL (OPENSTREAM SRCFIL 'INPUT))
'(PROGN (CLOSEF? OLDVALUE]
(PRIN1 "{from " DSTFIL)
(PRIN2 (FULLNAME SRCFIL)
DSTFIL T)
(PRIN1 "}
" DSTFIL))
(* ;; "RMK: Originally the last test was (EQ TYPE 'MAC). I think this was a typo for MAP, since that argument is set to MAP in FINDFNDEF. If the typo is fixed, we would end up in the COPYBYTES clause, which we don't generally want. So changed it also to a NEQ.")
(* ;; "PFDEFAULT is passed as the TYPE argument on the call from COPYALLBYTES, basically to force COPYBYTES and not do the format and font translations. It defaults to NIL, not COPYBYTES. I don't understand what this is trying to control. Note that the last argument of PFCOPYBYTES (PFDEFAULT here) is ignored.")
(COND
((OR (NOT (DISPLAYP DSTFIL))
(EQ PFDEFAULT 'COPYBYTES)
(NEQ TYPE 'MAP))
(COPYBYTES SRCFIL DSTFIL START END))
(T (PFCOPYBYTES SRCFIL DSTFIL START END PFDEFAULT)))
(LET (TEM)
[COND
((SETQ TEM (GETSTREAM DSTFIL 'OUTPUT T))
(SETQ DSTFIL TEM))
(T (RESETSAVE (SETQ DSTFIL (OPENSTREAM DSTFIL 'OUTPUT))
'(PROGN (CLOSEF? OLDVALUE]
[COND
((SETQ TEM (GETSTREAM SRCFIL 'INPUT T))
(RESETSAVE NIL (LIST 'SETFILEPTR TEM (GETFILEPTR TEM)))
(SETQ SRCFIL TEM))
(T (RESETSAVE (SETQ SRCFIL (OPENSTREAM SRCFIL 'INPUT))
'(PROGN (CLOSEF? OLDVALUE]
(PRINTOUT DSTFIL "{from " .P2 (FULLNAME SRCFIL)
"}" T))
(APPLY* (CL:IF (DISPLAYP DSTFIL)
PFDEFAULT
(FUNCTION COPYBYTES))
SRCFIL DSTFIL START END)
(TERPRI DSTFIL))])
(FINDFNDEF
@ -168,11 +162,11 @@ Copyright (c) 1986-1987, 1990, 1999, 2018, 2021 by Venue & Xerox Corporation.
(T FULL])
(PFCOPYBYTES
[LAMBDA (SRCFIL DSTFIL START END FLG) (* ; "Edited 28-Sep-2021 23:35 by rmk:")
[LAMBDA (SRCFIL DSTFIL START END) (* ; "Edited 8-Oct-2021 00:17 by rmk:")
(* ; "Edited 24-Mar-93 14:16 by rmk:")
(* lmm "28-Sep-86 14:38")
(* ;; "RMK: What does FLG do? It isn't referenced. It seems to be passed as the value of PFDEFAULT from PRINTFNDEF, and that variable is initialized to NIL. Remove both, eventually?")
(* ;; "RMK: What does FLG do? It isn't referenced. It seems to be passed as the value of PFDEFAULT from PRINTFNDEF, and that variable is initialized to NIL. I'm removing it.")
(* ;; " copy from SRCFIL to DSTFIL, paying attention to font changes. Other stuff about truncating lines gone away. Interprets all possible EOL conventions as EOL. Has to call \INCHAR-\INCCODE macros in order to keep track of character count--READDCODE doesn't do that.")
@ -241,7 +235,7 @@ Copyright (c) 1986-1987, 1990, 1999, 2018, 2021 by Venue & Xerox Corporation.
(IMAGESTREAMTYPEP STRM 'TEXT])
)
(RPAQ? PFDEFAULT NIL)
(RPAQ? PFDEFAULT 'PFCOPYBYTES)
(RPAQ? LASTFNDEF )
(DECLARE%: DONTCOPY
@ -295,7 +289,7 @@ Copyright (c) 1986-1987, 1990, 1999, 2018, 2021 by Venue & Xerox Corporation.
)
(PUTPROPS PRINTFN COPYRIGHT ("Venue & Xerox Corporation" 1986 1987 1990 1999 2018 2021))
(DECLARE%: DONTCOPY
(FILEMAP (NIL (1134 11871 (PF 1144 . 3839) (PF* 3841 . 4135) (PMORE 4137 . 4456) (PRINTFN 4458 . 5049)
(PRINTFNDEF 5051 . 6790) (FINDFNDEF 6792 . 7816) (PFCOPYBYTES 7818 . 11621) (DISPLAYP 11623 . 11869))
(FILEMAP (NIL (1153 11326 (PF 1163 . 3858) (PF* 3860 . 4154) (PMORE 4156 . 4475) (PRINTFN 4477 . 5068)
(PRINTFNDEF 5070 . 6253) (FINDFNDEF 6255 . 7279) (PFCOPYBYTES 7281 . 11076) (DISPLAYP 11078 . 11324))
)))
STOP

BIN
sources/PRINTFN.LCOM
View File

Binary file not shown.