github.com/Interlisp.medley
1
0
Fork 0
mirror of synced 2026-04-25 03:45:30 +00:00
Code Issues Projects Releases Wiki Activity

Qualify record names in MASTERSCOPE COMPAREDIRECTORIES TTYIN (#2270)

Browse Source 
To avoid conflicts when creating fuller.database
This commit is contained in:
rmkaplan
2025-09-05 08:46:15 -07:00
committed by GitHub
parent 0206fb6f43
commit 2961670d7d
6 changed files with 179 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

170
library/MASTERSCOPE
View File

@@ -1,12 +1,12 @@
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
(FILECREATED " 5-Apr-2025 11:49:04" {WMEDLEY}<library>MASTERSCOPE.;29 197994
(FILECREATED "24-Aug-2025 13:45:51" {WMEDLEY}<library>MASTERSCOPE.;30 197199
:EDIT-BY rmk
:CHANGES-TO (FNS MSOUTPUT)
:CHANGES-TO (FNS MSINTERPRET)
:PREVIOUS-DATE "14-Jul-2024 08:42:20" {WMEDLEY}<library>MASTERSCOPE.;28)
:PREVIOUS-DATE " 5-Apr-2025 11:49:04" {WMEDLEY}<library>MASTERSCOPE.;29)
(PRETTYCOMPRINT MASTERSCOPECOMS)
@@ -2577,7 +2577,7 @@
(* ; "interactive routines")
(RPAQ MASTERSCOPEDATE " 5-Apr-2025")
(RPAQ MASTERSCOPEDATE "24-Aug-2025")
(ADDTOVAR HISTORYCOMS %.)
(DEFINEQ
@@ -3258,7 +3258,8 @@
(DEFINEQ
(MSINTERPRET
[LAMBDA (COMMAND SUBROUTINE) (* ; "Edited 15-Aug-90 11:54 by jds")
[LAMBDA (COMMAND SUBROUTINE) (* ; "Edited 24-Aug-2025 13:45 by rmk")
(* ; "Edited 15-Aug-90 11:54 by jds")
(RESETLST
[PROG (VAL EDITQUIETFLG)
(SELECTQ (CAR COMMAND)
@@ -3288,12 +3289,12 @@
(RETURN
(SELECTQ (fetch (SENTENCE ID) of VAL)
(REANALYZE (* ;
 "Definitly don't want to CHECKFORCHANGED before the ANALYZE is done")
 "Definitly don't want to CHECKFORCHANGED before the ANALYZE is done")
(* ;; "From Lanning's Loops changes for Masterscope...")
(* ;;
 "(MAPC (MSLISTSET (CDR VAL) T 'KNOWN) (FUNCTION (LAMBDA (X) (UPDATEFN X T)))) (CL:VALUES)")
 "(MAPC (MSLISTSET (CDR VAL) T 'KNOWN) (FUNCTION (LAMBDA (X) (UPDATEFN X T)))) (CL:VALUES)")
(* ;; "JRB - The MSANALYZEFNS hashtable hook is hereby flushed.")
@@ -3308,14 +3309,13 @@
(* ;; "SETTYPE is allowed to be NIL here...")
(if [AND SETTYPE (NULL (for MT in MSFNTYPES
thereis (EQ SETTYPE
(fetch (MSANALYZABLE
SETNAME)
thereis (EQ SETTYPE (fetch (MSANALYZABLE
SETNAME)
of MT]
then (PRINTOUT T "Sorry, can't analyze " SETTYPE T)
(ERROR!)
(ERROR!)
else (for X in SET do (UPDATEFN X T))
(CL:VALUES))))
(CL:VALUES))))
(ANALYZE (CHECKFORCHANGED (SETQ VAL (CDR VAL)))
(* ;; "From Lanning's Loops changes for Masterscope...")
@@ -3331,10 +3331,9 @@
(COND
([AND SETTYPE (NULL (for MT in MSFNTYPES
thereis (EQ SETTYPE
(fetch (MSANALYZABLE
thereis (EQ SETTYPE (fetch (MSANALYZABLE
SETNAME)
of MT]
of MT]
(PRINTOUT T "Sorry, can't analyze " SETTYPE T)
(ERROR!))
((EQ SET MSBLIP)
@@ -3343,8 +3342,7 @@
(T (for X in SET do (UPDATEFN X T NIL SETTYPE))
(CL:VALUES])
((EDIT SHOW)
[PROG (DONE NEEDUPDATE UPDATEALL TYPE (EDIT (fetch (SENTENCE ID)
of VAL))
[PROG (DONE NEEDUPDATE UPDATEALL TYPE (EDIT (fetch (SENTENCE ID) of VAL))
REL SHOWSET (EDITCOMS (fetch OTHERSTUFF of VAL))
(SUBJECT (fetch (SENTENCE SUBJECT) of VAL))
(MSPRED (fetch (SENTENCE MSPRED) of VAL))
@@ -3352,7 +3350,7 @@
(DECLARE (SPECVARS TYPE SHOWSET EDIT EDITCOMS DONE))
[COND
((NULL MSPRED) (* ;
 "EDIT ANY CALLING FOO -- just call EDITFNS")
 "EDIT ANY CALLING FOO -- just call EDITFNS")
(CHECKFORCHANGED SUBJECT)
(RETURN (MAPC (MSLISTSET SUBJECT T)
(FUNCTION (LAMBDA (FN)
@@ -3365,10 +3363,8 @@
)
T))
(PRINT "failed" T]
[SETQ REL (fetch (THAT MSVERB) of (SETQ REP (fetch
(MSSETPHRASE
REP) of
MSPRED]
[SETQ REL (fetch (THAT MSVERB) of (SETQ REP (fetch (MSSETPHRASE REP)
of MSPRED]
(SETQ SHOWSET (fetch (THAT OTHERSET) of REP))
[COND
((EQ (fetch TENSE of REL)
@@ -3385,10 +3381,10 @@
(SETQ UPDATEALL (MSINTERPRETSET SUBJECT 'CHECK T))
[for FN in NEEDUPDATE
do (COND
((GETHASH FN MSCHANGEDARRAY)
(MSSHOWUSE FN TYPE SHOWSET EDIT NIL EDITCOMS)
(SETQ DONE (CONS FN DONE)))
(T (UPDATEFN FN]
((GETHASH FN MSCHANGEDARRAY)
(MSSHOWUSE FN TYPE SHOWSET EDIT NIL EDITCOMS)
(SETQ DONE (CONS FN DONE)))
(T (UPDATEFN FN]
(COND
(UPDATEALL [MAPHASH MSCHANGEDARRAY
(FUNCTION (LAMBDA (VAL KEY)
@@ -3397,28 +3393,28 @@
(TESTRELQ (CALL NOTERROR)
KEY T))
(COND
((MSSHOWUSE KEY TYPE
SHOWSET EDIT
'CHANGED EDITCOMS)
((MSSHOWUSE KEY TYPE SHOWSET
EDIT 'CHANGED EDITCOMS
)
(SETQ DONE (CONS KEY DONE]
(MSCHECKEMPTY)))
(MAPC (MSLISTSET (MSJOINSET 'AND MSPRED SUBJECT)
T)
(FUNCTION (LAMBDA (AT)
(AND (NOT (FMEMB AT DONE))
(MSSHOWUSE AT TYPE SHOWSET EDIT NIL EDITCOMS
]
(MSSHOWUSE AT TYPE SHOWSET EDIT NIL EDITCOMS]
(CL:VALUES))
(? [CHECKFORCHANGED (SETQ VAL (MSJOINSET 'AND (fetch MSPRED of VAL)
(fetch SUBJECT of VAL]
(? [CHECKFORCHANGED (SETQ VAL (MSJOINSET 'AND (fetch (SENTENCE MSPRED)
of VAL)
(fetch (SENTENCE SUBJECT) of VAL]
(OR SUBROUTINE (TAB 0 0))
(MSSOLVE VAL))
(PATHS (PROG ([INVERTED
(for X on (CDR VAL) bind FROMFOUND
do (SELECTQ (CAAR X)
(FROM (SETQ FROMFOUND T))
(TO (RETURN (NOT FROMFOUND)))
NIL)
(FROM (SETQ FROMFOUND T))
(TO (RETURN (NOT FROMFOUND)))
NIL)
finally
(RETURN
(COND
@@ -3439,8 +3435,7 @@
(CDR VAL)))
NIL]
NEEDUPDATE UPDATEALL TEM)
(SETQ UPDATEALL (CHECKPATHS (fetch MSPATHOPTIONS of
VAL)))
(SETQ UPDATEALL (CHECKPATHS (fetch MSPATHOPTIONS of VAL)))
(for X in NEEDUPDATE do (UPDATEFN X))
(COND
(UPDATEALL (UPDATECHANGED)
@@ -3448,28 +3443,23 @@
(COND
((SETQ TEM (fetch (PATHOPTIONS OUTPUT) of (CDR VAL)))
(MSOUTPUT TEM)))
(AND (SETQ TEM (fetch (PATHOPTIONS LINELENGTH)
of (CDR VAL)))
(AND (SETQ TEM (fetch (PATHOPTIONS LINELENGTH) of (CDR VAL)))
(RESETSAVE (LINELENGTH TEM)))
(* ;; "Display paths; must print all of FROM, with separate tree for all of SEPARATE (considered as a subset of FROM). Stop when you get to a function in NOTRACE, -- unless TO is NIL, only print paths that eventually reach an element of TO. If INVERTED is not NIL, print inverted tree. Do not print out functions in AVOIDING")
[SETQ MSTHOSE (MSPATHS [COND
(INVERTED (fetch (PATHOPTIONS
TO)
of (fetch
MSPATHOPTIONS
of VAL)))
(T (fetch (PATHOPTIONS FROM)
of (fetch MSPATHOPTIONS
of VAL]
(INVERTED (fetch (PATHOPTIONS TO)
of (fetch MSPATHOPTIONS
of VAL)))
(T (fetch (PATHOPTIONS FROM)
of (fetch MSPATHOPTIONS of VAL]
[COND
(INVERTED (fetch (PATHOPTIONS FROM)
of (fetch MSPATHOPTIONS
of VAL)))
of VAL)))
(T (fetch (PATHOPTIONS TO)
of (fetch MSPATHOPTIONS
of VAL]
of (fetch MSPATHOPTIONS of VAL]
INVERTED
(fetch (PATHOPTIONS AVOIDING)
of (fetch MSPATHOPTIONS of VAL))
@@ -3481,15 +3471,15 @@
of (fetch MSPATHOPTIONS of VAL]
(RETURN (CL:VALUES))))
(ERASE (* ;
 "case of plain ERASE taken care of earlier")
 "case of plain ERASE taken care of earlier")
(MSERASE (MSLISTSET (CDR VAL)
T
'KNOWN))
T
'KNOWN))
(PRIN1 "Erased." T)
(CL:VALUES))
(DESCRIBE (CHECKFORCHANGED (CDR VAL)
NIL T) (* ;
 "Need to update the world since will print out CALLED BY:")
 "Need to update the world since will print out CALLED BY:")
(TAB 0 0)
(MAPC (MSLISTSET (CDR VAL)
T)
@@ -3501,9 +3491,9 @@
(EVAL VAL))
(CHECK (CHECKFORCHANGED (CDR VAL))
[MSCHECKBLOCKS (AND (CDR VAL)
(MSLISTSET (CDR VAL)
'HARD
'FILES])
(MSLISTSET (CDR VAL)
'HARD
'FILES])
(SHOULDNT 18])])
(VERBNOTICELIST
@@ -3752,36 +3742,36 @@
(ADDTOVAR LAMA MSEDITE MSEDITF)
)
(DECLARE%: DONTCOPY
(FILEMAP (NIL (3260 19507 (UPDATEFN 3270 . 4887) (MSGETDEF 4889 . 6295) (MSNOTICEFILE 6297 . 8690) (
MSSHOWUSE 8692 . 14673) (MSUPDATEFN1 14675 . 15363) (MSUPDATE 15365 . 17791) (MSNLAMBDACHECK 17793 .
18675) (MSCOLLECTDATA 18677 . 19505)) (19508 20407 (UPDATECHANGED 19518 . 19881) (UPDATECHANGED1 19883
. 20405)) (20981 21404 (MSCLOSEFILES 20991 . 21402)) (22085 26517 (MSDESCRIBE 22095 . 24883) (
MSDESCRIBE1 24885 . 25948) (FMAPRINT 25950 . 26515)) (26610 27050 (MSPRINTHELPFILE 26620 . 27048)) (
27100 30238 (TEMPLATE 27110 . 28531) (GETTEMPLATE 28533 . 28668) (SETTEMPLATE 28670 . 30236)) (31108
36032 (ADDTEMPLATEWORD 31118 . 31790) (MSADDANALYZE 31792 . 33290) (MSADDMODIFIER 33292 . 34373) (
MSADDRELATION 34375 . 35122) (MSADDTYPE 35124 . 36030)) (37533 42754 (MSMARKCHANGE1 37543 . 38337) (
MSINIT 38339 . 39520) (GETVERBTABLES 39522 . 40075) (MSSTOREDATA 40077 . 41756) (STORETABLE 41758 .
42752)) (44155 49225 (PARSERELATION 44165 . 44765) (PARSERELATION1 44767 . 46222) (GETRELATION 46224
. 47253) (MAPRELATION 47255 . 48389) (TESTRELATION 48391 . 49223)) (49226 50866 (ADDHASH 49236 .
49714) (SUBHASH 49716 . 49944) (MAKEHASH 49946 . 50090) (MSREHASH 50092 . 50545) (EQMEMBHASH 50547 .
50864)) (51205 57420 (MSVBTABLES 51215 . 56994) (MSUSERVBTABLES 56996 . 57418)) (57503 59714 (
BUILDGETRELQ 57513 . 58619) (BUILDTESTRELQ 58621 . 59712)) (59885 60273 (MSERASE 59895 . 60271)) (
60274 64734 (DUMPDATABASE 60284 . 62849) (DUMPDATABASE1 62851 . 63196) (READATABASE 63198 . 64732)) (
65816 94875 (MSCHECKBLOCKS 65826 . 69646) (MSCHECKBLOCK 69648 . 78268) (MSCHECKFNINBLOCK 78270 . 81270
) (MSCHECKBLOCKBASIC 81272 . 83692) (MSCHECKBOUNDFREE 83694 . 85593) (GLOBALVARP 85595 . 85762) (
PRINTERROR 85764 . 88980) (MSCHECKVARS1 88982 . 91935) (UNECCSPEC 91937 . 92215) (NECCSPEC 92217 .
92564) (SPECVARP 92566 . 93093) (SHORTLST 93095 . 93551) (DOERROR 93553 . 94263) (MSMSGPRINT 94265 .
94873)) (96019 110847 (MSPATHS 96029 . 99431) (MSPATHS1 99433 . 103668) (MSPATHS2 103670 . 107080) (
MSONPATH 107082 . 108310) (MSPATHS4 108312 . 109394) (DASHES 109396 . 109922) (DOTABS 109924 . 110165)
(BELOWMARKER 110167 . 110630) (MSPATHSPRINTFN 110632 . 110845)) (111233 114657 (MSFIND 111243 .
111518) (MSEDITF 111520 . 112520) (MSEDITE 112522 . 113559) (EDITGETDEF 113561 . 114655)) (115599
124200 (MSMARKCHANGED 115609 . 117333) (CHANGEMACRO 117335 . 118040) (CHANGEVAR 118042 . 118358) (
CHANGEI.S. 118360 . 119693) (CHANGERECORD 119695 . 120566) (MSNEEDUNSAVE 120568 . 121560) (UNSAVEFNS
121562 . 124198)) (124633 128123 (%. 124643 . 124783) (MASTERSCOPE 124785 . 125311) (MASTERSCOPE1
125313 . 126181) (MASTERSCOPEXEC 126183 . 128121)) (128162 167812 (MSINTERPRETSET 128172 . 156706) (
MSINTERPA 156708 . 157242) (MSGETBLOCKDEC 157244 . 159757) (LISTHARD 159759 . 160977) (MSMEMBSET
160979 . 161124) (MSLISTSET 161126 . 161491) (MSHASHLIST 161493 . 161660) (MSHASHLIST1 161662 . 161988
) (CHECKPATHS 161990 . 162630) (ONFILE 162632 . 167810)) (167813 192172 (MSINTERPRET 167823 . 184676)
(VERBNOTICELIST 184678 . 185788) (MSOUTPUT 185790 . 187300) (MSCHECKEMPTY 187302 . 188506) (
CHECKFORCHANGED 188508 . 189028) (MSSOLVE 189030 . 192170)))))
(FILEMAP (NIL (3263 19510 (UPDATEFN 3273 . 4890) (MSGETDEF 4892 . 6298) (MSNOTICEFILE 6300 . 8693) (
MSSHOWUSE 8695 . 14676) (MSUPDATEFN1 14678 . 15366) (MSUPDATE 15368 . 17794) (MSNLAMBDACHECK 17796 .
18678) (MSCOLLECTDATA 18680 . 19508)) (19511 20410 (UPDATECHANGED 19521 . 19884) (UPDATECHANGED1 19886
. 20408)) (20984 21407 (MSCLOSEFILES 20994 . 21405)) (22088 26520 (MSDESCRIBE 22098 . 24886) (
MSDESCRIBE1 24888 . 25951) (FMAPRINT 25953 . 26518)) (26613 27053 (MSPRINTHELPFILE 26623 . 27051)) (
27103 30241 (TEMPLATE 27113 . 28534) (GETTEMPLATE 28536 . 28671) (SETTEMPLATE 28673 . 30239)) (31111
36035 (ADDTEMPLATEWORD 31121 . 31793) (MSADDANALYZE 31795 . 33293) (MSADDMODIFIER 33295 . 34376) (
MSADDRELATION 34378 . 35125) (MSADDTYPE 35127 . 36033)) (37536 42757 (MSMARKCHANGE1 37546 . 38340) (
MSINIT 38342 . 39523) (GETVERBTABLES 39525 . 40078) (MSSTOREDATA 40080 . 41759) (STORETABLE 41761 .
42755)) (44158 49228 (PARSERELATION 44168 . 44768) (PARSERELATION1 44770 . 46225) (GETRELATION 46227
. 47256) (MAPRELATION 47258 . 48392) (TESTRELATION 48394 . 49226)) (49229 50869 (ADDHASH 49239 .
49717) (SUBHASH 49719 . 49947) (MAKEHASH 49949 . 50093) (MSREHASH 50095 . 50548) (EQMEMBHASH 50550 .
50867)) (51208 57423 (MSVBTABLES 51218 . 56997) (MSUSERVBTABLES 56999 . 57421)) (57506 59717 (
BUILDGETRELQ 57516 . 58622) (BUILDTESTRELQ 58624 . 59715)) (59888 60276 (MSERASE 59898 . 60274)) (
60277 64737 (DUMPDATABASE 60287 . 62852) (DUMPDATABASE1 62854 . 63199) (READATABASE 63201 . 64735)) (
65819 94878 (MSCHECKBLOCKS 65829 . 69649) (MSCHECKBLOCK 69651 . 78271) (MSCHECKFNINBLOCK 78273 . 81273
) (MSCHECKBLOCKBASIC 81275 . 83695) (MSCHECKBOUNDFREE 83697 . 85596) (GLOBALVARP 85598 . 85765) (
PRINTERROR 85767 . 88983) (MSCHECKVARS1 88985 . 91938) (UNECCSPEC 91940 . 92218) (NECCSPEC 92220 .
92567) (SPECVARP 92569 . 93096) (SHORTLST 93098 . 93554) (DOERROR 93556 . 94266) (MSMSGPRINT 94268 .
94876)) (96022 110850 (MSPATHS 96032 . 99434) (MSPATHS1 99436 . 103671) (MSPATHS2 103673 . 107083) (
MSONPATH 107085 . 108313) (MSPATHS4 108315 . 109397) (DASHES 109399 . 109925) (DOTABS 109927 . 110168)
(BELOWMARKER 110170 . 110633) (MSPATHSPRINTFN 110635 . 110848)) (111236 114660 (MSFIND 111246 .
111521) (MSEDITF 111523 . 112523) (MSEDITE 112525 . 113562) (EDITGETDEF 113564 . 114658)) (115602
124203 (MSMARKCHANGED 115612 . 117336) (CHANGEMACRO 117338 . 118043) (CHANGEVAR 118045 . 118361) (
CHANGEI.S. 118363 . 119696) (CHANGERECORD 119698 . 120569) (MSNEEDUNSAVE 120571 . 121563) (UNSAVEFNS
121565 . 124201)) (124636 128126 (%. 124646 . 124786) (MASTERSCOPE 124788 . 125314) (MASTERSCOPE1
125316 . 126184) (MASTERSCOPEXEC 126186 . 128124)) (128165 167815 (MSINTERPRETSET 128175 . 156709) (
MSINTERPA 156711 . 157245) (MSGETBLOCKDEC 157247 . 159760) (LISTHARD 159762 . 160980) (MSMEMBSET
160982 . 161127) (MSLISTSET 161129 . 161494) (MSHASHLIST 161496 . 161663) (MSHASHLIST1 161665 . 161991
) (CHECKPATHS 161993 . 162633) (ONFILE 162635 . 167813)) (167816 191377 (MSINTERPRET 167826 . 183881)
(VERBNOTICELIST 183883 . 184993) (MSOUTPUT 184995 . 186505) (MSCHECKEMPTY 186507 . 187711) (
CHECKFORCHANGED 187713 . 188233) (MSSOLVE 188235 . 191375)))))
STOP

BIN
library/MASTERSCOPE.DFASL
View File

Binary file not shown.