github.com/Interlisp.medley
1
0
Fork 0
mirror of synced 2026-04-29 13:23:08 +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

133
sources/TTYIN
View File

@@ -1,12 +1,12 @@
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
(FILECREATED " 2-Jul-2022 00:09:00" 
{DSK}<Users>kaplan>Local>medley3.5>working-medley>sources>TTYIN.;16 328841
(FILECREATED "19-Jul-2022 23:34:14" 
{DSK}<users>kaplan>local>medley3.5>working-medley>sources>TTYIN.;17 328952
:CHANGES-TO (FNS TTYINBUFFERSTREAM)
:CHANGES-TO (FNS TTYINREADP)
:PREVIOUS-DATE "27-Aug-2021 17:02:43"
{DSK}<Users>kaplan>Local>medley3.5>working-medley>sources>TTYIN.;14)
:PREVIOUS-DATE " 2-Jul-2022 00:09:00"
{DSK}<users>kaplan>local>medley3.5>working-medley>sources>TTYIN.;16)
(* ; "
@@ -5326,16 +5326,17 @@ Copyright (c) 1982-1988, 1990-1991, 2021 by Venue & Xerox Corporation.
(T (GIVE.TTY.PROCESS WINDOW])
(TTYINREADP
[LAMBDA (FLG) (* ; "Edited 27-Aug-2021 16:49 by rmk:")
[LAMBDA (FLG) (* ; "Edited 19-Jul-2022 23:33 by rmk")
(* ; "Edited 27-Aug-2021 16:49 by rmk:")
(* ;;; "Intended to replace LISPXREADP. Does the right thing when READBUF has just a <cr> in it")
(* ;;; "Intended to replace LISPXREADP. Does the right thing when READBUF has just a <cr> in it")
(COND
(READBUF (OR (NEQ (CAR READBUF)
HISTSTR0)
FLG))
((NOT (LINEBUFFER-EOFP \LINEBUF.OFD))
(OR FLG (NEQ (\PEEKCCODE \LINEBUF.OFD)
(OR FLG (NEQ (\PEEKCCODE.EOLC \LINEBUF.OFD)
(CHARCODE EOL])
(TTYINREAD
@@ -6077,62 +6078,62 @@ DONTEVAL@LOAD EVAL@COMPILE
(PUTPROPS TTYIN COPYRIGHT ("Venue & Xerox Corporation" 1982 1983 1984 1985 1986 1987 1988 1990 1991
2021))
(DECLARE%: DONTCOPY
(FILEMAP (NIL (7815 207850 (TTYIN 7825 . 21058) (TTYIN.SETUP 21060 . 24136) (TTYIN.CLEANUP 24138 .
24966) (TTYIN1 24968 . 51852) (TTYIN1RESTART 51854 . 53118) (TTYIN.FINISH 53120 . 62537) (
TTYIN.BALANCE 62539 . 63665) (ADDCHAR 63667 . 65853) (TTMAKECOMPLEXCHAR 65855 . 66329) (ADDNAKEDCHAR
66331 . 67841) (TTADDTAB 67843 . 68778) (ADJUSTLINE 68780 . 82691) (ADJUSTLINE.AND.RESTORE 82693 .
83131) (AT.END.OF.SCREEN 83133 . 83421) (AT.END.OF.TEXT 83423 . 83878) (AUTOCR? 83880 . 84354) (
BACKSKREAD 84356 . 88941) (BACKWARD.DELETE.TO 88943 . 89125) (BREAKLINE 89127 . 91394) (BUFTAILP 91396
. 91714) (CHECK.MARGIN 91716 . 92339) (CLEAR.LINE? 92341 . 92634) (CURRENT.WORD 92636 . 95036) (
DELETE.TO.END 95038 . 95757) (DELETELINE 95759 . 98716) (DELETETO 98718 . 100540) (DELETETO1 100542 .
101885) (DO.EDIT.COMMAND 101887 . 119206) (DO.EDIT.PP 119208 . 121870) (TTDOTABS 121872 . 123242) (
EDITCOLUMN 123244 . 123700) (EDITNUMBERP 123702 . 123933) (END.DELETE.MODE 123935 . 124452) (ENDREAD?
124454 . 126889) (FIND.LINE 126891 . 128427) (FIND.LINE.BREAK 128429 . 129099) (FIND.MATCHING.QUOTE
129101 . 129946) (FIND.NEXT.WORD 129948 . 131327) (FIND.NON.SPACE 131329 . 131602) (FIND.START.OF.WORD
131604 . 131967) (FORWARD.DELETE.TO 131969 . 134191) (GO.TO.ADDRESSING 134193 . 135149) (
GO.TO.FREELINE 135151 . 135732) (GO.TO.RELATIVE 135734 . 136514) (INIT.CURSOR 136516 . 137413) (
INSERT.NODE 137415 . 137937) (INSERTLINE 137939 . 139443) (KILL.LINES 139445 . 139983) (KILLSEGMENT
139985 . 141108) (L-CASECODE 141110 . 141271) (MOVE.BACK.TO 141273 . 141502) (MOVE.FORWARD.TO 141504
. 141925) (MOVE.TO.LINE 141927 . 142842) (MOVE.TO.NEXT.LINE 142844 . 143114) (MOVE.TO.START.OF.WORD
143116 . 143880) (MOVE.TO.WHEREVER 143882 . 144105) (NTH.COLUMN.OF 144107 . 144438) (
NTH.RELATIVE.COLUMN.OF 144440 . 145740) (OVERFLOW? 145742 . 146690) (OVERFLOWLINE? 146692 . 147018) (
PREVLINE 147020 . 148200) (PREVWORD 148202 . 150343) (PROPERTAILP 150345 . 150552) (READFROMBUF 150554
. 153143) (RENUMBER.LINES 153145 . 153538) (RESTORE.CURSOR 153540 . 153694) (RESTOREBUF 153696 .
155880) (RETYPE.BUFFER 155882 . 158145) (SAVE.CURSOR 158147 . 158319) (SCANBACK 158321 . 159679) (
SCANFORWARD 159681 . 160549) (SCRATCHCONS 160551 . 161153) (SEGMENT.LENGTH 161155 . 161691) (
SEGMENT.BIT.LENGTH 161693 . 162300) (SETLASTC 162302 . 162599) (SETTAIL? 162601 . 163417) (
SHOW.MATCHING.PAREN 163419 . 165919) (SKIP/ZAP 165921 . 168400) (START.NEW.LINE 168402 . 168734) (
START.OF.PARAGRAPH? 168736 . 169117) (TTADJUSTWORD 169119 . 170293) (TTBIN 170295 . 171501) (
TTBITWIDTH 171503 . 171652) (TTCRLF 171654 . 171861) (TTCRLF.ACCOUNT 171863 . 172503) (TTDELETECHAR
172505 . 173649) (TTDELETELINE 173651 . 175599) (TTDELETEWORD 175601 . 176269) (TTECHO.TO.FILE 176271
. 179830) (TTGIVEHELP 179832 . 181097) (TTGIVEHELP1 181099 . 181681) (TTGIVEHELP2 181683 . 182378) (
TTLASTLINE 182380 . 182748) (TTLOADBUF 182750 . 186244) (TTNEXTLINE 186246 . 186566) (TTNEXTNODE
186568 . 186807) (TTNLEFT 186809 . 188036) (TTNTH 188038 . 188497) (TTNTHLINE 188499 . 189031) (
TTPRIN1 189033 . 192846) (TTPRINSPACE 192848 . 193241) (TTPRIN1COMMENT 193243 . 193567) (TTPRIN2
193569 . 195888) (TTPROMPTCHAR 195890 . 196786) (TTRUBOUT 196788 . 197751) (TTUNREADBUF 197753 .
198162) (TTWAITFORINPUT 198164 . 202372) (TTYINSTRING 202374 . 203333) (TYPE.BUFFER 203335 . 205087) (
U-CASECODE 205089 . 205248) (U/L-CASE 205250 . 207848)) (208005 217364 (TTRATOM 208015 . 208459) (
TTREADLIST 208461 . 208828) (TTSKIPSEPR 208830 . 209204) (TTSKREAD 209206 . 213846) (TTYIN.READ 213848
. 217362)) (217411 237455 (FIND.MATCHING.WORD 217421 . 217949) (TTCOMPLETEWORD 217951 . 232379) (
WORD.MATCHES.BUFFER 232381 . 233941) (TTYIN.SHOW.?ALTERNATIVES 233943 . 237453)) (237489 255799 (
DO?CMD 237499 . 243401) (TTYIN.PRINTARGS 243403 . 254261) (TTYIN.READ?=ARGS 254263 . 255044) (
DO?CMD.ERRORHANDLER 255046 . 255797)) (255833 263906 (BEEP 255843 . 256018) (BITBLT.DELETE 256020 .
256667) (BITBLT.ERASE 256669 . 256854) (BITBLT.INSERT 256856 . 257167) (DO.CRLF 257169 . 257488) (
DO.DELETE.LINES 257490 . 258534) (DO.INSERT.LINE 258536 . 260470) (DO.LF 260472 . 260638) (
ERASE.TO.END.OF.LINE 260640 . 260965) (ERASE.TO.END.OF.PAGE 260967 . 261572) (INSERT.TEXT 261574 .
262078) (TTDELSECTION 262080 . 262378) (TTADJUSTWIDTH 262380 . 263244) (TTINSERTSECTION 263246 .
263585) (TTSETCURSOR 263587 . 263904)) (263941 269072 (TTYINBUFFERDEVICE 263951 . 265267) (
TTYINBUFFERSTREAM 265269 . 266185) (TTYINBUFFERBIN 266187 . 266723) (TTYINBUFFERPEEK 266725 . 267203)
(TTYINBUFFERREADP 267205 . 267460) (TTYINBUFFEREOFP 267462 . 267714) (TTYINBUFFERBACKPTR 267716 .
268268) (TTYINWORDRDTBL 268270 . 269070)) (269233 294790 (DO.MOUSE 269243 . 272000) (
DO.SHIFTED.SELECTION 272002 . 282441) (COPY.SEGMENT 282443 . 282647) (DELETE.LONG.SEGMENT 282649 .
283008) (DELETE.LONG.SEGMENT1 283010 . 285486) (INVERT.LONG.SEGMENT 285488 . 286517) (INVERT.SEGMENT
286519 . 288034) (BRACKET.CURRENT.WORD 288036 . 289570) (TTBEFOREPOS 289572 . 290302) (TTNEXTPOS
290304 . 291012) (TTRACKMOUSE 291014 . 294788)) (294934 300189 (SETREADFN 294944 . 295422) (
TTYINENTRYFN 295424 . 295849) (TTYINREADP 295851 . 296315) (TTYINREAD 296317 . 297711) (TTYINFIX
297713 . 298912) (CHARMACRO? 298914 . 299481) (TTYINMETA 299483 . 299611) (TTYIN.LASTINPUT 299613 .
300187)) (300190 308459 (TTYINEDIT 300200 . 302317) (SIMPLETEXTEDIT 302319 . 305363) (
SET.TTYINEDIT.WINDOW 305365 . 306516) (TTYIN.PPTOFILE 306518 . 308457)) (308517 308694 (
MAKE-TTSCRATCHFILE 308527 . 308692)) (308841 309974 (TTYIN.SCRATCHFILE 308851 . 309297) (\TTYIN.RPEOF
309299 . 309972)) (310186 313819 (TTYINPROMPTFORWORD 310196 . 313817)))))
(FILEMAP (NIL (7808 207843 (TTYIN 7818 . 21051) (TTYIN.SETUP 21053 . 24129) (TTYIN.CLEANUP 24131 .
24959) (TTYIN1 24961 . 51845) (TTYIN1RESTART 51847 . 53111) (TTYIN.FINISH 53113 . 62530) (
TTYIN.BALANCE 62532 . 63658) (ADDCHAR 63660 . 65846) (TTMAKECOMPLEXCHAR 65848 . 66322) (ADDNAKEDCHAR
66324 . 67834) (TTADDTAB 67836 . 68771) (ADJUSTLINE 68773 . 82684) (ADJUSTLINE.AND.RESTORE 82686 .
83124) (AT.END.OF.SCREEN 83126 . 83414) (AT.END.OF.TEXT 83416 . 83871) (AUTOCR? 83873 . 84347) (
BACKSKREAD 84349 . 88934) (BACKWARD.DELETE.TO 88936 . 89118) (BREAKLINE 89120 . 91387) (BUFTAILP 91389
. 91707) (CHECK.MARGIN 91709 . 92332) (CLEAR.LINE? 92334 . 92627) (CURRENT.WORD 92629 . 95029) (
DELETE.TO.END 95031 . 95750) (DELETELINE 95752 . 98709) (DELETETO 98711 . 100533) (DELETETO1 100535 .
101878) (DO.EDIT.COMMAND 101880 . 119199) (DO.EDIT.PP 119201 . 121863) (TTDOTABS 121865 . 123235) (
EDITCOLUMN 123237 . 123693) (EDITNUMBERP 123695 . 123926) (END.DELETE.MODE 123928 . 124445) (ENDREAD?
124447 . 126882) (FIND.LINE 126884 . 128420) (FIND.LINE.BREAK 128422 . 129092) (FIND.MATCHING.QUOTE
129094 . 129939) (FIND.NEXT.WORD 129941 . 131320) (FIND.NON.SPACE 131322 . 131595) (FIND.START.OF.WORD
131597 . 131960) (FORWARD.DELETE.TO 131962 . 134184) (GO.TO.ADDRESSING 134186 . 135142) (
GO.TO.FREELINE 135144 . 135725) (GO.TO.RELATIVE 135727 . 136507) (INIT.CURSOR 136509 . 137406) (
INSERT.NODE 137408 . 137930) (INSERTLINE 137932 . 139436) (KILL.LINES 139438 . 139976) (KILLSEGMENT
139978 . 141101) (L-CASECODE 141103 . 141264) (MOVE.BACK.TO 141266 . 141495) (MOVE.FORWARD.TO 141497
. 141918) (MOVE.TO.LINE 141920 . 142835) (MOVE.TO.NEXT.LINE 142837 . 143107) (MOVE.TO.START.OF.WORD
143109 . 143873) (MOVE.TO.WHEREVER 143875 . 144098) (NTH.COLUMN.OF 144100 . 144431) (
NTH.RELATIVE.COLUMN.OF 144433 . 145733) (OVERFLOW? 145735 . 146683) (OVERFLOWLINE? 146685 . 147011) (
PREVLINE 147013 . 148193) (PREVWORD 148195 . 150336) (PROPERTAILP 150338 . 150545) (READFROMBUF 150547
. 153136) (RENUMBER.LINES 153138 . 153531) (RESTORE.CURSOR 153533 . 153687) (RESTOREBUF 153689 .
155873) (RETYPE.BUFFER 155875 . 158138) (SAVE.CURSOR 158140 . 158312) (SCANBACK 158314 . 159672) (
SCANFORWARD 159674 . 160542) (SCRATCHCONS 160544 . 161146) (SEGMENT.LENGTH 161148 . 161684) (
SEGMENT.BIT.LENGTH 161686 . 162293) (SETLASTC 162295 . 162592) (SETTAIL? 162594 . 163410) (
SHOW.MATCHING.PAREN 163412 . 165912) (SKIP/ZAP 165914 . 168393) (START.NEW.LINE 168395 . 168727) (
START.OF.PARAGRAPH? 168729 . 169110) (TTADJUSTWORD 169112 . 170286) (TTBIN 170288 . 171494) (
TTBITWIDTH 171496 . 171645) (TTCRLF 171647 . 171854) (TTCRLF.ACCOUNT 171856 . 172496) (TTDELETECHAR
172498 . 173642) (TTDELETELINE 173644 . 175592) (TTDELETEWORD 175594 . 176262) (TTECHO.TO.FILE 176264
. 179823) (TTGIVEHELP 179825 . 181090) (TTGIVEHELP1 181092 . 181674) (TTGIVEHELP2 181676 . 182371) (
TTLASTLINE 182373 . 182741) (TTLOADBUF 182743 . 186237) (TTNEXTLINE 186239 . 186559) (TTNEXTNODE
186561 . 186800) (TTNLEFT 186802 . 188029) (TTNTH 188031 . 188490) (TTNTHLINE 188492 . 189024) (
TTPRIN1 189026 . 192839) (TTPRINSPACE 192841 . 193234) (TTPRIN1COMMENT 193236 . 193560) (TTPRIN2
193562 . 195881) (TTPROMPTCHAR 195883 . 196779) (TTRUBOUT 196781 . 197744) (TTUNREADBUF 197746 .
198155) (TTWAITFORINPUT 198157 . 202365) (TTYINSTRING 202367 . 203326) (TYPE.BUFFER 203328 . 205080) (
U-CASECODE 205082 . 205241) (U/L-CASE 205243 . 207841)) (207998 217357 (TTRATOM 208008 . 208452) (
TTREADLIST 208454 . 208821) (TTSKIPSEPR 208823 . 209197) (TTSKREAD 209199 . 213839) (TTYIN.READ 213841
. 217355)) (217404 237448 (FIND.MATCHING.WORD 217414 . 217942) (TTCOMPLETEWORD 217944 . 232372) (
WORD.MATCHES.BUFFER 232374 . 233934) (TTYIN.SHOW.?ALTERNATIVES 233936 . 237446)) (237482 255792 (
DO?CMD 237492 . 243394) (TTYIN.PRINTARGS 243396 . 254254) (TTYIN.READ?=ARGS 254256 . 255037) (
DO?CMD.ERRORHANDLER 255039 . 255790)) (255826 263899 (BEEP 255836 . 256011) (BITBLT.DELETE 256013 .
256660) (BITBLT.ERASE 256662 . 256847) (BITBLT.INSERT 256849 . 257160) (DO.CRLF 257162 . 257481) (
DO.DELETE.LINES 257483 . 258527) (DO.INSERT.LINE 258529 . 260463) (DO.LF 260465 . 260631) (
ERASE.TO.END.OF.LINE 260633 . 260958) (ERASE.TO.END.OF.PAGE 260960 . 261565) (INSERT.TEXT 261567 .
262071) (TTDELSECTION 262073 . 262371) (TTADJUSTWIDTH 262373 . 263237) (TTINSERTSECTION 263239 .
263578) (TTSETCURSOR 263580 . 263897)) (263934 269065 (TTYINBUFFERDEVICE 263944 . 265260) (
TTYINBUFFERSTREAM 265262 . 266178) (TTYINBUFFERBIN 266180 . 266716) (TTYINBUFFERPEEK 266718 . 267196)
(TTYINBUFFERREADP 267198 . 267453) (TTYINBUFFEREOFP 267455 . 267707) (TTYINBUFFERBACKPTR 267709 .
268261) (TTYINWORDRDTBL 268263 . 269063)) (269226 294783 (DO.MOUSE 269236 . 271993) (
DO.SHIFTED.SELECTION 271995 . 282434) (COPY.SEGMENT 282436 . 282640) (DELETE.LONG.SEGMENT 282642 .
283001) (DELETE.LONG.SEGMENT1 283003 . 285479) (INVERT.LONG.SEGMENT 285481 . 286510) (INVERT.SEGMENT
286512 . 288027) (BRACKET.CURRENT.WORD 288029 . 289563) (TTBEFOREPOS 289565 . 290295) (TTNEXTPOS
290297 . 291005) (TTRACKMOUSE 291007 . 294781)) (294927 300300 (SETREADFN 294937 . 295415) (
TTYINENTRYFN 295417 . 295842) (TTYINREADP 295844 . 296426) (TTYINREAD 296428 . 297822) (TTYINFIX
297824 . 299023) (CHARMACRO? 299025 . 299592) (TTYINMETA 299594 . 299722) (TTYIN.LASTINPUT 299724 .
300298)) (300301 308570 (TTYINEDIT 300311 . 302428) (SIMPLETEXTEDIT 302430 . 305474) (
SET.TTYINEDIT.WINDOW 305476 . 306627) (TTYIN.PPTOFILE 306629 . 308568)) (308628 308805 (
MAKE-TTSCRATCHFILE 308638 . 308803)) (308952 310085 (TTYIN.SCRATCHFILE 308962 . 309408) (\TTYIN.RPEOF
309410 . 310083)) (310297 313930 (TTYINPROMPTFORWORD 310307 . 313928)))))
STOP