Merge (rebase) Cleanup-character-IO-interfaces with master (#356)
* Cleanup of character IO interface Committing this branch for further testing. I know at least that the TTY output stream somehow is defaulting to :XCCS, which is wrong, but I haven't yet found the interface for that. * Clean out \NSIN etc No top-level calls to the NS specific functions, just to the generic \OUTCHAR etc. Updated full.database * MODERNIZE: added dragging for fixed-menu windows They can be dragged by their title bars * UNICODE: Added Greek to the default set Also made spelling of default-externalformats consistent with FILEIO * FASLOAD: EOL conversion in FASL::READ-TEXT EOL's printed as LF's will be read as EOL * LLREAD: Added meta as a CHARACTERSETNAME meta,a maps to 1,a now. But slowly propagating this to TEDIT, SEDIT, etc will make it easier to change the coding of meta characters, e.g. as part of a Unicode transition. * APRINT FILEIO LLREAD: \OUTCHAR now a closed function Removed the macro * LLKEY: call CHARCODE.DECODE directory in \KEYACTION1 Minor cleanup, avoid typical user entry and APPLY* * WHEELSCROLL: re-enable on AFTERMAKESYS/SYSOUT FORMS Also sets up mappings in the \COMMANDKEYACTIONS, whatever that is * ABASIC: NILL and ZERO change from LAMBDA NOBIND to LAMBDA NIL So that things like Masterscope don't break * MASTERSCOPE: Added WHEREIS as last-resort for CONTAINS Looks at the WHEREIS database, if present, for FNS and FUNCTIONS if it has no other information. . WHO CONTAINS ANY CALLING FOO works, but not the inverse: . WHO DOES FUM CONTAIN. We still need to figure out why the CONTAINS table isn't populated * POSTSCRIPTSTREAM: use standard \OUTCHAR conventions Now uses generic \OUTCHAR to get the proper function from the stream (or default) * Recompile with right EXPORTS.ALL Some of the macros weren't correct. * Fix POSTSCRIPTSTREAM Cleaner separation between external \OUTCHAR and internal BOUT * POSTSCRIPTSTREAM gets its own external format * Minor fix * Compile-time warning about EXPORTS.ALL * MODERNIZE: Modern button fn has same args as the original For Notecards #343 * Fixed another glitch in the MODERNIZE arglist thing \TEDIT.BUTTONEVENTFN actually takes a second STREAM argument. I don't see where it is ever called with that. The modernize replacement binds that argument, but it isn't being passed to the original. * FILEWATCH: added missing record field * Update FILEWATCH.LCOM * Eliminating record/type name conflicts Mostly just qualifying references, more work to get BIGBITMAP stuff out of ADISPLAY and to eliminate ambiguity of LINE record (now XXLINE in XXGEOM) * Compile away open calls to \OUTCHAR, add loadups/full.database Mostly new LCOMS where \OUTCHAR calls were compiled open * Remove garbage library/XCCS Old tools for reading wikipedia XCCS tables, sources/XCCS will deal with XCCS external format * Next step: Remove open input-character calls, factor XCCS to separate file XCCS is the default, but can be swapped out (eventually) by setting a few variables, without recompiling everything * Lots of residual cleanup for XCCS isolation * Delete old file MACINTERFACE (migrated to MODERNIZE) * Eliminate straggling NS calls: LAFITE, READINTERPRESS * Typo * READINTERPRESS: removed CHARSET * MODERNIZE: Interface to control title-bar response (for Notecards) * Many changes for external format name consistency Very close to the end of this * Put :FORMAT in file info, fix TEDIT plaintext hardcopy I distributed :FORMAT :XCCS as the default marking, but somehow one of the variables seems to get revert during the loadup. This is correct, as far as it goes. * Getting the format in the file-info This is all very twisty, different variables set in different places. It now seems to do the right thing, at least for new files. Marks them with :FORMAT :XCCS. * Another fileinfo glitch * CLIPBOARD -UNICODE: Make UTF8 to UTF-8 to match standards * MODERNIZE: fix bug in MODERWINDOW * External format as MAKEFILE option, LOAD applies the file's format (MAKEFILE 'XX '((FORMAT :UTF-8))) will dump XX as a UTF-8 file. LOAD will load it back to XCCS internal. * Compilers respect DEFINE-FILE-INFO format * MODERNIZE: little glitch * Delete old FILEIO.LCOM * More edge cases of external format thru MAKEFILE, PRETTY, PRETTYFILEINDEX etc. * FILEBROWSER: Can SEE UTF-8 Lisp sourcefile * INSPECT: Better macro for inspecting readtables * recompile changed files and do new loadup Co-authored-by: rmkaplan <ron.kaplan@post.harvard.edu>
This commit is contained in:
Larry Masinter
GitHub
@@ -1,9 +1,11 @@
|
||||
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
|
||||
(FILECREATED " 7-Mar-2021 19:39:11" {DSK}<home>larry>ilisp>medley>library>MASTERSCOPE.;6 193444
|
||||
(FILECREATED "13-Jun-2021 09:05:17"
|
||||
{DSK}<Users>kaplan>Local>medley3.5>git-medley>library>MASTERSCOPE.;6 196680
|
||||
|
||||
changes to%: (VARS MASTERSCOPECOMS MSDATABASECOMS)
|
||||
changes to%: (FNS MSINTERPRETSET)
|
||||
|
||||
previous date%: " 3-Mar-2021 09:08:58" {DSK}<home>larry>ilisp>medley>library>MASTERSCOPE.;5)
|
||||
previous date%: " 9-Jun-2021 23:55:26"
|
||||
{DSK}<Users>kaplan>Local>medley3.5>git-medley>library>MASTERSCOPE.;5)
|
||||
|
||||
|
||||
(* ; "
|
||||
@@ -1328,36 +1330,53 @@ Copyright (c) 1983-1988, 1990, 1993-1994, 2018, 2020-2021 by Venue & Xerox Corpo
|
||||
(DEFINEQ
|
||||
|
||||
(DUMPDATABASE
|
||||
[LAMBDA (FNLST) (* lmm "12-APR-81 15:57")
|
||||
(PROG (DUMPEDFLG)
|
||||
(DECLARE (SPECVARS DUMPEDFLG DUMPTABLE))
|
||||
(COND
|
||||
(FNLST (MAPC FNLST (FUNCTION UPDATEFN)))
|
||||
(T (UPDATECHANGED)))
|
||||
(PRINT '(READATABASE))
|
||||
(PRIN1 '%()
|
||||
(TERPRI)
|
||||
[for DUMPTABLE in MSDATABASELST when (NOT (MEMB (CAR DUMPTABLE)
|
||||
NODUMPRELATIONS))
|
||||
do (SETQ DUMPEDFLG NIL)
|
||||
[COND
|
||||
((OR (NOT FNLST)
|
||||
(EQ (CDDR DUMPTABLE)
|
||||
T))
|
||||
|
||||
(* either dumping everything, or this is a permanent table which should be
|
||||
dumped in entirity (e.g. templates))
|
||||
[LAMBDA (FNLST FILE) (* ; "Edited 22-May-2021 00:01 by rmk:")
|
||||
|
||||
(MAPTABLE (CADR DUMPTABLE)
|
||||
(FUNCTION DUMPDATABASE1)))
|
||||
(T (MAPC FNLST (FUNCTION (LAMBDA (FN)
|
||||
(DUMPDATABASE1 (GETTABLE FN (CADR DUMPTABLE))
|
||||
FN]
|
||||
(COND
|
||||
(DUMPEDFLG (PRINT]
|
||||
(TERPRI)
|
||||
(PRIN1 '%))
|
||||
(TERPRI])
|
||||
(* ;; "RMK: Added FILE argument to provide an interface to a standard PRETTYDEF file (MAKEFILE but without all of the coms and fileproperty stuff.")
|
||||
|
||||
(IF FILE
|
||||
THEN
|
||||
|
||||
(* ;; "If FILE is provided, then we construct a command for that file so that the database will be dumped by a call to PRETTYDEF that includes whatever contextual information (e.g. package, readtable) that makes the database LOAD(able).")
|
||||
|
||||
(RESETLST
|
||||
[PRETTYDEF NIL FILE `((E (DUMPDATABASE ,(CL:WHEN FNLST
|
||||
(KWOTE (MKLIST FNLST)))])
|
||||
ELSE
|
||||
|
||||
(* ;; "FILE is NIL, then we presume that it is already open and that whatever header information is needed to ensure LOADability has already been written.")
|
||||
|
||||
(PROG (DUMPEDFLG)
|
||||
(DECLARE (SPECVARS DUMPEDFLG DUMPTABLE))
|
||||
(COND
|
||||
(FNLST (MAPC FNLST (FUNCTION UPDATEFN)))
|
||||
(T (UPDATECHANGED)))
|
||||
(PRINT '(READATABASE))
|
||||
(PRIN1 '%()
|
||||
(TERPRI)
|
||||
[for DUMPTABLE in MSDATABASELST when (NOT (MEMB (CAR DUMPTABLE)
|
||||
NODUMPRELATIONS))
|
||||
do (SETQ DUMPEDFLG NIL)
|
||||
[COND
|
||||
((OR (NOT FNLST)
|
||||
(EQ (CDDR DUMPTABLE)
|
||||
T))
|
||||
|
||||
(* either dumping everything, or this is a permanent table which should be
|
||||
dumped in entirity (e.g. templates))
|
||||
|
||||
(MAPTABLE (CADR DUMPTABLE)
|
||||
(FUNCTION DUMPDATABASE1)))
|
||||
(T (MAPC FNLST (FUNCTION (LAMBDA (FN)
|
||||
(DUMPDATABASE1 (GETTABLE FN (CADR
|
||||
DUMPTABLE
|
||||
))
|
||||
FN]
|
||||
(COND
|
||||
(DUMPEDFLG (PRINT]
|
||||
(TERPRI)
|
||||
(PRIN1 '%))
|
||||
(TERPRI])
|
||||
|
||||
(DUMPDATABASE1
|
||||
[LAMBDA (VALUE FN) (* rmk%: "24-OCT-79 10:02")
|
||||
@@ -2559,7 +2578,7 @@ Copyright (c) 1983-1988, 1990, 1993-1994, 2018, 2020-2021 by Venue & Xerox Corpo
|
||||
(* ; "interactive routines")
|
||||
|
||||
|
||||
(RPAQ MASTERSCOPEDATE " 7-Mar-2021")
|
||||
(RPAQ MASTERSCOPEDATE "13-Jun-2021")
|
||||
|
||||
(ADDTOVAR HISTORYCOMS %.)
|
||||
(DEFINEQ
|
||||
@@ -2649,10 +2668,10 @@ Copyright (c) 1983-1988, 1990, 1993-1994, 2018, 2020-2021 by Venue & Xerox Corpo
|
||||
(DEFINEQ
|
||||
|
||||
(MSINTERPRETSET
|
||||
[LAMBDA (SET OP ARG) (* ; "Edited 15-Aug-90 11:50 by jds")
|
||||
[LAMBDA (SET OP ARG) (* ; "Edited 13-Jun-2021 09:04 by rmk:")
|
||||
|
||||
(* ;; "DECLARATIONS%%: (RECORDS SENTENCE MSSETPHRASE)")
|
||||
(* ; "Edited 3-Jun-88 12:42 by jrb:")
|
||||
(* ;; "DECLARATIONS%%: (RECORDS SENTENCE MSSETPHRASE)")
|
||||
(* ; "Edited 3-Jun-88 12:42 by jrb:")
|
||||
(PROG (TEM TYPE (REP (fetch (MSSETPHRASE REP) of SET)))
|
||||
START
|
||||
[COND
|
||||
@@ -2698,7 +2717,7 @@ Copyright (c) 1983-1988, 1990, 1993-1994, 2018, 2020-2021 by Venue & Xerox Corpo
|
||||
(CHECK ARG)
|
||||
((LIST HARD)
|
||||
|
||||
(* ;; "got a list of dotted pairs of hash tables and another set; want to know the set of all things which have the given relation to any in the other set")
|
||||
(* ;; "got a list of dotted pairs of hash tables and another set; want to know the set of all things which have the given relation to any in the other set")
|
||||
|
||||
(PROG ((HTABS (fetch (INRELATION HTABLES) of REP))
|
||||
(INVERTED (fetch (INRELATION INVERTED)
|
||||
@@ -2759,8 +2778,9 @@ Copyright (c) 1983-1988, 1990, 1993-1994, 2018, 2020-2021 by Venue & Xerox Corpo
|
||||
(SHOULDNT 12)))
|
||||
(QUOTE (SELECTQ OP
|
||||
(CHECK (COND
|
||||
(ARG (SETQ NEEDUPDATE (UNION NEEDUPDATE (fetch QUOTED
|
||||
of REP)))
|
||||
(ARG (SETQ NEEDUPDATE (UNION NEEDUPDATE (fetch
|
||||
'QUOTED of
|
||||
REP)))
|
||||
NIL)))
|
||||
((HARD LIST)
|
||||
(SETQ TYPE (OR (fetch (MSSETPHRASE TYPE) of SET)
|
||||
@@ -2768,7 +2788,7 @@ Copyright (c) 1983-1988, 1990, 1993-1994, 2018, 2020-2021 by Venue & Xerox Corpo
|
||||
(COND
|
||||
([AND ARG (NEQ ARG 'FILES)
|
||||
(NEQ TYPE 'FILES)
|
||||
(FMEMB (SETQ TEM (fetch QUOTED of REP))
|
||||
(FMEMB (SETQ TEM (fetch 'QUOTED of REP))
|
||||
FILELST)
|
||||
(COND
|
||||
((EQ ARG 'KNOWN)
|
||||
@@ -2779,28 +2799,29 @@ Copyright (c) 1983-1988, 1990, 1993-1994, 2018, 2020-2021 by Venue & Xerox Corpo
|
||||
((EQ ARG 'KNOWN)
|
||||
'FNS)
|
||||
(T ARG)))
|
||||
(SETQ TEM (for FILE in (fetch QUOTED of REP)
|
||||
(SETQ TEM (for FILE in (fetch 'QUOTED of
|
||||
REP)
|
||||
join (ONFILE FILE ARG)))
|
||||
(printout T (fetch QUOTED of REP)
|
||||
(printout T (fetch 'QUOTED of REP)
|
||||
" => ON "
|
||||
(fetch QUOTED of REP)
|
||||
(fetch 'QUOTED of REP)
|
||||
T)
|
||||
(replace QUOTED of (fetch (MSSETPHRASE REP)
|
||||
of SET) with TEM))
|
||||
(replace 'QUOTED of (fetch (MSSETPHRASE REP)
|
||||
of SET) with TEM))
|
||||
(T (COND
|
||||
([AND (EQ TYPE 'FNS)
|
||||
(GETP (fetch QUOTED of REP)
|
||||
(GETP (fetch 'QUOTED of REP)
|
||||
'CLISPWORD)
|
||||
(NOT (GETD (fetch QUOTED of REP]
|
||||
(printout T "Warning: " (fetch QUOTED of REP)
|
||||
(NOT (GETD (fetch 'QUOTED of REP]
|
||||
(printout T "Warning: " (fetch 'QUOTED of REP)
|
||||
|
||||
"is a CLISP word and is not treated like a function!"
|
||||
T)))
|
||||
(fetch QUOTED of REP))))
|
||||
(MEMB (FMEMB ARG (fetch QUOTED of REP)))
|
||||
(fetch 'QUOTED of REP))))
|
||||
(MEMB (FMEMB ARG (fetch 'QUOTED of REP)))
|
||||
(SHOULDNT 13)))
|
||||
(OR
|
||||
(* ;; "I.e. WHO ON MYFILE OR @ EXPRP CALL X --- if either of the sets need to be KNOWN and are 'vague' then the entire world needs to be updated")
|
||||
(* ;; "I.e. WHO ON MYFILE OR @ EXPRP CALL X --- if either of the sets need to be KNOWN and are 'vague' then the entire world needs to be updated")
|
||||
|
||||
(SELECTQ OP
|
||||
(CHECK ([LAMBDA (X)
|
||||
@@ -2838,8 +2859,8 @@ Copyright (c) 1983-1988, 1990, 1993-1994, 2018, 2020-2021 by Venue & Xerox Corpo
|
||||
(MSINTERPRETSET (fetch (CSET SET2) of REP)
|
||||
'MEMB ARG)))
|
||||
(SHOULDNT 14)))
|
||||
(AND (* ;
|
||||
"I.e. WHO ON MYFILE AND @ EXPRP CALL Z -- only if both sets are vague does the world need updating")
|
||||
(AND (* ;
|
||||
"I.e. WHO ON MYFILE AND @ EXPRP CALL Z -- only if both sets are vague does the world need updating")
|
||||
(SELECTQ OP
|
||||
(CHECK ([LAMBDA (X)
|
||||
(OR (MSINTERPRETSET (fetch (CSET SET2) of REP)
|
||||
@@ -2877,55 +2898,58 @@ Copyright (c) 1983-1988, 1990, 1993-1994, 2018, 2020-2021 by Venue & Xerox Corpo
|
||||
'MEMB ARG)))
|
||||
(SHOULDNT 15)))
|
||||
(ANDNOT (replace (SENTENCE ID) of REP with 'AND)
|
||||
[replace (MSSETPHRASE REP) of (fetch SET2 of REP)
|
||||
[replace (MSSETPHRASE REP) of (fetch (CSET SET2) of REP)
|
||||
with (create NOT
|
||||
NEGATED _ (create MSSETPHRASE
|
||||
using (fetch SET2 of REP)
|
||||
using (fetch (CSET SET2)
|
||||
of REP)
|
||||
REP _ (fetch (MSSETPHRASE REP)
|
||||
of (fetch SET2
|
||||
of (fetch
|
||||
(CSET SET2)
|
||||
of REP]
|
||||
(GO RETRY))
|
||||
(IN [SETQ REP (create QUOTE
|
||||
QUOTED _ (MKLIST (CL:EVAL (fetch (IN EXPRESSION)
|
||||
of REP]
|
||||
(GO RETRY))
|
||||
(BLOCKS (* ; "Block set")
|
||||
(BLOCKS (* ; "Block set")
|
||||
(SELECTQ OP
|
||||
(CHECK [[LAMBDA (X Y)
|
||||
(OR X Y]
|
||||
(AND (fetch FNS of REP)
|
||||
(MSINTERPRETSET (fetch FNS of REP)
|
||||
(AND (fetch (BLOCKS FNS) of REP)
|
||||
(MSINTERPRETSET (fetch (BLOCKS FNS) of REP)
|
||||
'CHECK))
|
||||
(AND (fetch FILES of REP)
|
||||
(MSINTERPRETSET (fetch FILES of REP)
|
||||
(AND (fetch (BLOCKS FILES) of REP)
|
||||
(MSINTERPRETSET (fetch (BLOCKS FILES)
|
||||
of REP)
|
||||
'CHECK])
|
||||
(PROGN [SETQ REP (create QUOTE
|
||||
QUOTED _
|
||||
(MSGETBLOCKDEC (fetch TYPES
|
||||
of REP)
|
||||
(fetch FNS of REP)
|
||||
(AND (fetch FILES of REP)
|
||||
(MSINTERPRETSET (fetch
|
||||
FILES
|
||||
of
|
||||
REP)
|
||||
'HARD]
|
||||
(MSGETBLOCKDEC
|
||||
(fetch (BLOCKS TYPES) of REP)
|
||||
(fetch (BLOCKS FNS) of REP)
|
||||
(AND (fetch (BLOCKS FILES) of REP)
|
||||
(MSINTERPRETSET (fetch
|
||||
(BLOCKS FILES)
|
||||
of REP)
|
||||
'HARD]
|
||||
(GO RETRY))))
|
||||
(FIELDS (SELECTQ OP
|
||||
(CHECK (MSINTERPRETSET (fetch RECS of REP)
|
||||
(CHECK (MSINTERPRETSET (fetch (FIELDS RECS) of REP)
|
||||
OP))
|
||||
(PROGN [SETQ REP
|
||||
(create QUOTE
|
||||
QUOTED _
|
||||
(PROG (VAL)
|
||||
(for X
|
||||
in (MSLISTSET (fetch RECS
|
||||
of REP)
|
||||
T)
|
||||
do (SETQ VAL (UNION (RECORDFIELDNAMES
|
||||
X)
|
||||
VAL)))
|
||||
(RETURN VAL]
|
||||
(PROGN [SETQ REP (create
|
||||
QUOTE
|
||||
QUOTED _
|
||||
(PROG (VAL)
|
||||
(for X
|
||||
in (MSLISTSET (fetch
|
||||
(FIELDS RECS)
|
||||
of REP)
|
||||
T)
|
||||
do (SETQ VAL (UNION (RECORDFIELDNAMES
|
||||
X)
|
||||
VAL)))
|
||||
(RETURN VAL]
|
||||
(GO RETRY))))
|
||||
(THAT (PROG (TABLES (MSVERB (fetch (THAT MSVERB) of REP))
|
||||
VALUE
|
||||
@@ -2934,34 +2958,39 @@ Copyright (c) 1983-1988, 1990, 1993-1994, 2018, 2020-2021 by Venue & Xerox Corpo
|
||||
((AND OR ANDNOT)
|
||||
[SETQ REP
|
||||
(create CSET
|
||||
ID _ (fetch (CVERB C)
|
||||
of (fetch VPART of MSVERB))
|
||||
ID _ (fetch (CVERB C) of (fetch
|
||||
(MSVERB VPART)
|
||||
of MSVERB))
|
||||
SET1 _
|
||||
(create MSSETPHRASE
|
||||
using SET REP _
|
||||
(create THAT
|
||||
MSVERB _
|
||||
(create MSVERB
|
||||
TENSE _ (fetch TENSE
|
||||
of MSVERB)
|
||||
VPART _
|
||||
(fetch (CVERB VB1)
|
||||
of (fetch VPART
|
||||
of MSVERB)))
|
||||
OTHERSET _ OS))
|
||||
(create
|
||||
THAT
|
||||
MSVERB _ (create
|
||||
MSVERB
|
||||
TENSE _ (fetch (MSVERB TENSE)
|
||||
of MSVERB)
|
||||
VPART _
|
||||
(fetch (CVERB VB1)
|
||||
of (fetch (MSVERB
|
||||
VPART)
|
||||
of MSVERB)))
|
||||
OTHERSET _ OS))
|
||||
SET2 _
|
||||
(create MSSETPHRASE
|
||||
using SET REP _
|
||||
(create THAT
|
||||
MSVERB _
|
||||
(create MSVERB
|
||||
TENSE _ (fetch TENSE
|
||||
of MSVERB)
|
||||
VPART _
|
||||
(fetch (CVERB VB2)
|
||||
of (fetch VPART
|
||||
of MSVERB)))
|
||||
OTHERSET _ OS]
|
||||
(create
|
||||
THAT
|
||||
MSVERB _ (create
|
||||
MSVERB
|
||||
TENSE _ (fetch (MSVERB TENSE)
|
||||
of MSVERB)
|
||||
VPART _
|
||||
(fetch (CVERB VB2)
|
||||
of (fetch (MSVERB
|
||||
VPART)
|
||||
of MSVERB)))
|
||||
OTHERSET _ OS]
|
||||
(GO RETRY))
|
||||
(CALL (COND
|
||||
((EQ (fetch (MSVERB MODIFIER) of MSVERB)
|
||||
@@ -2981,17 +3010,17 @@ Copyright (c) 1983-1988, 1990, 1993-1994, 2018, 2020-2021 by Venue & Xerox Corpo
|
||||
TOPFLG _ T]
|
||||
(GO RETRY))))
|
||||
(CONTAIN (COND
|
||||
((EQ (fetch DET of OS)
|
||||
((EQ (fetch (MSSETPHRASE DET) of OS)
|
||||
'WHICH)
|
||||
(SHOULDNT 16)))
|
||||
|
||||
(* ;; "JRB - Default types on files are now ignored - removed (|fetch| (MSSETPHRASE DEFAULTTYPE) |of| SET) from ORs below.")
|
||||
(* ;; "JRB - Default types on files are now ignored - removed (|fetch| (MSSETPHRASE DEFAULTTYPE) |of| SET) from ORs below.")
|
||||
|
||||
[SETQ REP
|
||||
(create
|
||||
QUOTE
|
||||
QUOTED _
|
||||
(SELECTQ (fetch TENSE of MSVERB)
|
||||
(SELECTQ (fetch (MSVERB TENSE) of MSVERB)
|
||||
(ED (ONFILE (MSINTERPRETSET OS 'HARD)
|
||||
(OR (fetch (MSVERB MODIFIER)
|
||||
of MSVERB)
|
||||
@@ -3009,14 +3038,15 @@ Copyright (c) 1983-1988, 1990, 1993-1994, 2018, 2020-2021 by Venue & Xerox Corpo
|
||||
NIL)
|
||||
(SELECTQ OP
|
||||
(CHECK (SETQ VALUE (MSINTERPRETSET OS 'CHECK
|
||||
(fetch KNOWN of OS))))
|
||||
(fetch (MSSETPHRASE KNOWN)
|
||||
of OS))))
|
||||
NIL)
|
||||
(SETQ TABLES (GETVERBTABLES (fetch (MSVERB ROOT) of MSVERB
|
||||
)
|
||||
(fetch (MSVERB MODIFIER) of MSVERB)))
|
||||
(replace REP of SET
|
||||
(replace (MSSETPHRASE REP) of SET
|
||||
with (SETQ REP (create INRELATION
|
||||
INVERTED _ (EQ (fetch TENSE
|
||||
INVERTED _ (EQ (fetch (MSVERB TENSE)
|
||||
of MSVERB)
|
||||
'ED)
|
||||
HTABLES _ TABLES
|
||||
@@ -3025,14 +3055,14 @@ Copyright (c) 1983-1988, 1990, 1993-1994, 2018, 2020-2021 by Venue & Xerox Corpo
|
||||
VALUE))))
|
||||
(PATHS (COND
|
||||
((EQ OP 'CHECK)
|
||||
(CHECKPATHS (fetch MSPATHOPTIONS of REP)))
|
||||
(CHECKPATHS (fetch (PATHS MSPATHOPTIONS) of REP)))
|
||||
(T (SETQ REP (create GETHASH
|
||||
HTABLE _ (LIST (MSONPATH REP))
|
||||
BADMARKS _ T))
|
||||
(GO RETRY))))
|
||||
(SHOULDNT 17]
|
||||
RETRY
|
||||
(replace REP of SET with REP)
|
||||
(replace (MSSETPHRASE REP) of SET with REP)
|
||||
(GO START])
|
||||
|
||||
(MSINTERPA
|
||||
@@ -3148,12 +3178,12 @@ Copyright (c) 1983-1988, 1990, 1993-1994, 2018, 2020-2021 by Venue & Xerox Corpo
|
||||
(RETURN (OR VAL (NULL (FASSOC 'FROM OPTIONS])
|
||||
|
||||
(ONFILE
|
||||
[LAMBDA (FILES TYPES FINDITEMS) (* ; "Edited 2-Jun-88 11:19 by jrb:")
|
||||
(* ;
|
||||
"MSHASHFILE uses cause GETRELATION barfs if CONTAINS table doesn't exist.")
|
||||
[LAMBDA (FILES TYPES FINDITEMS) (* ; "Edited 9-Jun-2021 23:53 by rmk:")
|
||||
(* ;
|
||||
"MSHASHFILE uses cause GETRELATION barfs if CONTAINS table doesn't exist.")
|
||||
(PROG (VAL)
|
||||
|
||||
(* ;; "JRB - TYPES of 'ALL means gather all types Masterscope knows about")
|
||||
(* ;; "JRB - TYPES of 'ALL means gather all types Masterscope knows about")
|
||||
|
||||
[AND (EQ TYPES 'ALL)
|
||||
(SETQ TYPES (for FT in MSFNTYPES collect (fetch (MSANALYZABLE
|
||||
@@ -3167,8 +3197,8 @@ Copyright (c) 1983-1988, 1990, 1993-1994, 2018, 2020-2021 by Venue & Xerox Corpo
|
||||
((FNS KNOWN NIL)
|
||||
T)
|
||||
NIL))) inside (OR FILES FILELST)
|
||||
do (* ;
|
||||
"Don't notice the file if we only care about FNS and the file is known to the database.")
|
||||
do (* ;
|
||||
"Don't notice the file if we only care about FNS and the file is known to the database.")
|
||||
(COND
|
||||
[(AND FNSONLY (NOT (MEMB FILE FILELST))
|
||||
(GETRELATION FILE 'CONTAINS]
|
||||
@@ -3187,29 +3217,43 @@ Copyright (c) 1983-1988, 1990, 1993-1994, 2018, 2020-2021 by Venue & Xerox Corpo
|
||||
(T (SETQ VAL (UNION (FILECOMSLST FILE TYPE)
|
||||
VAL]
|
||||
[COND
|
||||
((AND MSHASHFILE (NULL VAL)
|
||||
[(AND MSHASHFILE (NULL VAL)
|
||||
(find TYPE inside TYPES suchthat (SELECTQ TYPE
|
||||
((FNS KNOWN NIL)
|
||||
T)
|
||||
NIL)))
|
||||
(* ;
|
||||
"Didn't find it in core; perhaps the CONTAINS table knows")
|
||||
(* ;
|
||||
"Didn't find it in core; perhaps the CONTAINS table knows")
|
||||
(* ; "RMK: or the WHEREIS hashfile")
|
||||
(COND
|
||||
[FILES (for FILE inside FILES
|
||||
do (COND
|
||||
(FINDITEMS (for X inside FINDITEMS
|
||||
when (TESTRELATION X 'CONTAINS FILE T)
|
||||
do (pushnew VAL FILE)))
|
||||
[FINDITEMS (for X inside FINDITEMS
|
||||
do (IF (OR (TESTRELATION X
|
||||
'CONTAINS FILE T)
|
||||
(MEMB FILE
|
||||
(WHEREIS X TYPES T)))
|
||||
THEN (pushnew VAL FILE]
|
||||
(T (SETQ VAL (UNION (GETRELATION FILE 'CONTAINS)
|
||||
VAL]
|
||||
(FINDITEMS
|
||||
|
||||
(* ;; "No files: should use all known files, but that information isn't explicitly kept by MSHASH. Soooo, we'll only do the case where FINDITEMS is given")
|
||||
(* ;; "No files: should use all known files, but that information isn't explicitly kept by MSHASH. Soooo, we'll only do the case where FINDITEMS is given")
|
||||
|
||||
(for X inside FINDITEMS do (SETQ VAL (UNION (GETRELATION
|
||||
X
|
||||
'CONTAINS T)
|
||||
VAL]
|
||||
(for X inside FINDITEMS
|
||||
do (SETQ VAL (UNION (OR (GETRELATION X 'CONTAINS T)
|
||||
(WHEREIS X TYPES T))
|
||||
VAL]
|
||||
(T
|
||||
(* ;; "RMK: If we really have no information, maybe the WHEREIS hashfile knows.")
|
||||
|
||||
(for X inside FINDITEMS
|
||||
do (IF (FOR F IN (OR (GETRELATION X 'CONTAINS T)
|
||||
(RETURN NIL)) DO (PUSHNEW VAL F)
|
||||
FINALLY (RETURN T))
|
||||
ELSE (FOR TYPE INSIDE (OR TYPES 'FNS)
|
||||
DO (FOR F IN (WHEREIS X TYPE T)
|
||||
DO (PUSHNEW VAL F]
|
||||
(RETURN VAL])
|
||||
)
|
||||
(DEFINEQ
|
||||
@@ -3685,36 +3729,36 @@ Copyright (c) 1983-1988, 1990, 1993-1994, 2018, 2020-2021 by Venue & Xerox Corpo
|
||||
(PUTPROPS MASTERSCOPE COPYRIGHT ("Venue & Xerox Corporation" 1983 1984 1985 1986 1987 1988 1990 1993
|
||||
1994 2018 2020 2021))
|
||||
(DECLARE%: DONTCOPY
|
||||
(FILEMAP (NIL (3402 19171 (UPDATEFN 3412 . 5029) (MSGETDEF 5031 . 6437) (MSNOTICEFILE 6439 . 8832) (
|
||||
MSSHOWUSE 8834 . 14337) (MSUPDATEFN1 14339 . 15027) (MSUPDATE 15029 . 17455) (MSNLAMBDACHECK 17457 .
|
||||
18339) (MSCOLLECTDATA 18341 . 19169)) (19172 20071 (UPDATECHANGED 19182 . 19545) (UPDATECHANGED1 19547
|
||||
. 20069)) (20645 21068 (MSCLOSEFILES 20655 . 21066)) (21749 26181 (MSDESCRIBE 21759 . 24547) (
|
||||
MSDESCRIBE1 24549 . 25612) (FMAPRINT 25614 . 26179)) (26274 26714 (MSPRINTHELPFILE 26284 . 26712)) (
|
||||
26764 29902 (TEMPLATE 26774 . 28195) (GETTEMPLATE 28197 . 28332) (SETTEMPLATE 28334 . 29900)) (30772
|
||||
35696 (ADDTEMPLATEWORD 30782 . 31454) (MSADDANALYZE 31456 . 32954) (MSADDMODIFIER 32956 . 34037) (
|
||||
MSADDRELATION 34039 . 34786) (MSADDTYPE 34788 . 35694)) (37197 42418 (MSMARKCHANGE1 37207 . 38001) (
|
||||
MSINIT 38003 . 39184) (GETVERBTABLES 39186 . 39739) (MSSTOREDATA 39741 . 41420) (STORETABLE 41422 .
|
||||
42416)) (43819 48889 (PARSERELATION 43829 . 44429) (PARSERELATION1 44431 . 45886) (GETRELATION 45888
|
||||
. 46917) (MAPRELATION 46919 . 48053) (TESTRELATION 48055 . 48887)) (48890 50530 (ADDHASH 48900 .
|
||||
49378) (SUBHASH 49380 . 49608) (MAKEHASH 49610 . 49754) (MSREHASH 49756 . 50209) (EQMEMBHASH 50211 .
|
||||
50528)) (50869 57084 (MSVBTABLES 50879 . 56658) (MSUSERVBTABLES 56660 . 57082)) (57167 59378 (
|
||||
BUILDGETRELQ 57177 . 58283) (BUILDTESTRELQ 58285 . 59376)) (59549 59937 (MSERASE 59559 . 59935)) (
|
||||
59938 63170 (DUMPDATABASE 59948 . 61285) (DUMPDATABASE1 61287 . 61632) (READATABASE 61634 . 63168)) (
|
||||
64252 93311 (MSCHECKBLOCKS 64262 . 68082) (MSCHECKBLOCK 68084 . 76704) (MSCHECKFNINBLOCK 76706 . 79706
|
||||
) (MSCHECKBLOCKBASIC 79708 . 82128) (MSCHECKBOUNDFREE 82130 . 84029) (GLOBALVARP 84031 . 84198) (
|
||||
PRINTERROR 84200 . 87416) (MSCHECKVARS1 87418 . 90371) (UNECCSPEC 90373 . 90651) (NECCSPEC 90653 .
|
||||
91000) (SPECVARP 91002 . 91529) (SHORTLST 91531 . 91987) (DOERROR 91989 . 92699) (MSMSGPRINT 92701 .
|
||||
93309)) (94455 109283 (MSPATHS 94465 . 97867) (MSPATHS1 97869 . 102104) (MSPATHS2 102106 . 105516) (
|
||||
MSONPATH 105518 . 106746) (MSPATHS4 106748 . 107830) (DASHES 107832 . 108358) (DOTABS 108360 . 108601)
|
||||
(BELOWMARKER 108603 . 109066) (MSPATHSPRINTFN 109068 . 109281)) (109669 113093 (MSFIND 109679 .
|
||||
109954) (MSEDITF 109956 . 110956) (MSEDITE 110958 . 111995) (EDITGETDEF 111997 . 113091)) (114099
|
||||
122700 (MSMARKCHANGED 114109 . 115833) (CHANGEMACRO 115835 . 116540) (CHANGEVAR 116542 . 116858) (
|
||||
CHANGEI.S. 116860 . 118193) (CHANGERECORD 118195 . 119066) (MSNEEDUNSAVE 119068 . 120060) (UNSAVEFNS
|
||||
120062 . 122698)) (123141 126631 (%. 123151 . 123291) (MASTERSCOPE 123293 . 123819) (MASTERSCOPE1
|
||||
123821 . 124689) (MASTERSCOPEXEC 124691 . 126629)) (126670 164329 (MSINTERPRETSET 126680 . 154173) (
|
||||
MSINTERPA 154175 . 154709) (MSGETBLOCKDEC 154711 . 157224) (LISTHARD 157226 . 158444) (MSMEMBSET
|
||||
158446 . 158591) (MSLISTSET 158593 . 158958) (MSHASHLIST 158960 . 159127) (MSHASHLIST1 159129 . 159455
|
||||
) (CHECKPATHS 159457 . 160097) (ONFILE 160099 . 164327)) (164330 187496 (MSINTERPRET 164340 . 181193)
|
||||
(VERBNOTICELIST 181195 . 182305) (MSOUTPUT 182307 . 182624) (MSCHECKEMPTY 182626 . 183830) (
|
||||
CHECKFORCHANGED 183832 . 184352) (MSSOLVE 184354 . 187494)))))
|
||||
(FILEMAP (NIL (3419 19188 (UPDATEFN 3429 . 5046) (MSGETDEF 5048 . 6454) (MSNOTICEFILE 6456 . 8849) (
|
||||
MSSHOWUSE 8851 . 14354) (MSUPDATEFN1 14356 . 15044) (MSUPDATE 15046 . 17472) (MSNLAMBDACHECK 17474 .
|
||||
18356) (MSCOLLECTDATA 18358 . 19186)) (19189 20088 (UPDATECHANGED 19199 . 19562) (UPDATECHANGED1 19564
|
||||
. 20086)) (20662 21085 (MSCLOSEFILES 20672 . 21083)) (21766 26198 (MSDESCRIBE 21776 . 24564) (
|
||||
MSDESCRIBE1 24566 . 25629) (FMAPRINT 25631 . 26196)) (26291 26731 (MSPRINTHELPFILE 26301 . 26729)) (
|
||||
26781 29919 (TEMPLATE 26791 . 28212) (GETTEMPLATE 28214 . 28349) (SETTEMPLATE 28351 . 29917)) (30789
|
||||
35713 (ADDTEMPLATEWORD 30799 . 31471) (MSADDANALYZE 31473 . 32971) (MSADDMODIFIER 32973 . 34054) (
|
||||
MSADDRELATION 34056 . 34803) (MSADDTYPE 34805 . 35711)) (37214 42435 (MSMARKCHANGE1 37224 . 38018) (
|
||||
MSINIT 38020 . 39201) (GETVERBTABLES 39203 . 39756) (MSSTOREDATA 39758 . 41437) (STORETABLE 41439 .
|
||||
42433)) (43836 48906 (PARSERELATION 43846 . 44446) (PARSERELATION1 44448 . 45903) (GETRELATION 45905
|
||||
. 46934) (MAPRELATION 46936 . 48070) (TESTRELATION 48072 . 48904)) (48907 50547 (ADDHASH 48917 .
|
||||
49395) (SUBHASH 49397 . 49625) (MAKEHASH 49627 . 49771) (MSREHASH 49773 . 50226) (EQMEMBHASH 50228 .
|
||||
50545)) (50886 57101 (MSVBTABLES 50896 . 56675) (MSUSERVBTABLES 56677 . 57099)) (57184 59395 (
|
||||
BUILDGETRELQ 57194 . 58300) (BUILDTESTRELQ 58302 . 59393)) (59566 59954 (MSERASE 59576 . 59952)) (
|
||||
59955 64415 (DUMPDATABASE 59965 . 62530) (DUMPDATABASE1 62532 . 62877) (READATABASE 62879 . 64413)) (
|
||||
65497 94556 (MSCHECKBLOCKS 65507 . 69327) (MSCHECKBLOCK 69329 . 77949) (MSCHECKFNINBLOCK 77951 . 80951
|
||||
) (MSCHECKBLOCKBASIC 80953 . 83373) (MSCHECKBOUNDFREE 83375 . 85274) (GLOBALVARP 85276 . 85443) (
|
||||
PRINTERROR 85445 . 88661) (MSCHECKVARS1 88663 . 91616) (UNECCSPEC 91618 . 91896) (NECCSPEC 91898 .
|
||||
92245) (SPECVARP 92247 . 92774) (SHORTLST 92776 . 93232) (DOERROR 93234 . 93944) (MSMSGPRINT 93946 .
|
||||
94554)) (95700 110528 (MSPATHS 95710 . 99112) (MSPATHS1 99114 . 103349) (MSPATHS2 103351 . 106761) (
|
||||
MSONPATH 106763 . 107991) (MSPATHS4 107993 . 109075) (DASHES 109077 . 109603) (DOTABS 109605 . 109846)
|
||||
(BELOWMARKER 109848 . 110311) (MSPATHSPRINTFN 110313 . 110526)) (110914 114338 (MSFIND 110924 .
|
||||
111199) (MSEDITF 111201 . 112201) (MSEDITE 112203 . 113240) (EDITGETDEF 113242 . 114336)) (115344
|
||||
123945 (MSMARKCHANGED 115354 . 117078) (CHANGEMACRO 117080 . 117785) (CHANGEVAR 117787 . 118103) (
|
||||
CHANGEI.S. 118105 . 119438) (CHANGERECORD 119440 . 120311) (MSNEEDUNSAVE 120313 . 121305) (UNSAVEFNS
|
||||
121307 . 123943)) (124386 127876 (%. 124396 . 124536) (MASTERSCOPE 124538 . 125064) (MASTERSCOPE1
|
||||
125066 . 125934) (MASTERSCOPEXEC 125936 . 127874)) (127915 167565 (MSINTERPRETSET 127925 . 156459) (
|
||||
MSINTERPA 156461 . 156995) (MSGETBLOCKDEC 156997 . 159510) (LISTHARD 159512 . 160730) (MSMEMBSET
|
||||
160732 . 160877) (MSLISTSET 160879 . 161244) (MSHASHLIST 161246 . 161413) (MSHASHLIST1 161415 . 161741
|
||||
) (CHECKPATHS 161743 . 162383) (ONFILE 162385 . 167563)) (167566 190732 (MSINTERPRET 167576 . 184429)
|
||||
(VERBNOTICELIST 184431 . 185541) (MSOUTPUT 185543 . 185860) (MSCHECKEMPTY 185862 . 187066) (
|
||||
CHECKFORCHANGED 187068 . 187588) (MSSOLVE 187590 . 190730)))))
|
||||
STOP
|
||||
|
||||
Reference in New Issue
Block a user