github.com/Interlisp.medley
1
0
Fork 0
mirror of synced 2026-05-04 07:09:35 +00:00
Code Issues Projects Releases Wiki Activity

Systematically renamed internal Tedit files with \TEDIT

Browse Source 
This includes some files in lispusers that are not in the Tedit core but had references to Tedit internal functions (TMAX, DOC-OBJECTS and some others) that have been renamed. (I hope to clean out those internal references, at some point.)

A few additional changes are here to track the changes that were recently made in the unrenamed master branch.  Going forward, I want to make future changes in this branch.

Eventual plan is to introduce a Tedit package and do another systematic renaming of all \TEDIT.xxx functions to TEDIT::xxx, this is a first step.

This does not yet include a backward-compatibility mapping of oldnames to newnames, as was discussed in the technical meeting.
This commit is contained in:
rmkaplan
2024-04-01 20:49:06 -07:00
parent f6eb5d9846
commit f4fd00f8b8
58 changed files with 4072 additions and 3610 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
library/tedit/TEDIT-FIND
View File

@@ -1,12 +1,12 @@
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
(FILECREATED " 4-Mar-2024 22:50:23" {WMEDLEY}<library>tedit>TEDIT-FIND.;93 29098
(FILECREATED "17-Mar-2024 12:06:12" {WMEDLEY}<library>tedit>TEDIT-FIND.;102 30083
:EDIT-BY rmk
:CHANGES-TO (FNS TEDIT.SUBSTITUTE)
:CHANGES-TO (FNS \TEDIT.BASICFIND \TEDIT.BASICFIND.BACKWARD \TEDIT.WCFIND.BACKWARD)
:PREVIOUS-DATE " 3-Mar-2024 20:44:51" {WMEDLEY}<library>tedit>TEDIT-FIND.;92)
:PREVIOUS-DATE "15-Mar-2024 14:10:05" {WMEDLEY}<library>tedit>TEDIT-FIND.;98)
(PRETTYCOMPRINT TEDIT-FINDCOMS)
@@ -85,7 +85,9 @@
TARGETSTRING START END)))))])
(TEDIT.SUBSTITUTE
[LAMBDA (TEXTSTREAM PATTERN REPLACEMENT CONFIRM?) (* ; "Edited 3-Mar-2024 12:24 by rmk")
[LAMBDA (TEXTSTREAM PATTERN REPLACEMENT CONFIRM?) (* ; "Edited 15-Mar-2024 14:09 by rmk")
(* ; "Edited 9-Mar-2024 11:36 by rmk")
(* ; "Edited 3-Mar-2024 12:24 by rmk")
(* ; "Edited 29-Feb-2024 17:00 by rmk")
(* ; "Edited 27-Feb-2024 08:20 by rmk")
(* ; "Edited 6-Jan-2024 11:09 by rmk")
@@ -120,7 +122,7 @@
(if (type? SELPIECES REPLACEMENT)
elseif (OR (STRINGP REPLACEMENT)
(LITATOM REPLACEMENT))
then (SETQ REPLACEMENT (\SELPIECES.FROM.STRING REPLACEMENT TEXTOBJ))
then (SETQ REPLACEMENT (\TEDIT.SELPIECES.FROM.STRING REPLACEMENT TEXTOBJ))
elseif (LISTP REPLACEMENT)
then (HELP "LISTP REPLACEMENT"))
@@ -144,8 +146,9 @@
"ing...")
T)
(SETQ SEL (fetch (TEXTOBJ SEL) of TEXTOBJ))
(\SHOWSEL SEL NIL)
(TEDIT.RESET.EXTEND.PENDING.DELETE SEL) (* ; "Turn off any blue pending delete")
(\TEDIT.SHOWSEL SEL NIL)
(\TEDIT.RESET.EXTEND.PENDING.DELETE SEL TEXTOBJ)
(* ; "Turn off any blue pending delete")
(* ;; "STARTCHAR# and ENDCHAR# bound each search. ENDCHAR# has to be reduced as STARTCHAR# increases, so the search stays within the selection.")
@@ -163,14 +166,14 @@
(ADD1 (IDIFFERENCE (CADR RANGE)
(CAR RANGE)))
'RIGHT T))
(\SHOWSEL PENDING.SEL T)
(\TEDIT.SHOWSEL PENDING.SEL T)
(TEDIT.NORMALIZECARET TEXTOBJ PENDING.SEL)
(SELECTQ (U-CASE (NTHCHAR (TEDIT.GETINPUT TEXTOBJ
"OK to replace? ['q' quits]" "Yes")
1))
(Q (RETURN))
(Y (* ; "Do this one")
(\TEDIT.REPLACE.SELPIECES (\SELPIECES.COPY REPLACEMENT
(\TEDIT.REPLACE.SELPIECES (\TEDIT.SELPIECES.COPY REPLACEMENT
'COPY TEXTOBJ)
TEXTOBJ PENDING.SEL)
(add NREPLACEMENTS 1)
@@ -189,9 +192,8 @@
(* ;; "No confirmation required. Do the substitutions without showing intermediate work, collect all of the replacement events")
(bind FIRSTHIT HITLEN HITDIFF (TOTALDIFF _ 0)
(SAVESEL _ (\COPYSEL SEL)) while (SETQ RANGE
(TEDIT.FIND TEXTOBJ SEARCHSTRING
STARTCHAR# ENDCHAR# T))
(SAVESEL _ (\TEDIT.COPYSEL SEL))
while (SETQ RANGE (TEDIT.FIND TEXTOBJ SEARCHSTRING STARTCHAR# ENDCHAR# T))
collect (CL:UNLESS FIRSTHIT (* ; "For final line updating.")
(SETQ FIRSTHIT (CAR RANGE)))
[SETQ HITLEN (ADD1 (IDIFFERENCE (CADR RANGE)
@@ -199,7 +201,8 @@
(\TEDIT.UPDATE.SEL SEL (CAR RANGE)
HITLEN
'RIGHT)
(\TEDIT.REPLACE.SELPIECES (\SELPIECES.COPY REPLACEMENT 'COPY TEXTOBJ)
(\TEDIT.REPLACE.SELPIECES (\TEDIT.SELPIECES.COPY REPLACEMENT
'COPY TEXTOBJ)
TEXTOBJ SEL)
(add NREPLACEMENTS 1)
(SETQ STARTCHAR# (GETSEL SEL CHLIM))
@@ -218,7 +221,7 @@
(* ;; "We want the new selection to begin at the beginning of the original selection, somewhere before the first hit, and end at the position that the prior ending moved to. The text grew or shrank with each hit.")
(\SHOWSEL SEL NIL)
(\TEDIT.SHOWSEL SEL NIL)
(\TEDIT.UPDATE.SEL SEL (GETSEL SAVESEL CH#)
(IPLUS (GETSEL SAVESEL DCH)
TOTALDIFF)
@@ -227,10 +230,10 @@
(* ;; "Save the search & replacement strings to offer for next time:")
(\SHOWSEL SEL T)
(\TEDIT.SHOWSEL SEL T)
(PUTTEXTPROP TEXTOBJ 'TEDIT.LAST.SUBSTITUTE.STRING SEARCHSTRING)
(PUTTEXTPROP TEXTOBJ 'TEDIT.LAST.REPLACEMENT.STRING (\SELPIECES.TO.STRING REPLACEMENT
NIL TEXTOBJ))
(PUTTEXTPROP TEXTOBJ 'TEDIT.LAST.REPLACEMENT.STRING (\TEDIT.SELPIECES.TO.STRING
REPLACEMENT NIL TEXTOBJ))
(TEDIT.PROMPTPRINT TEXTOBJ (SELECTQ NREPLACEMENTS
(0 (CONCAT " No " ACTIONSTRING "ions made"))
(1 (CONCAT " 1 " ACTIONSTRING "ion made"))
@@ -240,7 +243,8 @@
(RETURN NREPLACEMENTS)))])
(TEDIT.NEXT
[LAMBDA (STREAM) (* ; "Edited 16-Feb-2024 23:48 by rmk")
[LAMBDA (STREAM) (* ; "Edited 15-Mar-2024 13:34 by rmk")
(* ; "Edited 16-Feb-2024 23:48 by rmk")
(* ; "Edited 14-Dec-2023 21:20 by rmk")
(* ; "Edited 20-Jun-2023 00:05 by rmk")
(* ; "Edited 3-May-2023 23:47 by rmk")
@@ -269,7 +273,7 @@
(replace (TEXTOBJ BLUEPENDINGDELETE) of TEXTOBJ with T)
(* ;
 "Original comment: %"never pending a deletion%", but it is!")
(\SHOWSEL SEL NIL) (* ;
(\TEDIT.SHOWSEL SEL NIL) (* ;
 "Set up SELECTION to be the found text")
(\TEDIT.UPDATE.SEL SEL (CAR TARGET)
(IDIFFERENCE (ADD1 (CADR TARGET))
@@ -277,11 +281,11 @@
'RIGHT)
(\TEDIT.SET.SEL.LOOKS SEL 'PENDINGDEL) (* ; "Always selected normally")
(TEDIT.NORMALIZECARET TEXTOBJ) (* ; "And get it into the window")
(\SHOWSEL SEL T))
(\TEDIT.SHOWSEL SEL T))
(FIELD (* ;
 "Update the selection for this textobj from the scratch sel returned from MBUTTON.FIND.NEXT.FIELD")
(FSETTOBJ TEXTOBJ BLUEPENDINGDELETE T)
(\SHOWSEL SEL NIL) (* ;
(\TEDIT.SHOWSEL SEL NIL) (* ;
 "Set SELECTION to be the found text")
(\TEDIT.UPDATE.SEL SEL (GETSEL FIELDSEL CH#)
(GETSEL FIELDSEL DCH)
@@ -340,7 +344,8 @@
(OR HITSTART (CAR RESULT])])
(\TEDIT.BASICFIND
[LAMBDA (TSTREAM TARGETSTRING START END ANCHORED) (* ; "Edited 20-Jun-2023 00:11 by rmk")
[LAMBDA (TSTREAM TARGETSTRING START END ANCHORED) (* ; "Edited 17-Mar-2024 12:06 by rmk")
(* ; "Edited 20-Jun-2023 00:11 by rmk")
(* ; "Edited 30-May-91 20:56 by jds")
(* ;; "Search thru TEXTOBJ, starting where the caret is, for an exact match of TARGETSTRING. Optionally, start the search at character START. ")
@@ -352,7 +357,7 @@
(ANCHOR _ (SUB1 START)) first [SETQ LASTANCHOR (ADD1 (CL:IF ANCHORED
ANCHOR
(IDIFFERENCE END NCHARS))]
eachtime (\TEXTSETFILEPTR TSTREAM ANCHOR)
eachtime (\TEDIT.TEXTSETFILEPTR TSTREAM ANCHOR)
(* ;; "Match failed, bump the start--single char wild-card # always matches")
while [SETQ ANCHOR (find A from (ADD1 ANCHOR) to LASTANCHOR suchthat (EQ CHAR1 (BIN TSTREAM]
@@ -362,14 +367,15 @@
do (RETURN (LIST ANCHOR (IPLUS ANCHOR (SUB1 NCHARS])
(\TEDIT.WCFIND.BACKWARD
[LAMBDA (TSTREAM TARGETLIST START END HITEND ANCHORED) (* ; "Edited 20-Jun-2023 13:52 by rmk")
[LAMBDA (TSTREAM TARGETLIST START END HITEND ANCHORED) (* ; "Edited 17-Mar-2024 11:59 by rmk")
(* ; "Edited 20-Jun-2023 13:52 by rmk")
(* ;; "Returns the (start end) pair of a match possibly with wild cards, where HITEND is the last character of such a match")
(LET (RESULT)
(COND
((NULL TARGETLIST) (* ; "Final match")
(LIST (ADD1 (\TEXTGETFILEPTR TSTREAM))
(LIST (ADD1 (\TEDIT.TEXTGETFILEPTR TSTREAM))
(OR HITEND END)))
[(EQ '%# (CAR TARGETLIST)) (* ;
 "Single-char wildcard, next segment is anchored ")
@@ -398,7 +404,8 @@
(OR HITEND (CADR RESULT])
(\TEDIT.BASICFIND.BACKWARD
[LAMBDA (TSTREAM TARGETSTRING START END ANCHORED) (* ; "Edited 12-Jul-2023 08:14 by rmk")
[LAMBDA (TSTREAM TARGETSTRING START END ANCHORED) (* ; "Edited 17-Mar-2024 12:06 by rmk")
(* ; "Edited 12-Jul-2023 08:14 by rmk")
(* ; "Edited 23-Apr-2023 12:42 by rmk")
(* ;; "Returns a (Startmatch Endmatch) pair of character positions in TSTREAM that denote the nearest occurrence of TARGETSTRING whose first character is at or ahead of START and whose last character is at or before END. ")
@@ -421,26 +428,28 @@
(CL:WHEN (ILESSP (IDIFFERENCE END START)
NCHARS1) (* ; "Too few characters")
(RETURN NIL))
(\TEXTSETFILEPTR TSTREAM (SUB1 END))
(CL:WHEN [AND (EQ CHARN (\TEXTPEEKBIN TSTREAM))
(\TEDIT.TEXTSETFILEPTR TSTREAM (SUB1 END))
(CL:WHEN [AND (EQ CHARN (\TEDIT.TEXTPEEKBIN TSTREAM))
(OR (EQ NCHARS1 0)
(for I from NCHARS1 to 1 by -1 always (EQ (NTHCHARCODE TARGETSTRING I)
(\TEXTBACKFILEPTR TSTREAM]
(\TEDIT.TEXTBACKFILEPTR
TSTREAM]
(RETURN (LIST (IDIFFERENCE END NCHARS1)
END)))
(CL:WHEN ANCHORED (* ; "Anchored at END, didn't match")
(RETURN NIL))
(SETQ ANCHOR (SUB1 END))
(SETQ LASTANCHOR (IPLUS START NCHARS1)) eachtime (\TEXTSETFILEPTR TSTREAM ANCHOR)
(SETQ LASTANCHOR (IPLUS START NCHARS1)) eachtime (\TEDIT.TEXTSETFILEPTR TSTREAM ANCHOR)
(* ;
 "The filepos one before the last CHARN match")
(ADD ANCHOR -1)
(* ; "For next attempt")
while (find old ANCHOR from ANCHOR to LASTANCHOR by -1 suchthat (EQ CHARN (\TEXTBACKFILEPTR
while (find old ANCHOR from ANCHOR to LASTANCHOR by -1 suchthat (EQ CHARN (
\TEDIT.TEXTBACKFILEPTR
TSTREAM)))
when [OR (EQ NCHARS1 0)
(for I from NCHARS1 to 1 by -1 always (EQ (NTHCHARCODE TARGETSTRING I)
(\TEXTBACKFILEPTR TSTREAM]
(\TEDIT.TEXTBACKFILEPTR TSTREAM]
do (ADD ANCHOR 1)
(RETURN (LIST (IDIFFERENCE ANCHOR NCHARS1)
ANCHOR])
@@ -482,8 +491,8 @@
TARGETSTRING)])
)
(DECLARE%: DONTCOPY
(FILEMAP (NIL (782 18465 (TEDIT.FIND 792 . 2432) (TEDIT.FIND.BACKWARD 2434 . 4247) (TEDIT.SUBSTITUTE
4249 . 14573) (TEDIT.NEXT 14575 . 18463)) (18498 29075 (\TEDIT.WCFIND 18508 . 20509) (\TEDIT.BASICFIND
20511 . 21874) (\TEDIT.WCFIND.BACKWARD 21876 . 23820) (\TEDIT.BASICFIND.BACKWARD 23822 . 27052) (
\TEDIT.PARSE.SEARCHSTRING 27054 . 29073)))))
(FILEMAP (NIL (832 18922 (TEDIT.FIND 842 . 2482) (TEDIT.FIND.BACKWARD 2484 . 4297) (TEDIT.SUBSTITUTE
4299 . 14915) (TEDIT.NEXT 14917 . 18920)) (18955 30060 (\TEDIT.WCFIND 18965 . 20966) (\TEDIT.BASICFIND
20968 . 22446) (\TEDIT.WCFIND.BACKWARD 22448 . 24507) (\TEDIT.BASICFIND.BACKWARD 24509 . 28037) (
\TEDIT.PARSE.SEARCHSTRING 28039 . 30058)))))
STOP