diff --git a/sources/MACHINEINDEPENDENT b/sources/MACHINEINDEPENDENT index d13932940..67e15d341 100644 --- a/sources/MACHINEINDEPENDENT +++ b/sources/MACHINEINDEPENDENT @@ -1,12 +1,14 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "18-Jan-2024 10:40:56" {WMEDLEY}MACHINEINDEPENDENT.;38 117576 +(FILECREATED "29-Sep-2025 12:51:06"  +{DSK}kaplan>Local>medley3.5>working-medley>sources>MACHINEINDEPENDENT.;39 119579 :EDIT-BY rmk - :CHANGES-TO (FNS LISPSOURCEFILEP) + :CHANGES-TO (VARS MACHINEINDEPENDENTCOMS) - :PREVIOUS-DATE "20-Jul-2022 19:55:30" {WMEDLEY}MACHINEINDEPENDENT.;36) + :PREVIOUS-DATE "18-Jan-2024 10:40:56" +{DSK}kaplan>Local>medley3.5>working-medley>sources>MACHINEINDEPENDENT.;38) (PRETTYCOMPRINT MACHINEINDEPENDENTCOMS) @@ -28,10 +30,10 @@ (INITVARS (OK.TO.MODIFY.FNS)) [COMS (* ;  "FILEDATE, for finding out the creation date of source files, from the compiled files.") + (FNS FILEDATE COMPILEFILETYPE) (* ;; "FASL isn't loaded when MACHINEINDEPENDENT is, so we have to fake the FASL checker for now. It's defined in FASLOAD.") - (FNS FILEDATE) (P (MOVD? 'NILL 'FASL-FILEDATE] (P (MOVD? 'CL:FMAKUNBOUND 'UNDOABLY-FMAKUNBOUND)) (* ; @@ -1348,13 +1350,6 @@ WRITEFILE OF ") (* ; "FILEDATE, for finding out the creation date of source files, from the compiled files.") - - - -(* ;; -"FASL isn't loaded when MACHINEINDEPENDENT is, so we have to fake the FASL checker for now. It's defined in FASLOAD." -) - (DEFINEQ (FILEDATE @@ -1403,8 +1398,45 @@ WRITEFILE OF ") (COND (OLDPTR (SETFILEPTR STREAM OLDPTR))) (RETURN VALUE)))]) + +(COMPILEFILETYPE + [LAMBDA (CFILE) (* ; "Edited 29-Sep-2025 12:26 by rmk") + + (* ;; "Returns the type of compiler used to compile the compiled-file CFILE: CL:COMPILE-FILE IL:FAKE-COMPILE-FILE IL:BCOMP") + + (CL:WHEN CFILE + [CAR (NLSETQ + (RESETLST + [LET (STREAM COMPILER) + [if (SETQ STREAM (\GETSTREAM CFILE 'INPUT T)) + then [RESETSAVE NIL `(PROGN (SETFILEPTR ,STREAM ,(GETFILEPTR STREAM] + else (* ; + "OPENSTREAM used instead of INFILEP to allow for error correction.") + (RESETSAVE (SETQ STREAM (OPENSTREAM CFILE 'INPUT)) + `(PROGN (CLOSEF? OLDVALUE] + (CL:WHEN (RANDACCESSP STREAM) + (SETFILEPTR STREAM 0) + [if (FASL-FILEDATE STREAM T) + then (* ; " A Dfasl file") + 'CL:COMPILE-FILE + else (SETFILEPTR STREAM 0) (* ; "Any other filetype") + (CL:MULTIPLE-VALUE-BIND (ENV FORM) + (\PARSE-FILE-HEADER STREAM 'RETURN) + (CL:WHEN (LISTP FORM) + (* ; + "First expression is for compiled file") + (SELECTQ (MKATOM (CADDDR (CDR FORM))) + (COMPILE-FILEd 'FAKE-COMPILE-FILE) + 'BCOMPL))])])])]) ) + + +(* ;; +"FASL isn't loaded when MACHINEINDEPENDENT is, so we have to fake the FASL checker for now. It's defined in FASLOAD." +) + + (MOVD? 'NILL 'FASL-FILEDATE) (MOVD? 'CL:FMAKUNBOUND 'UNDOABLY-FMAKUNBOUND) @@ -2463,23 +2495,23 @@ This has little hope of working any more.") (LOCALVARS . T) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (12537 25962 (LOAD? 12547 . 14398) (FILESLOAD 14400 . 14689) (DOFILESLOAD 14691 . 22317) - (FINDFILE-WITH-EXTENSIONS 22319 . 25518) (READ-FILECREATED 25520 . 25960)) (26079 31400 (DMPHASH -26089 . 27683) (HASHOVERFLOW 27685 . 31398)) (32156 64264 (BKBUFS 32166 . 33285) (CHANGENAME 33287 . -33548) (CHNGNM 33550 . 35398) (CLBUFS 35400 . 36673) (DEFINE 36675 . 37399) (FNS.PUTDEF 37401 . 40816) - (EQMEMB 40818 . 41000) (EQUALN 41002 . 41831) (FNCHECK 41833 . 43840) (FNTYP1 43842 . 43939) (LCSKIP -43941 . 44785) (MAPRINT 44787 . 45733) (MKLIST 45735 . 45885) (NAMEFIELD 45887 . 47412) (NLIST 47414 - . 47749) (PRINTBELLS 47751 . 47877) (PROMPTCHAR 47879 . 49769) (RAISEP 49771 . 50032) (READFILE 50034 - . 52378) (READLINE 52380 . 57820) (REMPROPLIST 57822 . 58710) (RESETBUFS 58712 . 59162) (TAB 59164 . -59760) (UNSAVED1 59762 . 60867) (WRITEFILE 60869 . 62611) (CLOSE-AND-MAYBE-DELETE 62613 . 62957) ( -UNSAFE.TO.MODIFY 62959 . 64262)) (66619 69563 (FILEDATE 66629 . 69561)) (69793 96996 (FILEMAP 69803 . -70273) (\PARSE-FILE-HEADER 70275 . 74090) (GET-ENVIRONMENT-AND-FILEMAP 74092 . 76319) ( -LOOKUP-ENVIRONMENT-AND-FILEMAP 76321 . 78512) (GET-FILEMAP-FROM-FILECREATED 78514 . 79338) ( -\FILEMAP-HASHOVERFLOW 79340 . 84004) (FLUSHFILEMAPS 84006 . 84629) (LISPSOURCEFILEP 84631 . 86023) ( -LISPFILETYPE 86025 . 89274) (GETFILEMAP 89276 . 89695) (PUTFILEMAP 89697 . 91888) (UPDATEFILEMAP 91890 - . 96994)) (97662 101248 (LVLPRINT 97672 . 97845) (LVLPRIN1 97847 . 98029) (LVLPRIN2 98031 . 98263) ( -LVLPRIN 98265 . 99279) (LVLPRIN0 99281 . 101246)) (101282 106199 (FLUSHRIGHT 101292 . 102107) ( -PRINTPARA 102109 . 103207) (PRINTPARA1 103209 . 106197)) (106235 108520 (SUBLIS 106245 . 106853) ( -SUBPAIR 106855 . 108083) (DSUBLIS 108085 . 108518)) (108543 109143 (CONSTANTOK 108553 . 109141)) ( -110896 111601 (NLAMBDA.ARGS 110906 . 111599))))) + (FILEMAP (NIL (12643 26068 (LOAD? 12653 . 14504) (FILESLOAD 14506 . 14795) (DOFILESLOAD 14797 . 22423) + (FINDFILE-WITH-EXTENSIONS 22425 . 25624) (READ-FILECREATED 25626 . 26066)) (26185 31506 (DMPHASH +26195 . 27789) (HASHOVERFLOW 27791 . 31504)) (32262 64370 (BKBUFS 32272 . 33391) (CHANGENAME 33393 . +33654) (CHNGNM 33656 . 35504) (CLBUFS 35506 . 36779) (DEFINE 36781 . 37505) (FNS.PUTDEF 37507 . 40922) + (EQMEMB 40924 . 41106) (EQUALN 41108 . 41937) (FNCHECK 41939 . 43946) (FNTYP1 43948 . 44045) (LCSKIP +44047 . 44891) (MAPRINT 44893 . 45839) (MKLIST 45841 . 45991) (NAMEFIELD 45993 . 47518) (NLIST 47520 + . 47855) (PRINTBELLS 47857 . 47983) (PROMPTCHAR 47985 . 49875) (RAISEP 49877 . 50138) (READFILE 50140 + . 52484) (READLINE 52486 . 57926) (REMPROPLIST 57928 . 58816) (RESETBUFS 58818 . 59268) (TAB 59270 . +59866) (UNSAVED1 59868 . 60973) (WRITEFILE 60975 . 62717) (CLOSE-AND-MAYBE-DELETE 62719 . 63063) ( +UNSAFE.TO.MODIFY 63065 . 64368)) (66589 71430 (FILEDATE 66599 . 69531) (COMPILEFILETYPE 69533 . 71428) +) (71796 98999 (FILEMAP 71806 . 72276) (\PARSE-FILE-HEADER 72278 . 76093) (GET-ENVIRONMENT-AND-FILEMAP + 76095 . 78322) (LOOKUP-ENVIRONMENT-AND-FILEMAP 78324 . 80515) (GET-FILEMAP-FROM-FILECREATED 80517 . +81341) (\FILEMAP-HASHOVERFLOW 81343 . 86007) (FLUSHFILEMAPS 86009 . 86632) (LISPSOURCEFILEP 86634 . +88026) (LISPFILETYPE 88028 . 91277) (GETFILEMAP 91279 . 91698) (PUTFILEMAP 91700 . 93891) ( +UPDATEFILEMAP 93893 . 98997)) (99665 103251 (LVLPRINT 99675 . 99848) (LVLPRIN1 99850 . 100032) ( +LVLPRIN2 100034 . 100266) (LVLPRIN 100268 . 101282) (LVLPRIN0 101284 . 103249)) (103285 108202 ( +FLUSHRIGHT 103295 . 104110) (PRINTPARA 104112 . 105210) (PRINTPARA1 105212 . 108200)) (108238 110523 ( +SUBLIS 108248 . 108856) (SUBPAIR 108858 . 110086) (DSUBLIS 110088 . 110521)) (110546 111146 ( +CONSTANTOK 110556 . 111144)) (112899 113604 (NLAMBDA.ARGS 112909 . 113602))))) STOP diff --git a/sources/MACHINEINDEPENDENT.LCOM b/sources/MACHINEINDEPENDENT.LCOM index f87de65ba..3a4d6ef13 100644 Binary files a/sources/MACHINEINDEPENDENT.LCOM and b/sources/MACHINEINDEPENDENT.LCOM differ