From b320333ac1e189c72cef108b13b7e081dc0cdaff Mon Sep 17 00:00:00 2001 From: rmkaplan Date: Wed, 22 Jun 2022 16:24:16 -0700 Subject: [PATCH] PRINTFN: rename variabl to clarify that it counts byte, not characters --- sources/PRINTFN | 66 ++++++++++++++++++++++++------------------- sources/PRINTFN.LCOM | Bin 5148 -> 5163 bytes 2 files changed, 37 insertions(+), 29 deletions(-) diff --git a/sources/PRINTFN b/sources/PRINTFN index 1f6366f4..e4671857 100644 --- a/sources/PRINTFN +++ b/sources/PRINTFN @@ -1,11 +1,12 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "15-Mar-2022 00:20:04" {DSK}kaplan>Local>medley3.5>my-medley>sources>PRINTFN.;33 13501 +(FILECREATED "19-Jun-2022 00:02:19"  +{DSK}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}kaplan>Local>medley3.5>my-medley>sources>PRINTFN.;32) + :PREVIOUS-DATE "15-Mar-2022 00:20:04" +{DSK}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 diff --git a/sources/PRINTFN.LCOM b/sources/PRINTFN.LCOM index 40135ae7969f1111f4a8943473bc19bd9f57bf18..50686fc3e4f30cb46888515156095242e95efdf0 100644 GIT binary patch delta 362 zcmbQEv07t7gs`QqS81NEk%5tsf`NgRfsvJ=<-}~W`ttmu?99A$-Q3iaoYYFY;{4L0 z@foYWMB)QW0&*$#)pl!U(%v!O+;m!bHK!*~8J#-8EP@#9u+f%`aGi3(1+93RVF@u3?`3 zp~1Q?KpQ99FiK3m$Ed;%HGXm>qx5EZra4@!ejsmcKFBkRNdU|YRxmWRRDg))@~>wB E0Ahk?LjV8( delta 389 zcmZ3jF-K!Ugs`cuZ(@Er4gH<`S#nnm*6YG>y@w!`q%h1@=z)-=;*~8J#-8EP@#9u+f%`X_?Kura!fFRc}Pyf(h zT^FETa0kKNV`ODwG_hJu7N12%n+=)faIvW>1MLage2HfklMsX*tYBzrsQ?wP;a|@J E0Jbq|r~m)}