From 683ee45f57db78b9685b7899cd7f899e47cc9dbe Mon Sep 17 00:00:00 2001 From: rmkaplan Date: Tue, 12 May 2026 12:46:54 -0700 Subject: [PATCH] Bug in DUMPDB: Used FL in a PROG before it was bound --- library/DATABASEFNS | 26 +++++++++++--------------- library/DATABASEFNS.LCOM | Bin 7870 -> 7663 bytes 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/library/DATABASEFNS b/library/DATABASEFNS index e8b1c582..4742524c 100644 --- a/library/DATABASEFNS +++ b/library/DATABASEFNS @@ -1,19 +1,14 @@ (DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10) -(FILECREATED "11-May-2026 14:41:08" {DSK}matt>Interlisp>medley>library>DATABASEFNS.;3 19373 +(FILECREATED "12-May-2026 12:45:18" {MEDLEY}DATABASEFNS.;13 19361 - :EDIT-BY "mth" + :EDIT-BY rmk - :CHANGES-TO (FNS DUMPDB DBFILE LOADDB MAKEDB) + :CHANGES-TO (FNS DUMPDB MAKEDB) - :PREVIOUS-DATE " 2-May-2026 17:38:46" {DSK}matt>Interlisp>medley>library>DATABASEFNS.;1 -) + :PREVIOUS-DATE "11-May-2026 14:41:08" {MEDLEY}DATABASEFNS.;11) -(* ; " -Copyright (c) 1986, 1990-1993, 2024, 2026 by Xerox Corporation. -") - (PRETTYCOMPRINT DATABASEFNSCOMS) (RPAQQ DATABASEFNSCOMS @@ -166,7 +161,8 @@ Copyright (c) 1986, 1990-1993, 2024, 2026 by Xerox Corporation. (DEFINEQ (DUMPDB - [LAMBDA (FILE PROPFLG) (* ; "Edited 11-May-2026 14:41 by mth") + [LAMBDA (FILE PROPFLG) (* ; "Edited 12-May-2026 12:45 by rmk") + (* ; "Edited 11-May-2026 14:41 by mth") (* ; "Edited 8-May-2026 16:18 by mth") (* ; "Edited 2-May-2026 17:32 by mth") (* ; "Edited 29-Apr-2026 17:42 by mth") @@ -191,7 +187,7 @@ Copyright (c) 1986, 1990-1993, 2024, 2026 by Xerox Corporation. (SAVEDDEFAULTCOPYRIGHTOWNER DEFAULTCOPYRIGHTOWNER)) (CL:UNWIND-PROTECT (PROG (DBFILE DBFN DBROOTFN FLCPR (FL (ROOTFILENAME FILE)) - (FNS (FILEFNSLST FL))) + (FNS (FILEFNSLST FILE))) (SETQ DBFN (PACKFILENAME 'EXTENSION 'DATABASE 'VERSION NIL 'BODY FILE)) (SETQ DBROOTFN (ROOTFILENAME DBFN)) (CL:UNLESS (OR (EQ COPYRIGHTFLG 'NEVER) @@ -337,6 +333,7 @@ Copyright (c) 1986, 1990-1993, 2024, 2026 by Xerox Corporation. (MAKEDB [LAMBDA (F) (* DECLARATIONS%: UNDOABLE) + (* ; "Edited 12-May-2026 12:37 by rmk") (* ; "Edited 11-May-2026 14:38 by mth") (* rmk%: " 9-NOV-83 02:56") (DECLARE (GLOBALVARS SAVEDBFLG MSFILETABLE DWIMWAIT)) @@ -388,9 +385,8 @@ Copyright (c) 1986, 1990-1993, 2024, 2026 by Xerox Corporation. (RESETSAVE DWIMIFYCOMPFLG T) ) -(PUTPROPS DATABASEFNS COPYRIGHT ("Xerox Corporation" 1986 1990 1991 1992 1993 2024 2026)) (DECLARE%: DONTCOPY - (FILEMAP (NIL (1804 6952 (DBFILE 1814 . 3582) (DBFILE1 3584 . 5094) (DBFILE2 5096 . 6318) (LOAD 6320 - . 6550) (LOADFROM 6552 . 6740) (MAKEFILE 6742 . 6950)) (7008 18761 (DUMPDB 7018 . 12505) (LOADDB -12507 . 17578) (MAKEDB 17580 . 18759))))) + (FILEMAP (NIL (1666 6814 (DBFILE 1676 . 3444) (DBFILE1 3446 . 4956) (DBFILE2 4958 . 6180) (LOAD 6182 + . 6412) (LOADFROM 6414 . 6602) (MAKEFILE 6604 . 6812)) (6870 18839 (DUMPDB 6880 . 12478) (LOADDB +12480 . 17551) (MAKEDB 17553 . 18837))))) STOP diff --git a/library/DATABASEFNS.LCOM b/library/DATABASEFNS.LCOM index be3d2c37a333b494b759b1f0408842d5cf043cde..4d402590ff222e67a99f648e9fa25491647942d3 100644 GIT binary patch delta 1288 zcmZuw%Wl(95N%Q(B8#B5kSo1q7OjRJ% z?xd1LHSKrIG}j>(8;#|0pSumU6{v!x0ro84{gj z=Z^1Xf8{U7f}jc-w0y5sb!vFlA$odc@!}F>{+yeh%5*MF;ja@N%q(U)(Yu+Gh5V7W zn*UIL9OrZK-_iB$r082G+L>L*uI8h+v$rlC*B{1UHj~tRo__Ob>SOeMb}z=&IoeZT zrPU6B>-ylJaa7T8F{SDd`|Daw0bJ2BEyA#Ciz+b9fFSfRw#ulSX$)#2jKu@v3_=lv zeS{i%icp;(;v+fGK@$Q!s?ww%0jls6=PIoDqM0yK+@ujBQCVLo;YvzPDD5Y8n&!9x zzUPIpwfzaOk5##!#)JT#djj9h2|`dNs&PpaS%$6%fExDXahDF1}PI~20Unc zA;OIJw==CLbO_1XNSaKcV)?)ftv4{685GdS*m4w%EwD2~YnnkE4{Sz*CSs;e#`F|U z)MNsNqXt$-*yVV&n9PzaH5iVf4F;o}q=Nw^#so1%g7L=qaYsMq=X=E9Q1Mz_zfr4) zF*nf-!2Ph=PKak5ast$}5va+dGme!O0^#y_#AK9?`$vcZuII*w6z|os3%-&oI>HAu zFe$(;BQ|x2D#|FExS&AUv%5eIz{^3ya{=8OJ}rLjAl5?R#sKaDa7v(9>_2k)K+#d* WY(|T|6slQOKmJ?TIDf`%IJtiU=0F4h delta 1557 zcmbVM&u<%55RMa6goUCuikh~lVzdIumPoqq$Nnr>T6^EdR@S@D?%Ihj2&b_cOR*if zJ`f>f#Eo0UUXl103gw0X^?%@B;LM!^V&2+b+Y+bx@VxKMy!qz)-pu^{^!LwRp3lf( zvv+$)RjLEwHYYYE3Y3&*{o`p>9o=qP5YDU!Hb*9 zuzz{ozpY#kE+)OnZN+sGr|QJQ3*w`vtc-WfH2}?~x=pA87nA-RVTKUTu6m>A{TCnG zP;{$a!x!MTn=Q8re(1RP*K|$<{tYk_ukHJ=9`fkuNP)}V6vO-vltz?tu_Qy*BH<*$ z1%+%9o*`q^RNyTM0(rPEbO>6OCXwZrp0Uqg?13qZrGzD%{ zJQhjPb%h7aBoHSd?wu;u1H(JVB9Ux>aSaj?Ckul@4LdP21`MgjP6wM*)*4f_?37v>QZeT9 z04QG(14`*eAc`#315;H?UmhIHh-E-6Y;~i?aXpc-iA4eH!)f~o5PXYGqp7Zp*p<1X zwiX4a99vxj!er`Le+0P%VIV(p`>c*ADuY0DLT9degypq@Zjjj(5va