Rmk63 backccode peekccode eolc (#853)
* 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:
101
sources/FILEIO
101
sources/FILEIO
@@ -1,12 +1,12 @@
|
||||
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
|
||||
|
||||
(FILECREATED " 8-Jul-2022 10:59:15"
|
||||
{DSK}<users>kaplan>local>medley3.5>working-medley>sources>FILEIO.;114 160097
|
||||
(FILECREATED "19-Jul-2022 23:23:39"
|
||||
{DSK}<users>kaplan>local>medley3.5>working-medley>sources>FILEIO.;115 160200
|
||||
|
||||
:CHANGES-TO (FNS COPYFILE \COPYOPENFILE)
|
||||
:CHANGES-TO (FNS \GENERIC.READP)
|
||||
|
||||
:PREVIOUS-DATE " 6-Jul-2022 00:01:09"
|
||||
{DSK}<users>kaplan>local>medley3.5>working-medley>sources>FILEIO.;113)
|
||||
:PREVIOUS-DATE " 8-Jul-2022 10:59:15"
|
||||
{DSK}<users>kaplan>local>medley3.5>working-medley>sources>FILEIO.;114)
|
||||
|
||||
|
||||
(* ; "
|
||||
@@ -2623,22 +2623,21 @@ update the map")
|
||||
(fetch USERVISIBLE of S])
|
||||
|
||||
(\GENERIC.READP
|
||||
[LAMBDA (STRM FLG) (* ; "Edited 23-Jun-2021 13:09 by rmk:")
|
||||
(* ;
|
||||
"The 10 does not do the EOL check on the peeked character.")
|
||||
(* ;
|
||||
"If FLG is NIL, a single EOL doesn't count.")
|
||||
[LAMBDA (STRM FLG) (* ; "Edited 19-Jul-2022 23:23 by rmk")
|
||||
(* ; "Edited 23-Jun-2021 13:09 by rmk:")
|
||||
(* ;
|
||||
"The 10 does not do the EOL check on the peeked character.")
|
||||
(* ;
|
||||
"If FLG is NIL, a single EOL doesn't count.")
|
||||
(CL:UNLESS (\EOFP STRM)
|
||||
[PROG NIL
|
||||
(RETURN (OR FLG [NEQ EOL.TC (\SYNCODE \PRIMTERMSA (OR (\PEEKCCODE STRM T)
|
||||
(RETURN (OR FLG [NEQ EOL.TC (\SYNCODE \PRIMTERMSA (OR (\PEEKCCODE.EOLC STRM T)
|
||||
(RETURN]
|
||||
(UNINTERRUPTABLY
|
||||
(\INCCODE STRM)
|
||||
|
||||
(* ;; "To find out if the EOL is the last character, we BIN the stream, check for EOF, then back it up again.")
|
||||
|
||||
(\INCCODE.EOLC STRM) (* ;
|
||||
"Read what we peeked (EOLC), see if anything comes after")
|
||||
(PROG1 (NOT (\EOFP STRM))
|
||||
(\BACKCCODE STRM)))])])
|
||||
(\BACKCCODE.EOLC STRM)))])])
|
||||
|
||||
(\GENERIC.CHARSET
|
||||
[LAMBDA (STREAM NEWVALUE) (* ; "Edited 11-Sep-87 16:20 by bvm:")
|
||||
@@ -3072,39 +3071,39 @@ update the map")
|
||||
(PUTPROPS FILEIO COPYRIGHT ("Venue & Xerox Corporation" 1981 1982 1983 1984 1985 1986 1987 1988 1989
|
||||
1990 1991 1992 1993 1999 2020 2021 2022))
|
||||
(DECLARE%: DONTCOPY
|
||||
(FILEMAP (NIL (27467 31273 (STREAMPROP 27477 . 27911) (GETSTREAMPROP 27913 . 28508) (PUTSTREAMPROP
|
||||
28510 . 31121) (STREAMP 31123 . 31271)) (31316 33835 (\DEFPRINT.BY.NAME 31326 . 32478) (
|
||||
\STREAM.DEFPRINT 32480 . 33528) (\FDEV.DEFPRINT 33530 . 33833)) (34093 39134 (\GETACCESS 34103 . 34557
|
||||
) (\SETACCESS 34559 . 39132)) (59360 65329 (\DEFINEDEVICE 59370 . 61686) (\GETDEVICEFROMNAME 61688 .
|
||||
62161) (\GETDEVICEFROMHOSTNAME 62163 . 63207) (\REMOVEDEVICE 63209 . 64332) (\REMOVEDEVICE.NAMES 64334
|
||||
. 65327)) (65369 90260 (\CLOSEFILE 65379 . 66204) (\DELETEFILE 66206 . 66500) (\DEVICEEVENT 66502 .
|
||||
68272) (\GENERATEFILES 68274 . 69221) (\GENERATENEXTFILE 69223 . 69874) (\GENERATEFILEINFO 69876 .
|
||||
70337) (\GETFILENAME 70339 . 70728) (\GENERIC.OUTFILEP 70730 . 71200) (\OPENFILE 71202 . 73780) (
|
||||
\DO.PARAMS.AT.OPEN 73782 . 76097) (\RENAMEFILE 76099 . 76523) (\REVALIDATEFILE 76525 . 79127) (
|
||||
\PAGED.REVALIDATEFILELST 79129 . 80687) (\PAGED.REVALIDATEFILES 80689 . 82408) (\PAGED.REVALIDATEFILE
|
||||
82410 . 84693) (\BUFFERED.REVALIDATEFILE 84695 . 86981) (\BUFFERED.REVALIDATEFILELST 86983 . 88167) (
|
||||
\PRINT-REVALIDATION-RESULT 88169 . 88584) (\TRUNCATEFILE 88586 . 88977) (\FILE-CONFLICT 88979 . 90258)
|
||||
) (90296 94959 (\GENERATENOFILES 90306 . 92402) (\NULLFILEGENERATOR 92404 . 92648) (\NOFILESNEXTFILEFN
|
||||
92650 . 94641) (\NOFILESINFOFN 94643 . 94957)) (95078 96986 (\FILE.NOT.OPEN 95088 . 95601) (
|
||||
\FILE.WONT.OPEN 95603 . 95931) (\ILLEGAL.DEVICEOP 95933 . 96215) (\IS.NOT.RANDACCESSP 96217 . 96663) (
|
||||
\STREAM.NOT.OPEN 96665 . 96984)) (97121 99419 (\FDEVINSTANCE 97131 . 99417)) (100621 107995 (CNDIR
|
||||
100631 . 101936) (DIRECTORYNAME 101938 . 106121) (DIRECTORYNAMEP 106123 . 106739) (HOSTNAMEP 106741 .
|
||||
107548) (\ADD.CONNECTED.DIR 107550 . 107993)) (108040 136313 (\BACKFILEPTR 108050 . 108238) (
|
||||
\BACKPEEKBIN 108240 . 108601) (\BACKBIN 108603 . 108954) (BIN 108956 . 109173) (\BIN 109175 . 109452)
|
||||
(\BINS 109454 . 109740) (BOUT 109742 . 110104) (\BOUT 110106 . 110421) (\BOUTS 110423 . 110734) (
|
||||
COPYBYTES 110736 . 114068) (COPYCHARS 114070 . 117736) (COPYFILE 117738 . 118802) (\COPYOPENFILE
|
||||
118804 . 122003) (\INFER.FILE.TYPE 122005 . 122959) (EOFP 122961 . 123258) (FORCEOUTPUT 123260 .
|
||||
123507) (\FLUSH.OPEN.STREAMS 123509 . 123865) (CHARSET 123867 . 125531) (ACCESS-CHARSET 125533 .
|
||||
125750) (GETEOFPTR 125752 . 126002) (GETFILEINFO 126004 . 129197) (\TYPE.FROM.FILETYPE 129199 . 129669
|
||||
) (\FILETYPE.FROM.TYPE 129671 . 129850) (GETFILEPTR 129852 . 130104) (SETFILEINFO 130106 . 134212) (
|
||||
SETFILEPTR 134214 . 135933) (BOUT16 135935 . 136120) (BIN16 136122 . 136311)) (136416 141621 (
|
||||
\GENERIC.BINS 136426 . 136706) (\GENERIC.BOUTS 136708 . 136973) (\GENERIC.RENAMEFILE 136975 . 138806)
|
||||
(\GENERIC.OPENP 138808 . 140123) (\GENERIC.READP 140125 . 141166) (\GENERIC.CHARSET 141168 . 141619))
|
||||
(141622 141961 (\MAP-OPEN-STREAMS 141632 . 141959)) (143745 145825 (\EOF.ACTION 143755 . 144006) (
|
||||
\EOSERROR 144008 . 144201) (\GETEOFPTR 144203 . 144385) (\INCFILEPTR 144387 . 144737) (\PEEKBIN 144739
|
||||
. 144930) (\SETCLOSEDFILELENGTH 144932 . 145266) (\SETEOFPTR 145268 . 145456) (\SETFILEPTR 145458 .
|
||||
145823)) (145826 146368 (\FIXPOUT 145836 . 146136) (\FIXPIN 146138 . 146366)) (146369 146935 (\BOUTEOL
|
||||
146379 . 146933)) (149831 159695 (\BUFFERED.BIN 149841 . 150693) (\BUFFERED.PEEKBIN 150695 . 151477)
|
||||
(\BUFFERED.BOUT 151479 . 152339) (\BUFFERED.BINS 152341 . 156026) (\BUFFERED.BOUTS 156028 . 157829) (
|
||||
\BUFFERED.COPYBYTES 157831 . 159693)))))
|
||||
(FILEMAP (NIL (27459 31265 (STREAMPROP 27469 . 27903) (GETSTREAMPROP 27905 . 28500) (PUTSTREAMPROP
|
||||
28502 . 31113) (STREAMP 31115 . 31263)) (31308 33827 (\DEFPRINT.BY.NAME 31318 . 32470) (
|
||||
\STREAM.DEFPRINT 32472 . 33520) (\FDEV.DEFPRINT 33522 . 33825)) (34085 39126 (\GETACCESS 34095 . 34549
|
||||
) (\SETACCESS 34551 . 39124)) (59352 65321 (\DEFINEDEVICE 59362 . 61678) (\GETDEVICEFROMNAME 61680 .
|
||||
62153) (\GETDEVICEFROMHOSTNAME 62155 . 63199) (\REMOVEDEVICE 63201 . 64324) (\REMOVEDEVICE.NAMES 64326
|
||||
. 65319)) (65361 90252 (\CLOSEFILE 65371 . 66196) (\DELETEFILE 66198 . 66492) (\DEVICEEVENT 66494 .
|
||||
68264) (\GENERATEFILES 68266 . 69213) (\GENERATENEXTFILE 69215 . 69866) (\GENERATEFILEINFO 69868 .
|
||||
70329) (\GETFILENAME 70331 . 70720) (\GENERIC.OUTFILEP 70722 . 71192) (\OPENFILE 71194 . 73772) (
|
||||
\DO.PARAMS.AT.OPEN 73774 . 76089) (\RENAMEFILE 76091 . 76515) (\REVALIDATEFILE 76517 . 79119) (
|
||||
\PAGED.REVALIDATEFILELST 79121 . 80679) (\PAGED.REVALIDATEFILES 80681 . 82400) (\PAGED.REVALIDATEFILE
|
||||
82402 . 84685) (\BUFFERED.REVALIDATEFILE 84687 . 86973) (\BUFFERED.REVALIDATEFILELST 86975 . 88159) (
|
||||
\PRINT-REVALIDATION-RESULT 88161 . 88576) (\TRUNCATEFILE 88578 . 88969) (\FILE-CONFLICT 88971 . 90250)
|
||||
) (90288 94951 (\GENERATENOFILES 90298 . 92394) (\NULLFILEGENERATOR 92396 . 92640) (\NOFILESNEXTFILEFN
|
||||
92642 . 94633) (\NOFILESINFOFN 94635 . 94949)) (95070 96978 (\FILE.NOT.OPEN 95080 . 95593) (
|
||||
\FILE.WONT.OPEN 95595 . 95923) (\ILLEGAL.DEVICEOP 95925 . 96207) (\IS.NOT.RANDACCESSP 96209 . 96655) (
|
||||
\STREAM.NOT.OPEN 96657 . 96976)) (97113 99411 (\FDEVINSTANCE 97123 . 99409)) (100613 107987 (CNDIR
|
||||
100623 . 101928) (DIRECTORYNAME 101930 . 106113) (DIRECTORYNAMEP 106115 . 106731) (HOSTNAMEP 106733 .
|
||||
107540) (\ADD.CONNECTED.DIR 107542 . 107985)) (108032 136305 (\BACKFILEPTR 108042 . 108230) (
|
||||
\BACKPEEKBIN 108232 . 108593) (\BACKBIN 108595 . 108946) (BIN 108948 . 109165) (\BIN 109167 . 109444)
|
||||
(\BINS 109446 . 109732) (BOUT 109734 . 110096) (\BOUT 110098 . 110413) (\BOUTS 110415 . 110726) (
|
||||
COPYBYTES 110728 . 114060) (COPYCHARS 114062 . 117728) (COPYFILE 117730 . 118794) (\COPYOPENFILE
|
||||
118796 . 121995) (\INFER.FILE.TYPE 121997 . 122951) (EOFP 122953 . 123250) (FORCEOUTPUT 123252 .
|
||||
123499) (\FLUSH.OPEN.STREAMS 123501 . 123857) (CHARSET 123859 . 125523) (ACCESS-CHARSET 125525 .
|
||||
125742) (GETEOFPTR 125744 . 125994) (GETFILEINFO 125996 . 129189) (\TYPE.FROM.FILETYPE 129191 . 129661
|
||||
) (\FILETYPE.FROM.TYPE 129663 . 129842) (GETFILEPTR 129844 . 130096) (SETFILEINFO 130098 . 134204) (
|
||||
SETFILEPTR 134206 . 135925) (BOUT16 135927 . 136112) (BIN16 136114 . 136303)) (136408 141724 (
|
||||
\GENERIC.BINS 136418 . 136698) (\GENERIC.BOUTS 136700 . 136965) (\GENERIC.RENAMEFILE 136967 . 138798)
|
||||
(\GENERIC.OPENP 138800 . 140115) (\GENERIC.READP 140117 . 141269) (\GENERIC.CHARSET 141271 . 141722))
|
||||
(141725 142064 (\MAP-OPEN-STREAMS 141735 . 142062)) (143848 145928 (\EOF.ACTION 143858 . 144109) (
|
||||
\EOSERROR 144111 . 144304) (\GETEOFPTR 144306 . 144488) (\INCFILEPTR 144490 . 144840) (\PEEKBIN 144842
|
||||
. 145033) (\SETCLOSEDFILELENGTH 145035 . 145369) (\SETEOFPTR 145371 . 145559) (\SETFILEPTR 145561 .
|
||||
145926)) (145929 146471 (\FIXPOUT 145939 . 146239) (\FIXPIN 146241 . 146469)) (146472 147038 (\BOUTEOL
|
||||
146482 . 147036)) (149934 159798 (\BUFFERED.BIN 149944 . 150796) (\BUFFERED.PEEKBIN 150798 . 151580)
|
||||
(\BUFFERED.BOUT 151582 . 152442) (\BUFFERED.BINS 152444 . 156129) (\BUFFERED.BOUTS 156131 . 157932) (
|
||||
\BUFFERED.COPYBYTES 157934 . 159796)))))
|
||||
STOP
|
||||
|
||||
Reference in New Issue
Block a user