1
0
mirror of synced 2026-02-27 09:28:48 +00:00

PRINTFN: rename variabl

to clarify that it counts byte, not characters
This commit is contained in:
rmkaplan
2022-06-22 16:24:16 -07:00
parent 16d5779db4
commit b320333ac1
2 changed files with 37 additions and 29 deletions

View File

@@ -1,11 +1,12 @@
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
(FILECREATED "15-Mar-2022 00:20:04" {DSK}<Users>kaplan>Local>medley3.5>my-medley>sources>PRINTFN.;33 13501
(FILECREATED "19-Jun-2022 00:02:19" 
{DSK}<Users>kaplan>Local>medley3.5>working-medley>sources>PRINTFN.;34 13484
:CHANGES-TO (FNS FINDFNDEF)
:CHANGES-TO (FNS PFCOPYBYTES)
:PREVIOUS-DATE "12-Mar-2022 12:52:42"
{DSK}<Users>kaplan>Local>medley3.5>my-medley>sources>PRINTFN.;32)
:PREVIOUS-DATE "15-Mar-2022 00:20:04"
{DSK}<Users>kaplan>Local>medley3.5>working-medley>sources>PRINTFN.;33)
(* ; "
@@ -153,12 +154,19 @@ Copyright (c) 1986-1987, 1990, 1999, 2018, 2021 by Venue & Xerox Corporation.
(T FULL])
(PFCOPYBYTES
[LAMBDA (SRCFIL DSTFIL START END NOTERPRI) (* ; "Edited 2-Dec-2021 13:27 by rmk:")
(* ; "Edited 8-Oct-2021 00:17 by rmk:")
(* ; "Edited 24-Mar-93 14:16 by rmk:")
[LAMBDA (SRCFIL DSTFIL START END NOTERPRI)
(* ;;
 "Edited 19-Jun-2022 00:01 by rmk: Changed #CHARS to NBYTES, to be clear about what we are counting")
(* ;; "Edited 2-Dec-2021 13:27 by rmk:")
(* ;; "Edited 8-Oct-2021 00:17 by rmk:")
(* ;; "Edited 24-Mar-93 14:16 by rmk:")
(* ;; "RMK: Added NOTERPRI to at least give caller control over whether a TERPRI is done just in the case of copying the whole file. ")
 (* lmm "28-Sep-86 14:38")
(* 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. I'm removing it.")
@@ -170,9 +178,9 @@ Copyright (c) 1986-1987, 1990, 1999, 2018, 2021 by Venue & Xerox Corporation.
(RESETLST
(PROG ((SSTRM (\INSTREAMARG SRCFIL))
(DSTRM (\OUTSTREAMARG DSTFIL))
FONTARRAY CHARCODE %#CHARS MAXFONT)
FONTARRAY CHARCODE NBYTES MAXFONT)
(DECLARE (SPECVARS . T)) (* ;
 "In particular, #CHARS must be a specvar for \INCCODE")
 "In particular, NBYTES must be a specvar for \INCCODE")
(COND
((IMAGESTREAMP DSTRM)
(SETQ FONTARRAY (FONTMAPARRAY))
@@ -182,39 +190,39 @@ Copyright (c) 1986-1987, 1990, 1999, 2018, 2021 by Venue & Xerox Corporation.
DSTRM))
(DSPFONT (ELT FONTARRAY 1)
DSTRM)))
[SETQ %#CHARS (COND
(END (SETFILEPTR SSTRM START)
[SETQ NBYTES (COND
(END (SETFILEPTR SSTRM START)
(* ;; "Doesn't call \SETFILEPTR cause START has to be checked")
(* ;; "Doesn't call \SETFILEPTR cause START has to be checked")
(IDIFFERENCE (COND
((EQ END -1)
(GETEOFPTR SSTRM))
(T END))
START))
(START)
(T (* ;
(IDIFFERENCE (COND
((EQ END -1)
(GETEOFPTR SSTRM))
(T END))
START))
(START)
(T (* ;
 "Copy everything from here to the end-of-file")
(SETQ START (GETFILEPTR SSTRM))
(IDIFFERENCE (GETEOFPTR SSTRM)
(GETFILEPTR SSTRM]
(SETQ START (GETFILEPTR SSTRM))
(IDIFFERENCE (GETEOFPTR SSTRM)
(GETFILEPTR SSTRM]
(COND
((ILEQ %#CHARS 0)
((ILEQ NBYTES 0)
(RETURN T))) (* ; "Nothing to do")
LP (COND
((ILEQ %#CHARS 0)
((ILEQ NBYTES 0)
(CL:WHEN (AND (EQ START 0)
(EOFP SSTRM)) (* ;
 "RMK: We copied the whole file, why should we do a TERPRI")
(OR NOTERPRI (TERPRI DSTRM)))
(RETURN T)))
(SETQ CHARCODE (\INCCODE.EOLC SSTRM ANY.EOLC '%#CHARS %#CHARS))
(SETQ CHARCODE (\INCCODE.EOLC SSTRM ANY.EOLC 'NBYTES NBYTES))
(IF (EQ CHARCODE (CONSTANT (CHARCODE.DECODE FONTESCAPECHAR)))
THEN
(* ;;
 "No EOL check on font character, otherwise we would be limited to 9 fonts")
(SETQ CHARCODE (\INCCODE SSTRM '%#CHARS %#CHARS))
(SETQ CHARCODE (\INCCODE SSTRM 'NBYTES NBYTES))
(CL:WHEN (AND (IGEQ MAXFONT CHARCODE)
(NEQ CHARCODE 0))
(DSPFONT (ELT FONTARRAY CHARCODE)
@@ -280,6 +288,6 @@ 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 (1102 11635 (PF 1112 . 3807) (PF* 3809 . 4103) (PRINTFN 4105 . 4675) (PRINTFNDEF 4677 .
5860) (FINDFNDEF 5862 . 7234) (PFCOPYBYTES 7236 . 11385) (DISPLAYP 11387 . 11633)))))
(FILEMAP (NIL (1115 11618 (PF 1125 . 3820) (PF* 3822 . 4116) (PRINTFN 4118 . 4688) (PRINTFNDEF 4690 .
5873) (FINDFNDEF 5875 . 7247) (PFCOPYBYTES 7249 . 11368) (DISPLAYP 11370 . 11616)))))
STOP

Binary file not shown.