github.com/Interlisp.medley
1
0
Fork 0
mirror of synced 2026-02-27 01:19:42 +00:00
Code Issues Projects Releases Wiki Activity

DINFO was expecting to use a closed textstream without reopening (#1576)

Browse Source 
* DINFO was expecting to use a closed textstream without reopening

Not sure why it got closed.  Also fixed some escaped backquote commas (not sure that was necessary, but...)

* Oops, dropped out the PROG1
This commit is contained in:
rmkaplan
2024-03-10 21:59:59 -07:00
committed by GitHub
parent 10d83c5f5d
commit 35b7195ed5
2 changed files with 49 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
lispusers/DINFO
View File

@@ -1,16 +1,13 @@
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
(FILECREATED " 4-Aug-2022 09:56:25" {DSK}<home>larry>medley>lispusers>DINFO.;2 65548
(FILECREATED "10-Mar-2024 15:38:36" {WMEDLEY}<lispusers>DINFO.;12 65343
:CHANGES-TO (FNS DINFO.UPDATE.FMENU DINFO.UPDATE.MENU.DISPLAY DINFO.UPDATE.HISTORY
DINFO.UPDATE.GRAPH.DISPLAY DINFO.LAYOUTGRAPH)
:EDIT-BY rmk
:PREVIOUS-DATE " 3-Feb-2022 11:57:39" {DSK}<home>larry>medley>lispusers>DINFO.;1)
:CHANGES-TO (FNS DINFO.OPENTEXTSTREAM)
:PREVIOUS-DATE " 9-Mar-2024 22:21:42" {WMEDLEY}<lispusers>DINFO.;10)
(* ; "
Copyright (c) 1985-1987, 2020-2021 by Xerox Corporation.
")
(PRETTYCOMPRINT DINFOCOMS)
@@ -538,7 +535,8 @@ Copyright (c) 1985-1987, 2020-2021 by Xerox Corporation.
(DINFO.UPDATE.FMENU GRAPH])
(DINFO.CREATE.FMENU
[LAMBDA (GRAPH) (* ; "Edited 25-Oct-2021 23:23 by rmk:")
[LAMBDA (GRAPH) (* ; "Edited 9-Mar-2024 14:20 by rmk")
(* ; "Edited 25-Oct-2021 23:23 by rmk:")
(* jow "15-Jul-86 17:39")
(* ;;; "Makes a DInfo FreeMenu for GRAPH")
@@ -548,7 +546,7 @@ Copyright (c) 1985-1987, 2020-2021 by Xerox Corporation.
(LET* [(ADD.ITEMS (fetch (DINFOGRAPH FREEMENUITEMS) of GRAPH))
(FONT (OR (FONTP (fetch (DINFOGRAPH MENUFONT) of GRAPH))
MENUFONT))
[FM (FREEMENU `((PROPS FONT %, FONT)
[FM (FREEMENU `((PROPS FONT ,FONT)
((LABEL Node%: TYPE DISPLAY FONT (HELVETICA 10))
(ID NODE LABEL "" TYPE DISPLAY))
((LABEL Top! SELECTEDFN DINFO.FMENU.HANDLER FONT (HELVETICA 10 BOLD)
@@ -564,31 +562,30 @@ Copyright (c) 1985-1987, 2020-2021 by Xerox Corporation.
MESSAGE "Visit the node after the current node")
(ID NEXT LABEL "" TYPE DISPLAY))
((LABEL Display%: TYPE DISPLAY FONT (HELVETICA 10))
(LABEL Graph ID GRAPH INITSTATE %, (MEMB 'GRAPH DINFOMODES)
(LABEL Graph ID GRAPH INITSTATE ,(MEMB 'GRAPH DINFOMODES)
TYPE TOGGLE SELECTEDFN DINFO.TOGGLE.GRAPH FONT (HELVETICA 10 BOLD)
MESSAGE "Toggle display of the graph")
(LABEL Menu ID MENU INITSTATE %, (MEMB 'MENU DINFOMODES)
(LABEL Menu ID MENU INITSTATE ,(MEMB 'MENU DINFOMODES)
TYPE TOGGLE SELECTEDFN DINFO.TOGGLE.MENU FONT (HELVETICA 10 BOLD)
MESSAGE "Toggle display of the subnode menu")
(LABEL Text ID TEXT INITSTATE %, (MEMB 'TEXT DINFOMODES)
(LABEL Text ID TEXT INITSTATE ,(MEMB 'TEXT DINFOMODES)
TYPE TOGGLE SELECTEDFN DINFO.TOGGLE.TEXT FONT (HELVETICA 10 BOLD)
MESSAGE "Toggle display of the text of the current node")
(LABEL History ID HISTORY INITSTATE %, (MEMB 'HISTORY DINFOMODES)
(LABEL History ID HISTORY INITSTATE ,(MEMB 'HISTORY DINFOMODES)
TYPE TOGGLE FONT (HELVETICA 10 BOLD)
SELECTEDFN DINFO.TOGGLE.HISTORY MESSAGE
"Toggle the display of the History Menu"))
%,
(APPEND '((LABEL Find! SELECTEDFN DINFO.FMENU.HANDLER FONT
(HELVETICA 10 BOLD)
MESSAGE
,(APPEND '((LABEL Find! SELECTEDFN DINFO.FMENU.HANDLER FONT
(HELVETICA 10 BOLD)
MESSAGE
"Perform a string search in the selected text of the current node"
)
(LABEL Lookup! SELECTEDFN DINFO.FMENU.HANDLER FONT
(HELVETICA 10 BOLD)
MESSAGE
)
(LABEL Lookup! SELECTEDFN DINFO.FMENU.HANDLER FONT
(HELVETICA 10 BOLD)
MESSAGE
"Lookup a term in this graph. LEFT for new term, MIDDLE to repeat last."
))
ADD.ITEMS]
))
ADD.ITEMS]
(HEIGHT (FETCH (REGION HEIGHT) OF (WINDOWPROP FM 'REGION]
(WINDOWPROP FM 'FM.DONTRESHAPE T)
(WINDOWPROP FM 'MINSIZE (CONS 0 HEIGHT))
@@ -859,11 +856,11 @@ Copyright (c) 1985-1987, 2020-2021 by Xerox Corporation.
(fetch (DINFONODE LABEL) of (fetch (DINFOGRAPH CURRENTNODE) of DINFO.GRAPH])
(DINFO.UPDATE.FROM.GRAPH
[LAMBDA (GRAPHER.NODE GRAPH.WINDOW) (* drc%: "12-Dec-85 18:34")
(AND GRAPHER.NODE (ADD.PROCESS `(DINFO.UPDATE (QUOTE %, (WINDOWPROP GRAPH.WINDOW 'DINFOGRAPH))
(QUOTE %, (fetch (GRAPHNODE NODEID)
of GRAPHER.NODE))) 'NAME
"DInfo From Graph"])
[LAMBDA (GRAPHER.NODE GRAPH.WINDOW) (* ; "Edited 9-Mar-2024 14:21 by rmk")
(* drc%: "12-Dec-85 18:34")
(AND GRAPHER.NODE (ADD.PROCESS `[DINFO.UPDATE ',(WINDOWPROP GRAPH.WINDOW 'DINFOGRAPH)
',(fetch (GRAPHNODE NODEID) of GRAPHER.NODE]
'NAME "DInfo From Graph"])
(DINFO.GET.GRAPH.WINDOW
[LAMBDA (GRAPH REGION) (* drc%: "25-Jan-86 18:05")
@@ -1039,23 +1036,23 @@ Copyright (c) 1985-1987, 2020-2021 by Xerox Corporation.
(PROMPTPRINT "DInfo is busy"])
(DINFO.OPENTEXTSTREAM
[LAMBDA (FILE WINDOW FROM TO PROPS) (* drc%: "25-Jan-86 18:24")
[LAMBDA (FILE WINDOW FROM TO PROPS) (* ; "Edited 10-Mar-2024 15:37 by rmk")
(* drc%: "25-Jan-86 18:24")
(RESETFORM (TTYDISPLAYSTREAM (GETPROMPTWINDOW WINDOW))
(LET ((TEXTSTREAM (WINDOWPROP WINDOW 'TEXTSTREAM))
(THIS.TEXT (LIST FILE FROM TO)))
(if (AND (EQUAL THIS.TEXT (fetch (DINFOGRAPH LAST.TEXT) of (DINFOGRAPH WINDOW)))
TEXTSTREAM)
then (* Same text, and its still there, so
 do nothing.)
(\GETSTREAM TEXTSTREAM 'INPUT T))
then
(* ;; "Same text, and it's still there and open, so do nothing.")
TEXTSTREAM
else (AND TEXTSTREAM (TEDIT.KILL TEXTSTREAM))
(CLEARW T)
(CLEARW WINDOW)
[RESETSAVE NIL `(AND RESETSTATE (WINDOWPROP %, WINDOW 'LAST.TEXT NIL]
(PRINTOUT T "Fetching text from " FILE "...")
[RESETSAVE NIL `(AND RESETSTATE (WINDOWPROP ,WINDOW 'LAST.TEXT NIL]
(PROG1 (OPENTEXTSTREAM FILE WINDOW FROM TO PROPS)
(PRINTOUT T "OK.")
(replace (DINFOGRAPH LAST.TEXT) of (DINFOGRAPH WINDOW) with THIS.TEXT])
(replace (DINFOGRAPH LAST.TEXT) of (DINFOGRAPH WINDOW) with THIS.TEXT))])
(DINFO.SHOWSEL
[LAMBDA (TEXTSTREAM SEL) (* drc%: "16-Jan-86 21:30")
@@ -1110,23 +1107,22 @@ Copyright (c) 1985-1987, 2020-2021 by Xerox Corporation.
(SETTEMPLATE 'DINFOGRAPHPROP 'MACRO)
)
(PUTPROPS DINFO COPYRIGHT ("Xerox Corporation" 1985 1986 1987 2020 2021))
(DECLARE%: DONTCOPY
(FILEMAP (NIL (4744 6203 (DINFOGRAPHPROP 4744 . 6203)) (7457 24595 (DINFO 7467 . 9081) (DINFO.UPDATE
9083 . 11947) (DINFOGRAPH 11949 . 12367) (DINFO.SPECIAL.UPDATE 12369 . 14067) (DINFO.READ.GRAPH 14069
. 15924) (DINFO.WRITE.GRAPH 15926 . 17016) (DINFO.SELECT.GRAPH 17018 . 17925) (DINFO.DEFAULT.MENU
17927 . 20451) (DINFO.FIND 20453 . 23039) (DINFO.LOOKUP 23041 . 24593)) (24596 27290 (
DINFO.READ.KOTO.GRAPH 24606 . 27288)) (27291 29605 (DINFO.SETUP.WINDOW 27301 . 27982) (DINFO.CLOSEFN
27984 . 28417) (DINFO.SHRINKFN 28419 . 28615) (DINFO.EXPANDFN 28617 . 29174) (DINFO.ICONFN 29176 .
29603)) (29606 40850 (DINFO.ADD.FMENU 29616 . 30711) (DINFO.CREATE.FMENU 30713 . 34662) (
DINFO.FMW.CLOSEFN 34664 . 35509) (DINFO.FMENU.HANDLER 35511 . 36150) (DINFO.UPDATE.FMENU 36152 . 38341
) (DINFO.TOGGLE.MENU 38343 . 38933) (DINFO.TOGGLE.GRAPH 38935 . 39434) (DINFO.TOGGLE.HISTORY 39436 .
39980) (DINFO.TOGGLE.TEXT 39982 . 40848)) (40851 48646 (DINFO.UPDATE.MENU.DISPLAY 40861 . 44982) (
DINFO.UPDATE.FROM.MENU 44984 . 45283) (DINFO.UPDATE.HISTORY 45285 . 47815) (DINFO.HISTORIC.UPDATE
47817 . 48644)) (48647 58943 (DINFO.UPDATE.GRAPH.DISPLAY 48657 . 50109) (DINFO.UPDATE.FROM.GRAPH 50111
. 50554) (DINFO.GET.GRAPH.WINDOW 50556 . 51141) (DINFO.CREATE.GRAPH.WINDOW 51143 . 52260) (
DINFO.SHOWGRAPH 52262 . 53987) (DINFO.INVERT.NODE 53989 . 55377) (DINFO.LAYOUTGRAPH 55379 . 58941)) (
58944 64887 (DINFO.UPDATE.TEXT.DISPLAY 58954 . 60902) (DINFO.TITLEMENUFN 60904 . 62029) (
DINFO.OPENTEXTSTREAM 62031 . 63247) (DINFO.SHOWSEL 63249 . 63982) (DINFO.GET.FILENAME 63984 . 64885)))
(FILEMAP (NIL (4556 6015 (DINFOGRAPHPROP 4556 . 6015)) (7269 24407 (DINFO 7279 . 8893) (DINFO.UPDATE
8895 . 11759) (DINFOGRAPH 11761 . 12179) (DINFO.SPECIAL.UPDATE 12181 . 13879) (DINFO.READ.GRAPH 13881
. 15736) (DINFO.WRITE.GRAPH 15738 . 16828) (DINFO.SELECT.GRAPH 16830 . 17737) (DINFO.DEFAULT.MENU
17739 . 20263) (DINFO.FIND 20265 . 22851) (DINFO.LOOKUP 22853 . 24405)) (24408 27102 (
DINFO.READ.KOTO.GRAPH 24418 . 27100)) (27103 29417 (DINFO.SETUP.WINDOW 27113 . 27794) (DINFO.CLOSEFN
27796 . 28229) (DINFO.SHRINKFN 28231 . 28427) (DINFO.EXPANDFN 28429 . 28986) (DINFO.ICONFN 28988 .
29415)) (29418 40740 (DINFO.ADD.FMENU 29428 . 30523) (DINFO.CREATE.FMENU 30525 . 34552) (
DINFO.FMW.CLOSEFN 34554 . 35399) (DINFO.FMENU.HANDLER 35401 . 36040) (DINFO.UPDATE.FMENU 36042 . 38231
) (DINFO.TOGGLE.MENU 38233 . 38823) (DINFO.TOGGLE.GRAPH 38825 . 39324) (DINFO.TOGGLE.HISTORY 39326 .
39870) (DINFO.TOGGLE.TEXT 39872 . 40738)) (40741 48536 (DINFO.UPDATE.MENU.DISPLAY 40751 . 44872) (
DINFO.UPDATE.FROM.MENU 44874 . 45173) (DINFO.UPDATE.HISTORY 45175 . 47705) (DINFO.HISTORIC.UPDATE
47707 . 48534)) (48537 58866 (DINFO.UPDATE.GRAPH.DISPLAY 48547 . 49999) (DINFO.UPDATE.FROM.GRAPH 50001
. 50477) (DINFO.GET.GRAPH.WINDOW 50479 . 51064) (DINFO.CREATE.GRAPH.WINDOW 51066 . 52183) (
DINFO.SHOWGRAPH 52185 . 53910) (DINFO.INVERT.NODE 53912 . 55300) (DINFO.LAYOUTGRAPH 55302 . 58864)) (
58867 64756 (DINFO.UPDATE.TEXT.DISPLAY 58877 . 60825) (DINFO.TITLEMENUFN 60827 . 61952) (
DINFO.OPENTEXTSTREAM 61954 . 63116) (DINFO.SHOWSEL 63118 . 63851) (DINFO.GET.FILENAME 63853 . 64754)))
))
STOP

BIN
lispusers/DINFO.LCOM
View File

Binary file not shown.