From 3a04303d9374e8573f81d2b760a9ae15ad93fe62 Mon Sep 17 00:00:00 2001 From: Larry Masinter Date: Mon, 6 Dec 2021 21:36:01 -0800 Subject: [PATCH] reduce errors during GREET from out-of-order problems (#596) --- greetfiles/MEDLEYDIR-INIT | 20 +++++--- greetfiles/MEDLEYDIR-INIT.LCOM | Bin 1785 -> 1847 bytes sources/MEDLEYDIR | 87 +++++++++++++++++---------------- sources/MEDLEYDIR.LCOM | Bin 4209 -> 4183 bytes 4 files changed, 56 insertions(+), 51 deletions(-) diff --git a/greetfiles/MEDLEYDIR-INIT b/greetfiles/MEDLEYDIR-INIT index 55535ff7..bc274aea 100644 --- a/greetfiles/MEDLEYDIR-INIT +++ b/greetfiles/MEDLEYDIR-INIT @@ -1,18 +1,21 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "14-Nov-2021 22:34:49" {DSK}larry>medley>greetfiles>MEDLEYDIR-INIT.;2 2303 +(FILECREATED " 2-Dec-2021 21:13:55" {DSK}larry>medley>greetfiles>MEDLEYDIR-INIT.;3 2392 changes to%: (VARS MEDLEYDIR-INITCOMS) + (FNS INTERLISPMODE) - previous date%: "14-Nov-2021 22:10:37" {DSK}larry>medley>greetfiles>medleydir-INIT.;1) + previous date%: "14-Nov-2021 22:34:49" {DSK}larry>medley>greetfiles>MEDLEYDIR-INIT.;1) (PRETTYCOMPRINT MEDLEYDIR-INITCOMS) (RPAQQ MEDLEYDIR-INITCOMS - ((P (LOAD? (CONCAT (OR (UNIX-GETENV "MEDLEYDIR") + ([P (LOAD? (CONCAT (OR (UNIX-GETENV "MEDLEYDIR") "") - "/sources/MEDLEYDIR.LCOM"))) + "/sources/MEDLEYDIR.LCOM")) + (MEDLEY-INIT-VARS) + (KEYACTION 'LOCK '(LOCKTOGGLE . IGNORE] (FILES BACKGROUND-YIELD) (VARS (FILING.ENUMERATION.DEPTH 1) [LOGINDIR (DIRECTORYNAME (OR (UNIX-GETENV "LOGINDIR") @@ -20,13 +23,16 @@ [USERGREETFILES `((,LOGINDIR "INIT" COM) (,LOGINDIR "INIT"] (COPYRIGHTSRESERVED NIL)) - [P (KEYACTION 'LOCK '(LOCKTOGGLE . IGNORE] (FNS INTERLISPMODE))) (LOAD? (CONCAT (OR (UNIX-GETENV "MEDLEYDIR") "") "/sources/MEDLEYDIR.LCOM")) +(MEDLEY-INIT-VARS) + +(KEYACTION 'LOCK '(LOCKTOGGLE . IGNORE)) + (FILESLOAD BACKGROUND-YIELD) (RPAQQ FILING.ENUMERATION.DEPTH 1) @@ -38,8 +44,6 @@ (,LOGINDIR "INIT"))) (RPAQQ COPYRIGHTSRESERVED NIL) - -(KEYACTION 'LOCK '(LOCKTOGGLE . IGNORE)) (DEFINEQ (INTERLISPMODE @@ -56,5 +60,5 @@ :PACKAGE "INTERLISP"]) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (1455 2280 (INTERLISPMODE 1465 . 2278))))) + (FILEMAP (NIL (1544 2369 (INTERLISPMODE 1554 . 2367))))) STOP diff --git a/greetfiles/MEDLEYDIR-INIT.LCOM b/greetfiles/MEDLEYDIR-INIT.LCOM index 712b0aebbe357dffd5aea6d1cb5beb4393f56535..7d2293bfe8b3e21e1953e62baed28eca18ee0e7f 100644 GIT binary patch delta 366 zcmey#yPa=BxQK$0u1jjNu91O}p@Na2m7%efsp-UQw|Zku1tlXBUBCP?h@7E;m5G6s zp{bHWQc-Gher`c#PHKumaz(QiUx;gvk7sazufL0{LS~+Vl3S>cj{>q8 zdU|?F3Mq*tK#k~T8yi^}Stx08X}Ed%xH<>9$~cC&x+o}NbDfgH4;h=PW%tBa3oq^_r*XNYc?V^FZB!sLByW=xt~lT}$fCUdgM pF>+1rVR4?E&!!AyeP+>^9L}07fUaxu9yZI(J6Ty7S^PYGxBy9FT(kfH delta 324 zcmdna_mg)*_~grsViR*+>WwrNloZT${qoCnjSP$o6$~t`j7_Z!jFl9Uic*vFa|<$a zQd1O?GZORCQ;Sut6u9#8OENO^(iJlE6qMXTeS8#2mR8X8y`n@_A($w{qD$t;>I z#-ysL;HF@ppylG~<{0V|qU-DE?FuqX*VQk~Gsxf1*VQjXOH+X%f`M_eBU2b-^5oe} zZkw5zZ5e^4_ON&`a!sydbDAv9Di36tu_{ltW968f#Ht_@prGOH8tLd9;_2_Fpb;4A mAL6RuW_>mm#>wAV%~||BeYgPifmPN3 diff --git a/sources/MEDLEYDIR b/sources/MEDLEYDIR index afcfd949..e8fe074b 100644 --- a/sources/MEDLEYDIR +++ b/sources/MEDLEYDIR @@ -1,26 +1,26 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "24-Aug-2021 08:30:09" {DSK}larry>medley>sources>MEDLEYDIR.;10 6764 - changes to%: (VARS MEDLEYDIRCOMS MEDLEY-INIT-VARS) - (FNS MEDLEYDIR) +(FILECREATED " 2-Dec-2021 20:43:35" {DSK}larry>medley>sources>MEDLEYDIR.;14 6103 - previous date%: "24-Aug-2021 07:57:05" {DSK}larry>medley>sources>MEDLEYDIR.;5) + changes to%: (FNS MEDLEYDIR) + + previous date%: " 2-Dec-2021 20:32:45" {DSK}larry>medley>sources>MEDLEYDIR.;12) (PRETTYCOMPRINT MEDLEYDIRCOMS) -(RPAQQ MEDLEYDIRCOMS [ - (* ;; "set up initialization for file paths relative to where Medley is installed. This assumes that the environment variable MEDLEYDIR is set (usually by the ./run-medley script) to the (unix path) and all of the other directories variables are set relative to that (by MEDLEY-INIT-VARS)") +(RPAQQ MEDLEYDIRCOMS + [ + (* ;; "set up initialization for file paths relative to where Medley is installed. This assumes that the environment variable MEDLEYDIR is set (usually by the ./run-medley script) to the (unix path) and all of the other directories variables are set relative to that (by MEDLEY-INIT-VARS)") - (FNS MEDLEY-INIT-VARS MEDLEYDIR) - (INITVARS (MEDLEYDIR)) - (ADDVARS (BEFORESYSOUTFORMS (SETQ MEDLEYDIR)) - (BEFOREMAKESYSFORMS (SETQ MEDLEYDIR)) - (AFTERSYSOUTFORMS (MEDLEY-INIT-VARS)) - (AFTERMAKESYSFORMS (MEDLEY-INIT-VARS))) - (VARS MEDLEY-INIT-VARS) - (DECLARE%: EVAL@COMPILE DOCOPY (ADDVARS (GLOBALVARS MEDLEYDIR - MEDLEY-INIT-VARS]) + (FNS MEDLEY-INIT-VARS MEDLEYDIR) + (INITVARS (MEDLEYDIR)) + (ADDVARS (BEFORESYSOUTFORMS (SETQ MEDLEYDIR)) + (BEFOREMAKESYSFORMS (SETQ MEDLEYDIR)) + (AFTERSYSOUTFORMS (MEDLEY-INIT-VARS)) + (AFTERMAKESYSFORMS (MEDLEY-INIT-VARS))) + (VARS MEDLEY-INIT-VARS) + (DECLARE%: EVAL@COMPILE DOCOPY (ADDVARS (GLOBALVARS MEDLEYDIR MEDLEY-INIT-VARS]) @@ -31,7 +31,8 @@ (DEFINEQ (MEDLEY-INIT-VARS - [LAMBDA (CLEAR) (* ; "Edited 21-Aug-2021 18:23 by larry") + [LAMBDA (CLEAR) (* ; + "Edited 21-Aug-2021 18:23 by larry") (* ;; "MEDLEY-INIT-VARS has variables that might need to get reset. ") @@ -61,7 +62,8 @@ NIL]) (MEDLEYDIR - [LAMBDA (DIRNAME FILENAME OUTPUT NOERROR) (* ; "Edited 14-Dec-2020 17:12 by larry") + [LAMBDA (DIRNAME FILENAME OUTPUT NOERROR) (* ; + "Edited 2-Dec-2021 20:23 by kaplan") (DECLARE (GLOBALVARS MEDLEYDIR)) (if (NULL DIRNAME) then (if (OR (NOT (BOUNDP 'MEDLEYDIR)) @@ -83,10 +85,10 @@ else (OR NOERROR (INFILEP FILENAME) (ERROR "No such medley file" FILENAME))) else (OR (DIRECTORYNAME (CONCAT (MEDLEYDIR) - DIRNAME)) - (IF NOERROR - THEN NIL - ELSE (ERROR "No such medley directory" DIRNAME]) + DIRNAME ">")) + (if NOERROR + then NIL + else (ERROR "No such medley directory" DIRNAME]) ) (RPAQ? MEDLEYDIR ) @@ -99,31 +101,30 @@ (ADDTOVAR AFTERMAKESYSFORMS (MEDLEY-INIT-VARS)) -(RPAQQ MEDLEY-INIT-VARS ([LISPUSERSDIRECTORIES (MEDLEYDIR '("library" "lispusers" - "internal/library" "greetfiles" - "docs/documentation tools"] - [LISPSOURCEDIRECTORIES (MEDLEYDIR '("sources"] - (LISPSOURCEDIRECTORY (CAR LISPSOURCEDIRECTORIES)) - (IRM.HOST&DIR (MEDLEYDIR '"docs/dinfo")) - (IRM.DINFOGRAPH) - (DIRECTORIES (APPEND LISPUSERSDIRECTORIES LISPSOURCEDIRECTORIES)) - [LOGINHOST/DIR (DIRECTORYNAME (OR (UNIX-GETENV "LOGINDIR") - (UNIX-GETENV "HOME"] - [USERGREETFILES `((,LOGINHOST/DIR "INIT" COM) - (,LOGINHOST/DIR "INIT"] - (DISPLAYFONTDIRECTORIES (MEDLEYDIR '("fonts/displayfonts" - "fonts/altofonts" "fonts/big" - "fonts/other") - NIL NIL T)) - (POSTSCRIPTFONTDIRECTORIES (MEDLEYDIR '("fonts/postscriptfonts") - NIL NIL T)) - (INTERPRESSFONTDIRECTORIES (MEDLEYDIR '("fonts/ipfonts") - NIL NIL T)) - (XCL::*WHERE-IS-CASH-FILES*))) +(RPAQQ MEDLEY-INIT-VARS + ([LISPUSERSDIRECTORIES (MEDLEYDIR '("library" "lispusers" "internal/library" "greetfiles" + "docs/documentation tools"] + [LISPSOURCEDIRECTORIES (MEDLEYDIR '("sources"] + (LISPSOURCEDIRECTORY (CAR LISPSOURCEDIRECTORIES)) + (IRM.HOST&DIR (MEDLEYDIR '"docs/dinfo")) + (IRM.DINFOGRAPH) + (DIRECTORIES (APPEND LISPUSERSDIRECTORIES LISPSOURCEDIRECTORIES)) + [LOGINHOST/DIR (DIRECTORYNAME (OR (UNIX-GETENV "LOGINDIR") + (UNIX-GETENV "HOME"] + [USERGREETFILES `((,LOGINHOST/DIR "INIT" COM) + (,LOGINHOST/DIR "INIT"] + (DISPLAYFONTDIRECTORIES (MEDLEYDIR '("fonts/displayfonts" "fonts/altofonts" "fonts/big" + "fonts/other") + NIL NIL T)) + (POSTSCRIPTFONTDIRECTORIES (MEDLEYDIR '("fonts/postscriptfonts") + NIL NIL T)) + (INTERPRESSFONTDIRECTORIES (MEDLEYDIR '("fonts/ipfonts") + NIL NIL T)) + (XCL::*WHERE-IS-CASH-FILES*))) (DECLARE%: EVAL@COMPILE DOCOPY (ADDTOVAR GLOBALVARS MEDLEYDIR MEDLEY-INIT-VARS) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (1665 4710 (MEDLEY-INIT-VARS 1675 . 3223) (MEDLEYDIR 3225 . 4708))))) + (FILEMAP (NIL (1380 4562 (MEDLEY-INIT-VARS 1390 . 3004) (MEDLEYDIR 3006 . 4560))))) STOP diff --git a/sources/MEDLEYDIR.LCOM b/sources/MEDLEYDIR.LCOM index d416ed5b9735bb0ff09e87b74b4b057cbd9a2fa9..10c67d9125909b06199868fef77d117d1ad82621 100644 GIT binary patch delta 610 zcmaKoO>5L(5Xa3fyKSC*NsEe<+A>6?NhL9P@~m`&x`ZYxk!;qcsaOTE-A#3&HpQ+5 zwc=5{xjxW~pFr@WD4zA`sR!}uSw!eJaMJZqdToRm#`big#_FL4ZbF%vX1(;=9HF@wZ7KlEemh7&D1hGCdsyK{t(=RQ@5 z!Y~TkQOgNb!oTNc1@bz7LLeVb=I`VL!uy3?WU2TJ`LcLk`X`8c3`M>c8^TYXANew# z9z!c-5Ho!I#rH;zPveKZC~8OeX9n2i&ByI%IdobcnDsi(jlM4#~bxWK^J{C{oO1t8ufWdpRhMXv^B6mu6kqcv!r&KheMAw~##-U#kE|oQ` zxLnqe>j!*OzJUI>@=fH~N~ZFnk}3YFB*?hhL4K}gy1%6fP9-0`9VtfcNoxg?&Ec2E Ki~4+3)gxkRZ`t}79aOKf9Kq{@Ez9AP@`X;MEe@`Wm?q!KNU(iTo73h3v#8)!)^)(XdS3 zk5!a+@_p>psl*ssJjAna?#5zf5I(1d(ae};TLtihXb7;%Wx#gNZ8yYB-3dI5H zh$foO*~;iU@%A4{1G|r=Or#j{PAZgpnmUI}kZ|@g33c9(K9Z-q$Oq|J