From 547015e70ebfd6161cede0498c1e0209419d3130 Mon Sep 17 00:00:00 2001 From: rmkaplan Date: Tue, 24 Feb 2026 10:07:50 -0800 Subject: [PATCH] Make sure the right format is used to get definitions for recompile --- sources/COMPILE | 48 ++++++++++++++++++++++++------------------- sources/COMPILE.LCOM | Bin 27940 -> 27968 bytes 2 files changed, 27 insertions(+), 21 deletions(-) diff --git a/sources/COMPILE b/sources/COMPILE index 7b2a941c..1265d0d0 100644 --- a/sources/COMPILE +++ b/sources/COMPILE @@ -1,12 +1,12 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "24-Apr-2025 22:04:20" {WMEDLEY}COMPILE.;6 76628 +(FILECREATED "24-Feb-2026 10:04:53" {WMEDLEY}COMPILE.;7 76903 :EDIT-BY rmk - :CHANGES-TO (FNS BCOMPL.BODY BRECOMPILE) + :CHANGES-TO (FNS BRECOMPILE3 BRECOMPILE) - :PREVIOUS-DATE "24-Sep-2023 13:59:34" {WMEDLEY}COMPILE.;5) + :PREVIOUS-DATE "24-Apr-2025 22:04:20" {WMEDLEY}COMPILE.;6) (PRETTYCOMPRINT COMPILECOMS) @@ -491,7 +491,8 @@ (SETQ BLOCKS (NCONC1 BLOCKS X)))) (BRECOMPILE - [LAMBDA (FILES CFILE FNS NOBLOCKSFLG) (* ; "Edited 24-Apr-2025 22:04 by rmk") + [LAMBDA (FILES CFILE FNS NOBLOCKSFLG) (* ; "Edited 24-Feb-2026 10:00 by rmk") + (* ; "Edited 24-Apr-2025 22:04 by rmk") (* ; "Edited 5-Jul-2021 09:28 by rmk:") (* ;;; "FNS is a list of functions to be recompiled. The object is to make a file that looks exactly like that produced by BCOMPL except to greatly reduce the work by copying from CFILE the compiled definitions those functions not being recompiled.") @@ -632,6 +633,7 @@ (DECLARE (CL:SPECIAL FILECREATEDLOC)) (* ; " used by LOADFNSCAN") (WITH-READER-ENVIRONMENT ENV + (\EXTERNALFORMAT STREAM ENV) (create COMPFILEDESCR COMPFILESTREAM _ STREAM COMPFILEENV _ ENV @@ -851,27 +853,31 @@ (T (GO LP]) (BRECOMPILE3 - (LAMBDA (FN FILEMAPLST COREOK) (* bvm%: "29-Aug-86 22:07") - - (* * "returns definition of FN, either from in core, or from the file.") + [LAMBDA (FN FILEMAPLST COREOK) (* ; "Edited 24-Feb-2026 09:59 by rmk") + (* bvm%: "29-Aug-86 22:07") + +(* ;;; "returns definition of FN, either from in core, or from the file.") (LET (DEF STREAM) (COND - ((AND COREOK (EXPRP (SETQ DEF (VIRGINFN FN T)))) (* "Value is of the form (FN DEF FLG) where FLG=T means the definition was obtained from in core, so that it is ok to do spelling correction.") + ([AND COREOK (EXPRP (SETQ DEF (VIRGINFN FN T] + + (* ;; "Value is of the form (FN DEF FLG) where FLG=T means the definition was obtained from in core, so that it is ok to do spelling correction.") + (LIST FN DEF T)) (T (for FILEDESCR in FILEMAPLST - when (PROGN (SETQ STREAM (fetch COMPFILESTREAM of FILEDESCR)) + when [PROGN (SETQ STREAM (fetch COMPFILESTREAM of FILEDESCR)) (for Y in (CDR (fetch COMPFILEMAP of FILEDESCR)) - thereis (SETQ DEF (FASSOC FN (CDDR Y))))) + thereis (SETQ DEF (FASSOC FN (CDDR Y] do (SETFILEPTR STREAM (CADR DEF)) (SETQ DEF (WITH-READER-ENVIRONMENT (fetch COMPFILEENV of FILEDESCR) - (READ STREAM))) (* - "TEM is an arg to DEFINEQ, of the form (fn def)") + (READ STREAM))) (* ; + "TEM is an arg to DEFINEQ, of the form (fn def)") (COND ((NEQ FN (CAR DEF)) (ERROR '"filemap does not agree with contents of" (FULLNAME STREAM) T))) - (RETURN DEF))))))) + (RETURN DEF]) (BLOCKCOMPILE [LAMBDA (BLKNAME BLKFNS ENTRIES FLG) (* ; "Edited 6-Dec-86 03:59 by lmm") @@ -1518,14 +1524,14 @@ (ADDTOVAR LAMA ) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (3379 73129 (BCOMPL 3389 . 5039) (BCOMPL.BODY 5041 . 11639) (PRINT-COMPILE-HEADER 11641 + (FILEMAP (NIL (3379 73404 (BCOMPL 3389 . 5039) (BCOMPL.BODY 5041 . 11639) (PRINT-COMPILE-HEADER 11641 . 12704) (RESETOPENFILES 12706 . 13059) (BCOMPL1A 13061 . 19074) (BCOMPL2 19076 . 25891) (BCOMPL3 -25893 . 27242) (BLOCK%: 27244 . 27876) (BRECOMPILE 27878 . 42562) (BRECOMPILE1 42564 . 48416) ( -BRECOMPILE2 48418 . 49220) (BRECOMPILE3 49222 . 50598) (BLOCKCOMPILE 50600 . 52460) (BLOCKCOMPILE1 -52462 . 57547) (COMPSET 57549 . 60246) (COMPSETREAD 60248 . 61559) (COMPSETY 61561 . 61685) (COMPSETF -61687 . 61853) (RCOMP3 61855 . 63562) (TCOMPL 63564 . 63863) (RECOMPILE 63865 . 63948) (RECOMP? 63950 - . 64410) (COMPILE 64412 . 66401) (COMPILE1 66403 . 66991) (COMPILE1A 66993 . 68640) ( -SHOULD-BE-DWIMIFIED? 68642 . 69331) (COMPEM 69333 . 70057) (GETCFILE 70059 . 71790) (SPECVARS 71792 . -72347) (LOCALVARS 72349 . 72923) (GLOBALVARS 72925 . 73127)) (75479 76428 (COMPILEMODE 75489 . 76426)) +25893 . 27242) (BLOCK%: 27244 . 27876) (BRECOMPILE 27878 . 42742) (BRECOMPILE1 42744 . 48596) ( +BRECOMPILE2 48598 . 49400) (BRECOMPILE3 49402 . 50873) (BLOCKCOMPILE 50875 . 52735) (BLOCKCOMPILE1 +52737 . 57822) (COMPSET 57824 . 60521) (COMPSETREAD 60523 . 61834) (COMPSETY 61836 . 61960) (COMPSETF +61962 . 62128) (RCOMP3 62130 . 63837) (TCOMPL 63839 . 64138) (RECOMPILE 64140 . 64223) (RECOMP? 64225 + . 64685) (COMPILE 64687 . 66676) (COMPILE1 66678 . 67266) (COMPILE1A 67268 . 68915) ( +SHOULD-BE-DWIMIFIED? 68917 . 69606) (COMPEM 69608 . 70332) (GETCFILE 70334 . 72065) (SPECVARS 72067 . +72622) (LOCALVARS 72624 . 73198) (GLOBALVARS 73200 . 73402)) (75754 76703 (COMPILEMODE 75764 . 76701)) ))) STOP diff --git a/sources/COMPILE.LCOM b/sources/COMPILE.LCOM index ecab8389535b59bd9cc77158760fdc17420f4184..1dd78906f47e6bb8ce84ab82ae7ebc1f9405de18 100644 GIT binary patch delta 1009 zcmZWoO-~bH5O#}-Y~)}J(F-^pNlP=+u(H#rZ*6WjHyW$Zc)Go_8*Vq2i@E|*Kg>hd1Oo<2{vh>@O9$BQM`$p?;Ia|)1VqNnJwqUXc?I_T0QJba{#s)3WQ zlzq(N;VT8go67Czhw^eH#Y9+#8}aWo)Z*VyxORaF4n7DOeqS1nGNWo=s{d?6ug@w2 z@7B)X_xar0=tbtEqWlfX*thd)?E4b_9uvw+lo=oF+c!B($MxLYbfvHeR5uvZoWKuC zh;U}D$MbOTDBKUV{)aSdjinjchrG-#q2{lYZcieqTVF4Q?Za2Bvb&vuKIz$n{s zfHY2c6Q?jBh&w^m0>?aG3T8@P(L;+<2&V>z?op1@>UP5n^Ykf<;nBA5J6-{sU<}K5 ztnmHh$bD)acSUWWRMWw=tEh+yEkPz$C0L-uA!@M<*{wLs_2M z$HZhfI0I>djW?BQng)5dRE_5%SQp}c;yYPe^l^QH5om4gtv6e1K)IChrQc}Qn|mA2 zG8TF?GkFGWL+Icv_(2u@+=Tl2a%-)z+h!JVBKcX{n{i^2u|xo;q63IL@v7?D9fDT<7K(W8NsIvyTe97;{7;n5wUsL`#vf5<;~ C!~$&q delta 1039 zcmZuw&1w@-6m}9UG*F=+6&KpmU~LN~-k-U5ek{l|nWTZqWSFF-DY}SlXoE2gwF|{X zT&f^g<`HzOpz{JQd;r(o_zW&BBA(mPbb`)e?sv|2?>*;y=bq0e+Pf3&&GxJ_JS;H6 z1Tbb3-Dc$YVPPa!AeU!)VN6ofCfpVz4-XEzI|q-3y?%EWcJ@1iz3$^h8`esVdf*k; z8s#>ug|4z{o(sJJxjc?yr*QQ_ZUBK_-#aHq3#rK-_Jt{7JiGD5-tsfVbXR;%cPn1dxgF(v; zgRlnFkOC0+6rtc_s8di9_)gtLf*C1&)J{g=k6OwiGDTxW(xQ;ac^3^aO4GPsa+#tj zvS->bpaKt`8`6ZDA8fSHkDac%tsra!Xpkgh^y{W|ma&3{97DJxiHipz48y zstKW-8{lpQVG|*WvA2HO!Vu{75vYw5^W}~uKpmu0o<+&W&i*H