github.com/Interlisp.medley
1
0
Fork 0
mirror of synced 2026-05-02 22:33:48 +00:00
Code Issues Projects Releases Wiki Activity

Rmk63 backccode peekccode eolc (#853)

Browse Source 
* EXTERNALFORMAT,UNICODE,XCCS: Consistent naming of \PEEKCCODE(.EOL), \BACKCCODE returns the code

It was confusing that the naming of the peek functions was inconsistent with the inccode and backccode functions with respect to the EOLC qualifier.  Now uniformaly, the unqualified names (\PEEKCCODE, \BACKCCODE, \INCCODE) do not do any EOL interpretation.  The qualified-name functions (\PEEKCCODE.EOLC, \INCCODE.EOLC, \BACKCCODE.EOLC) do EOL interpretation.

Also, the \BACKCCODE interface is changed so that it returns the code corresponding to the bytes that it passed over.  This simplifies some of the callers.

* Clients of \PEEKCCODE \BACKCCODE and .EOL

Small changes either to fix inconsistencies (backing, reading, peeking with inconsistent EOL interpretation), updating the names in a few other cases, a few simplifications.

* glitches in ATERM, HARDCOPY updates
This commit is contained in:
rmkaplan
2022-07-21 10:36:19 -07:00
committed by GitHub
parent 5db76b4998
commit 6376579b1c
26 changed files with 855 additions and 813 deletions
Download Patch File Download Diff File Expand all files Collapse all files

152
sources/CLSTREAMS
View File

@@ -1,13 +1,31 @@
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "XCL" BASE 10)
(FILECREATED " 6-Jul-2022 11:56:07" 
|{DSK}<users>kaplan>local>medley3.5>working-medley>sources>CLSTREAMS.;37| 65858
(FILECREATED "20-Jul-2022 00:03:06" 
|{DSK}<users>kaplan>local>medley3.5>working-medley>sources>CLSTREAMS.;41| 67657
:CHANGES-TO (FUNCTIONS CL:MAKE-SYNONYM-STREAM CL:MAKE-BROADCAST-STREAM
CL:MAKE-CONCATENATED-STREAM CL:MAKE-TWO-WAY-STREAM CL:MAKE-ECHO-STREAM)
:CHANGES-TO (SETFS FILE-STREAM-POSITION)
(VARS CLSTREAMSCOMS)
(FUNCTIONS OPEN CL:CLOSE CL:STREAM-EXTERNAL-FORMAT CL:STREAM-ELEMENT-TYPE
CL:INPUT-STREAM-P CL:OUTPUT-STREAM-P XCL:OPEN-STREAM-P FILE-STREAM-POSITION
CL:MAKE-SYNONYM-STREAM XCL:SYNONYM-STREAM-P XCL:SYNONYM-STREAM-SYMBOL
XCL:FOLLOW-SYNONYM-STREAMS CL:MAKE-BROADCAST-STREAM XCL:BROADCAST-STREAM-P
XCL:BROADCAST-STREAM-STREAMS CL:MAKE-CONCATENATED-STREAM
XCL:CONCATENATED-STREAM-P XCL:CONCATENATED-STREAM-STREAMS
CL:MAKE-TWO-WAY-STREAM XCL:TWO-WAY-STREAM-P XCL:TWO-WAY-STREAM-OUTPUT-STREAM
XCL:TWO-WAY-STREAM-INPUT-STREAM CL:MAKE-ECHO-STREAM XCL:ECHO-STREAM-P
XCL:ECHO-STREAM-INPUT-STREAM XCL:ECHO-STREAM-OUTPUT-STREAM
CL:MAKE-STRING-INPUT-STREAM MAKE-CONCATENATED-STRING-INPUT-STREAM
%MAKE-INITIAL-STRING-STREAM-CONTENTS CL:WITH-OPEN-STREAM
CL:WITH-INPUT-FROM-STRING CL:WITH-OUTPUT-TO-STRING CL:WITH-OPEN-FILE
CL:MAKE-STRING-OUTPUT-STREAM MAKE-FILL-POINTER-OUTPUT-STREAM
CL:GET-OUTPUT-STREAM-STRING \\STRING-STREAM-OUTCHARFN
\\ADJUSTABLE-STRING-STREAM-OUTCHARFN %NEW-FILE PREDICT-NAME INTERLISP-ACCESS
%BROADCAST-STREAM-DEVICE-CHARSETFN %CONCATENATED-STREAM-DEVICE-CHARSETFN
%SYNONYM-STREAM-DEVICE-GET-INDIRECT-STREAM)
(FNS %TWO-WAY-STREAM-PEEKCCODEFN)
:PREVIOUS-DATE " 5-Jul-2022 23:12:39"
|{DSK}<users>kaplan>local>medley3.5>working-medley>sources>CLSTREAMS.;36|)
:PREVIOUS-DATE "19-Jul-2022 22:58:32"
|{DSK}<users>kaplan>local>medley3.5>working-medley>sources>CLSTREAMS.;40|)
; Copyright (c) 1985-1988, 1990-1991 by Venue & Xerox Corporation.
@@ -925,7 +943,8 @@
(\\INCCODE OTHER-STREAM BYTECOUNTVAR BYTECOUNTVAL))))
(%SYNONYM-STREAM-PEEKCCODEFN
(LAMBDA (STREAM NOERROR EOL) (* \; "Edited 3-Jul-2022 21:31 by rmk")
(LAMBDA (STREAM NOERROR) (* \; "Edited 19-Jul-2022 22:58 by rmk")
(* \; "Edited 3-Jul-2022 21:31 by rmk")
(* \; "Edited 3-Jan-90 15:25 by jds")
(* |;;| " PEEKCCODEFN for synonym streams")
@@ -933,7 +952,8 @@
(LET ((OTHER-STREAM (%SYNONYM-STREAM-DEVICE-GET-STREAM STREAM)))
(|freplace| (STREAM EOLCONVENTION) |of| STREAM |with| (|ffetch| (STREAM EOLCONVENTION)
|of| OTHER-STREAM))
(\\PEEKCCODE OTHER-STREAM NOERROR EOL))))
(CL:FUNCALL (|ffetch| (STREAM PEEKCCODEFN) |of| OTHER-STREAM)
OTHER-STREAM NOERROR))))
(%SYNONYM-STREAM-BACKCCODEFN
(LAMBDA (STREAM BYTECOUNTVAR BYTECOUNTVAL) (* \; "Edited 3-Jul-2022 21:31 by rmk")
@@ -984,13 +1004,19 @@
|of| STREAM))))))
(%TWO-WAY-STREAM-PEEKCCODEFN
(LAMBDA (STREAM NOERROR EOL) (* \; "Edited 4-Jul-2022 00:02 by rmk")
(* \; "Edited 3-Jan-90 15:26 by jds")
(LAMBDA (STREAM NOERROR)
(* |;;| "Edited 20-Jul-2022 00:02 by rmk: No EOL argument at this level, make direct FUNCALL.")
(* |;;| "Edited 4-Jul-2022 00:02 by rmk")
(* |;;| "Edited 3-Jan-90 15:26 by jds")
(* |;;| "peekccodefn for two-way streams")
(\\PEEKCCODE (|fetch| (STREAM F1) |of| STREAM)
NOERROR EOL)))
(CL:FUNCALL (|ffetch| (STREAM PEEKCCODEFN) |of| (|fetch| (STREAM F1) |of| STREAM))
(|fetch| (STREAM F1) |of| STREAM)
NOERROR)))
)
(DEFINEQ
@@ -1343,56 +1369,56 @@
(PUTPROPS CLSTREAMS FILETYPE CL:COMPILE-FILE)
(PUTPROPS CLSTREAMS COPYRIGHT ("Venue & Xerox Corporation" 1985 1986 1987 1988 1990 1991))
(DECLARE\: DONTCOPY
(FILEMAP (NIL (6268 15243 (OPEN 6268 . 15243)) (15245 16171 (CL:CLOSE 15245 . 16171)) (16173 16251 (
CL:STREAM-EXTERNAL-FORMAT 16173 . 16251)) (16253 16320 (CL:STREAM-ELEMENT-TYPE 16253 . 16320)) (16322
16556 (CL:INPUT-STREAM-P 16322 . 16556)) (16558 16794 (CL:OUTPUT-STREAM-P 16558 . 16794)) (16796 16933
(XCL:OPEN-STREAM-P 16796 . 16933)) (16935 17002 (FILE-STREAM-POSITION 16935 . 17002)) (17054 18558 (
CL:MAKE-SYNONYM-STREAM 17054 . 18558)) (18560 18649 (XCL:SYNONYM-STREAM-P 18560 . 18649)) (18651 18789
(XCL:SYNONYM-STREAM-SYMBOL 18651 . 18789)) (18791 19069 (XCL:FOLLOW-SYNONYM-STREAMS 18791 . 19069)) (
19071 19556 (CL:MAKE-BROADCAST-STREAM 19071 . 19556)) (19558 19701 (XCL:BROADCAST-STREAM-P 19558 .
19701)) (19703 19918 (XCL:BROADCAST-STREAM-STREAMS 19703 . 19918)) (19920 20504 (
CL:MAKE-CONCATENATED-STREAM 19920 . 20504)) (20506 20605 (XCL:CONCATENATED-STREAM-P 20506 . 20605)) (
20607 20820 (XCL:CONCATENATED-STREAM-STREAMS 20607 . 20820)) (20822 22563 (CL:MAKE-TWO-WAY-STREAM
20822 . 22563)) (22565 22702 (XCL:TWO-WAY-STREAM-P 22565 . 22702)) (22704 22849 (
XCL:TWO-WAY-STREAM-OUTPUT-STREAM 22704 . 22849)) (22851 22995 (XCL:TWO-WAY-STREAM-INPUT-STREAM 22851
. 22995)) (22997 24544 (CL:MAKE-ECHO-STREAM 22997 . 24544)) (24546 24675 (XCL:ECHO-STREAM-P 24546 .
24675)) (24677 24815 (XCL:ECHO-STREAM-INPUT-STREAM 24677 . 24815)) (24817 24956 (
XCL:ECHO-STREAM-OUTPUT-STREAM 24817 . 24956)) (24958 25685 (CL:MAKE-STRING-INPUT-STREAM 24958 . 25685)
) (25687 26180 (MAKE-CONCATENATED-STRING-INPUT-STREAM 25687 . 26180)) (26182 26342 (
%MAKE-INITIAL-STRING-STREAM-CONTENTS 26182 . 26342)) (26344 26774 (CL:WITH-OPEN-STREAM 26344 . 26774))
(26776 28005 (CL:WITH-INPUT-FROM-STRING 26776 . 28005)) (28007 28509 (CL:WITH-OUTPUT-TO-STRING 28007
. 28509)) (28511 29165 (CL:WITH-OPEN-FILE 28511 . 29165)) (29389 30915 (
MAKE-FILL-POINTER-OUTPUT-STREAM 29389 . 30915)) (30917 31638 (CL:GET-OUTPUT-STREAM-STRING 30917 .
31638)) (31640 32119 (\\STRING-STREAM-OUTCHARFN 31640 . 32119)) (32121 33976 (
\\ADJUSTABLE-STRING-STREAM-OUTCHARFN 32121 . 33976)) (34005 34087 (%NEW-FILE 34005 . 34087)) (34089
34234 (PREDICT-NAME 34089 . 34234)) (34270 34421 (INTERLISP-ACCESS 34270 . 34421)) (34510 35245 (
%BROADCAST-STREAM-DEVICE-BOUT 34520 . 34743) (%BROADCAST-STREAM-DEVICE-CLOSEFILE 34745 . 34984) (
%BROADCAST-STREAM-DEVICE-FORCEOUTPUT 34986 . 35243)) (35247 35574 (%BROADCAST-STREAM-DEVICE-CHARSETFN
35247 . 35574)) (35575 36370 (%BROADCAST-STREAM-OUTCHARFN 35585 . 36368)) (36409 38468 (
%CONCATENATED-STREAM-DEVICE-BIN 36419 . 36824) (%CONCATENATED-STREAM-DEVICE-CLOSEFILE 36826 . 37139) (
%CONCATENATED-STREAM-DEVICE-EOFP 37141 . 37505) (%CONCATENATED-STREAM-DEVICE-PEEKBIN 37507 . 37982) (
%CONCATENATED-STREAM-DEVICE-BACKFILEPTR 37984 . 38466)) (38469 41099 (%CONCATENATED-STREAM-INCCODEFN
38479 . 39349) (%CONCATENATED-STREAM-PEEKCCODEFN 39351 . 40223) (%CONCATENATED-STREAM-BACKCCODEFN
40225 . 41097)) (41101 41432 (%CONCATENATED-STREAM-DEVICE-CHARSETFN 41101 . 41432)) (41433 41964 (
%ECHO-STREAM-DEVICE-BIN 41443 . 41650) (%ECHO-STREAM-INCCODEFN 41652 . 41962)) (41999 42224 (
%SYNONYM-STREAM-DEVICE-GET-INDIRECT-STREAM 41999 . 42224)) (42225 44861 (%SYNONYM-STREAM-DEVICE-BIN
42235 . 42423) (%SYNONYM-STREAM-DEVICE-BOUT 42425 . 42626) (%SYNONYM-STREAM-DEVICE-EOFP 42628 . 42819)
(%SYNONYM-STREAM-DEVICE-FORCEOUTPUT 42821 . 43059) (%SYNONYM-STREAM-DEVICE-GETFILEINFO 43061 . 43298)
(%SYNONYM-STREAM-DEVICE-PEEKBIN 43300 . 43523) (%SYNONYM-STREAM-DEVICE-READP 43525 . 43636) (
%SYNONYM-STREAM-DEVICE-BACKFILEPTR 43638 . 43784) (%SYNONYM-STREAM-DEVICE-SETFILEINFO 43786 . 44035) (
%SYNONYM-STREAM-DEVICE-CHARSETFN 44037 . 44273) (%SYNONYM-STREAM-DEVICE-CLOSEFILE 44275 . 44859)) (
44889 45128 (%SYNONYM-STREAM-DEVICE-GET-STREAM 44899 . 45126)) (45172 47937 (%SYNONYM-STREAM-OUTCHARFN
45182 . 46128) (%SYNONYM-STREAM-INCCODEFN 46130 . 46659) (%SYNONYM-STREAM-PEEKCCODEFN 46661 . 47290)
(%SYNONYM-STREAM-BACKCCODEFN 47292 . 47935)) (47971 49864 (%TWO-WAY-STREAM-BACKCCODEFN 47981 . 48382)
(%TWO-WAY-STREAM-INCCODEFN 48384 . 48779) (%TWO-WAY-STREAM-OUTCHARFN 48781 . 49473) (
%TWO-WAY-STREAM-PEEKCCODEFN 49475 . 49862)) (49865 54190 (%TWO-WAY-STREAM-DEVICE-BIN 49875 . 50048) (
%TWO-WAY-STREAM-DEVICE-INPUTSTREAM 50050 . 50241) (%TWO-WAY-STREAM-DEVICE-BOUT 50243 . 50415) (
%TWO-WAY-STREAM-DEVICE-OUTPUTSTREAM 50417 . 50607) (%TWO-WAY-STREAM-DEVICE-OUTCHARFN 50609 . 51471) (
%TWO-WAY-STREAM-DEVICE-CLOSEFILE 51473 . 52896) (%TWO-WAY-STREAM-DEVICE-EOFP 52898 . 53074) (
%TWO-WAY-STREAM-DEVICE-READP 53076 . 53269) (%TWO-WAY-STREAM-DEVICE-BACKFILEPTR 53271 . 53407) (
%TWO-WAY-STREAM-DEVICE-FORCEOUTPUT 53409 . 53638) (%TWO-WAY-STREAM-DEVICE-PEEKBIN 53640 . 53853) (
%TWO-WAY-STREAM-DEVICE-CHARSETFN 53855 . 54188)) (54230 54455 (%FILL-POINTER-STREAM-DEVICE-CLOSEFILE
54230 . 54455)) (54457 54576 (%FILL-POINTER-STREAM-DEVICE-GETFILEPTR 54457 . 54576)) (55014 55557 (
%INITIALIZE-STANDARD-STREAMS 55014 . 55557)) (55558 65584 (%INITIALIZE-CLSTREAM-TYPES 55568 . 65582)))
(FILEMAP (NIL (7779 16754 (OPEN 7779 . 16754)) (16756 17682 (CL:CLOSE 16756 . 17682)) (17684 17762 (
CL:STREAM-EXTERNAL-FORMAT 17684 . 17762)) (17764 17831 (CL:STREAM-ELEMENT-TYPE 17764 . 17831)) (17833
18067 (CL:INPUT-STREAM-P 17833 . 18067)) (18069 18305 (CL:OUTPUT-STREAM-P 18069 . 18305)) (18307 18444
(XCL:OPEN-STREAM-P 18307 . 18444)) (18446 18513 (FILE-STREAM-POSITION 18446 . 18513)) (18565 20069 (
CL:MAKE-SYNONYM-STREAM 18565 . 20069)) (20071 20160 (XCL:SYNONYM-STREAM-P 20071 . 20160)) (20162 20300
(XCL:SYNONYM-STREAM-SYMBOL 20162 . 20300)) (20302 20580 (XCL:FOLLOW-SYNONYM-STREAMS 20302 . 20580)) (
20582 21067 (CL:MAKE-BROADCAST-STREAM 20582 . 21067)) (21069 21212 (XCL:BROADCAST-STREAM-P 21069 .
21212)) (21214 21429 (XCL:BROADCAST-STREAM-STREAMS 21214 . 21429)) (21431 22015 (
CL:MAKE-CONCATENATED-STREAM 21431 . 22015)) (22017 22116 (XCL:CONCATENATED-STREAM-P 22017 . 22116)) (
22118 22331 (XCL:CONCATENATED-STREAM-STREAMS 22118 . 22331)) (22333 24074 (CL:MAKE-TWO-WAY-STREAM
22333 . 24074)) (24076 24213 (XCL:TWO-WAY-STREAM-P 24076 . 24213)) (24215 24360 (
XCL:TWO-WAY-STREAM-OUTPUT-STREAM 24215 . 24360)) (24362 24506 (XCL:TWO-WAY-STREAM-INPUT-STREAM 24362
. 24506)) (24508 26055 (CL:MAKE-ECHO-STREAM 24508 . 26055)) (26057 26186 (XCL:ECHO-STREAM-P 26057 .
26186)) (26188 26326 (XCL:ECHO-STREAM-INPUT-STREAM 26188 . 26326)) (26328 26467 (
XCL:ECHO-STREAM-OUTPUT-STREAM 26328 . 26467)) (26469 27196 (CL:MAKE-STRING-INPUT-STREAM 26469 . 27196)
) (27198 27691 (MAKE-CONCATENATED-STRING-INPUT-STREAM 27198 . 27691)) (27693 27853 (
%MAKE-INITIAL-STRING-STREAM-CONTENTS 27693 . 27853)) (27855 28285 (CL:WITH-OPEN-STREAM 27855 . 28285))
(28287 29516 (CL:WITH-INPUT-FROM-STRING 28287 . 29516)) (29518 30020 (CL:WITH-OUTPUT-TO-STRING 29518
. 30020)) (30022 30676 (CL:WITH-OPEN-FILE 30022 . 30676)) (30900 32426 (
MAKE-FILL-POINTER-OUTPUT-STREAM 30900 . 32426)) (32428 33149 (CL:GET-OUTPUT-STREAM-STRING 32428 .
33149)) (33151 33630 (\\STRING-STREAM-OUTCHARFN 33151 . 33630)) (33632 35487 (
\\ADJUSTABLE-STRING-STREAM-OUTCHARFN 33632 . 35487)) (35516 35598 (%NEW-FILE 35516 . 35598)) (35600
35745 (PREDICT-NAME 35600 . 35745)) (35781 35932 (INTERLISP-ACCESS 35781 . 35932)) (36021 36756 (
%BROADCAST-STREAM-DEVICE-BOUT 36031 . 36254) (%BROADCAST-STREAM-DEVICE-CLOSEFILE 36256 . 36495) (
%BROADCAST-STREAM-DEVICE-FORCEOUTPUT 36497 . 36754)) (36758 37085 (%BROADCAST-STREAM-DEVICE-CHARSETFN
36758 . 37085)) (37086 37881 (%BROADCAST-STREAM-OUTCHARFN 37096 . 37879)) (37920 39979 (
%CONCATENATED-STREAM-DEVICE-BIN 37930 . 38335) (%CONCATENATED-STREAM-DEVICE-CLOSEFILE 38337 . 38650) (
%CONCATENATED-STREAM-DEVICE-EOFP 38652 . 39016) (%CONCATENATED-STREAM-DEVICE-PEEKBIN 39018 . 39493) (
%CONCATENATED-STREAM-DEVICE-BACKFILEPTR 39495 . 39977)) (39980 42610 (%CONCATENATED-STREAM-INCCODEFN
39990 . 40860) (%CONCATENATED-STREAM-PEEKCCODEFN 40862 . 41734) (%CONCATENATED-STREAM-BACKCCODEFN
41736 . 42608)) (42612 42943 (%CONCATENATED-STREAM-DEVICE-CHARSETFN 42612 . 42943)) (42944 43475 (
%ECHO-STREAM-DEVICE-BIN 42954 . 43161) (%ECHO-STREAM-INCCODEFN 43163 . 43473)) (43510 43735 (
%SYNONYM-STREAM-DEVICE-GET-INDIRECT-STREAM 43510 . 43735)) (43736 46372 (%SYNONYM-STREAM-DEVICE-BIN
43746 . 43934) (%SYNONYM-STREAM-DEVICE-BOUT 43936 . 44137) (%SYNONYM-STREAM-DEVICE-EOFP 44139 . 44330)
(%SYNONYM-STREAM-DEVICE-FORCEOUTPUT 44332 . 44570) (%SYNONYM-STREAM-DEVICE-GETFILEINFO 44572 . 44809)
(%SYNONYM-STREAM-DEVICE-PEEKBIN 44811 . 45034) (%SYNONYM-STREAM-DEVICE-READP 45036 . 45147) (
%SYNONYM-STREAM-DEVICE-BACKFILEPTR 45149 . 45295) (%SYNONYM-STREAM-DEVICE-SETFILEINFO 45297 . 45546) (
%SYNONYM-STREAM-DEVICE-CHARSETFN 45548 . 45784) (%SYNONYM-STREAM-DEVICE-CLOSEFILE 45786 . 46370)) (
46400 46639 (%SYNONYM-STREAM-DEVICE-GET-STREAM 46410 . 46637)) (46683 49626 (%SYNONYM-STREAM-OUTCHARFN
46693 . 47639) (%SYNONYM-STREAM-INCCODEFN 47641 . 48170) (%SYNONYM-STREAM-PEEKCCODEFN 48172 . 48979)
(%SYNONYM-STREAM-BACKCCODEFN 48981 . 49624)) (49660 51663 (%TWO-WAY-STREAM-BACKCCODEFN 49670 . 50071)
(%TWO-WAY-STREAM-INCCODEFN 50073 . 50468) (%TWO-WAY-STREAM-OUTCHARFN 50470 . 51162) (
%TWO-WAY-STREAM-PEEKCCODEFN 51164 . 51661)) (51664 55989 (%TWO-WAY-STREAM-DEVICE-BIN 51674 . 51847) (
%TWO-WAY-STREAM-DEVICE-INPUTSTREAM 51849 . 52040) (%TWO-WAY-STREAM-DEVICE-BOUT 52042 . 52214) (
%TWO-WAY-STREAM-DEVICE-OUTPUTSTREAM 52216 . 52406) (%TWO-WAY-STREAM-DEVICE-OUTCHARFN 52408 . 53270) (
%TWO-WAY-STREAM-DEVICE-CLOSEFILE 53272 . 54695) (%TWO-WAY-STREAM-DEVICE-EOFP 54697 . 54873) (
%TWO-WAY-STREAM-DEVICE-READP 54875 . 55068) (%TWO-WAY-STREAM-DEVICE-BACKFILEPTR 55070 . 55206) (
%TWO-WAY-STREAM-DEVICE-FORCEOUTPUT 55208 . 55437) (%TWO-WAY-STREAM-DEVICE-PEEKBIN 55439 . 55652) (
%TWO-WAY-STREAM-DEVICE-CHARSETFN 55654 . 55987)) (56029 56254 (%FILL-POINTER-STREAM-DEVICE-CLOSEFILE
56029 . 56254)) (56256 56375 (%FILL-POINTER-STREAM-DEVICE-GETFILEPTR 56256 . 56375)) (56813 57356 (
%INITIALIZE-STANDARD-STREAMS 56813 . 57356)) (57357 67383 (%INITIALIZE-CLSTREAM-TYPES 57367 . 67381)))
))
STOP