github.com/Interlisp.medley
1
0
Fork 0
mirror of synced 2026-04-30 21:49:38 +00:00
Code Issues Projects Releases Wiki Activity

Adjustments wrt WITH-READER-ENVIRONMENT, and a little cleanup

Browse Source
This commit is contained in:
rmkaplan
2026-02-25 12:42:30 -08:00
parent 8e7463cbc0
commit 80a47b1409
8 changed files with 168 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
sources/FILEPKG
View File

@@ -1,12 +1,12 @@
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
(FILECREATED "23-Feb-2026 00:54:21" {WMEDLEY}<sources>FILEPKG.;59 275343
(FILECREATED "25-Feb-2026 10:07:03" {WMEDLEY}<sources>FILEPKG.;61 275774
:EDIT-BY rmk
:CHANGES-TO (FNS IMPORTFILESCAN FILEGETDEF.FNS GETDEFCURRENT)
:CHANGES-TO (FNS FILEGETDEF.FNS)
:PREVIOUS-DATE "22-Feb-2026 18:02:21" {WMEDLEY}<sources>FILEPKG.;56)
:PREVIOUS-DATE "23-Feb-2026 00:54:21" {WMEDLEY}<sources>FILEPKG.;59)
(PRETTYCOMPRINT FILEPKGCOMS)
@@ -2908,7 +2908,8 @@ compiling " T)
NIL) finally (RETURN 'NOBIND])
(FILEGETDEF.FNS
[LAMBDA (NAME TYPE SOURCE OPTIONS) (* ; "Edited 23-Feb-2026 00:37 by rmk")
[LAMBDA (NAME TYPE SOURCE OPTIONS) (* ; "Edited 25-Feb-2026 10:06 by rmk")
(* ; "Edited 23-Feb-2026 00:37 by rmk")
(* bvm%: "29-Aug-86 22:30")
(LET (MAP ENV)
(COND
@@ -2930,7 +2931,12 @@ compiling " T)
(LIST (READ SOURCE)
(READ SOURCE)))
(T (CADR (READ SOURCE])]
(T (CADR (FASSOC NAME (LOADEFS NAME SOURCE])
(T
(* ;; "RMK: The NLSETQ is because LOADFNS for FNS seems to disregard NOERROR and crash out when the target is FUNCTIONS, like WITH-READER-ENVIRONMENT")
(CADR (FASSOC NAME (CL:IF (EQMEMB 'NOERROR OPTIONS)
[CAR (NLSETQ (LOADFNS NAME SOURCE 'GETDEF]
(LOADFNS NAME SOURCE 'GETDEF))])
(FILEPKGCOMS.PUTDEF
[LAMBDA (NAME TYPE DEFINITION REASON) (* lmm "15-Jul-85 11:29")
@@ -3043,14 +3049,14 @@ compiling " T)
(ADDTOVAR USERMACROS
(M NIL (MAKE FILE FILE))
(M (X . Y)
(E (MARKASCHANGED (COND ((LISTP 'X)
(CAR 'X))
(T 'X))
'USERMACROS)
T)
(ORIGINAL (M X . Y)))
(M NIL (MAKE FILE FILE)))
(ORIGINAL (M X . Y))))
(ADDTOVAR EDITMACROS
(M (X . Y)
@@ -4872,46 +4878,46 @@ compiling " T)
(ADDTOVAR LAMA FILEPKGTYPE FILEPKGCOM FILEPKGCHANGES)
)
(DECLARE%: DONTCOPY
(FILEMAP (NIL (18922 20595 (SEARCHPRETTYTYPELST 18932 . 19901) (PRETTYDEFMACROS 19903 . 20339) (
FILEPKGCOMPROPS 20341 . 20593)) (21408 55807 (CLEANUP 21418 . 22808) (COMPILEFILES 22810 . 23086) (
COMPILEFILES0 23088 . 23901) (CONTINUEDIT 23903 . 25280) (MAKEFILE 25282 . 37008) (FILECHANGES 37010
. 39774) (FILEPKG.MERGECHANGES 39776 . 40411) (FILEPKG.CHANGEDFNS 40413 . 40725) (MAKEFILE1 40727 .
44939) (COMPILE-FILE? 44941 . 46635) (MAKEFILES 46637 . 48165) (ADDFILE 48167 . 50710) (ADDFILE0 50712
. 54836) (LISTFILES 54838 . 55805)) (56479 90278 (FILEPKGCHANGES 56489 . 57668) (GETFILEPKGTYPE 57670
. 60620) (MARKASCHANGED 60622 . 62253) (FILECOMS 62255 . 62639) (WHEREIS 62641 . 64383) (
SMASHFILECOMS 64385 . 64613) (FILEFNSLST 64615 . 64781) (FILECOMSLST 64783 . 65269) (UPDATEFILES 65271
. 69769) (INFILECOMS? 69771 . 71614) (INFILECOMTAIL 71616 . 72734) (INFILECOMS 72736 . 72897) (
INFILECOM 72899 . 82917) (INFILECOMSVALS 82919 . 83226) (INFILECOMSVAL 83228 . 84236) (INFILECOMSPROP
84238 . 85031) (IFCPROPS 85033 . 86113) (IFCEXPRTYPE 86115 . 86731) (IFCPROPSCAN 86733 . 87694) (
IFCDECLARE 87696 . 88955) (INFILEPAIRS 88957 . 89256) (INFILECOMSMACRO 89258 . 90276)) (90313 120999 (
FILES? 90323 . 92434) (FILES?1 92436 . 93138) (FILES?PRINTLST 93140 . 93922) (ADDTOFILES? 93924 .
104467) (ADDTOFILE 104469 . 105385) (WHATIS 105387 . 107363) (ADDTOCOMS 107365 . 108903) (ADDTOCOM
108905 . 115392) (ADDTOCOM1 115394 . 116565) (ADDNEWCOM 116567 . 117617) (MAKENEWCOM 117619 . 119466)
(DEFAULTMAKENEWCOM 119468 . 120997)) (121069 123886 (MERGEINSERT 121079 . 123422) (MERGEINSERT1 123424
. 123884)) (124040 125401 (ADDTOFILEKEYLST 124050 . 125399)) (125518 136319 (DELFROMFILES 125528 .
126358) (DELFROMCOMS 126360 . 128039) (DELFROMCOM 128041 . 133806) (DELFROMCOM1 133808 . 134607) (
REMOVEITEM 134609 . 135485) (MOVETOFILE 135487 . 136317)) (136533 138904 (SAVEPUT 136543 . 138902)) (
139029 147272 (UNMARKASCHANGED 139039 . 140523) (PREEDITFN 140525 . 143006) (POSTEDITPROPS 143008 .
145302) (POSTEDITALISTS 145304 . 147270)) (147417 166961 (ALISTS.GETDEF 147427 . 147806) (
ALISTS.WHENCHANGED 147808 . 148454) (CLEARCLISPARRAY 148456 . 149634) (EXPRESSIONS.WHENCHANGED 149636
. 150014) (MAKEALISTCOMS 150016 . 151031) (MAKEFILESCOMS 151033 . 152363) (MAKELISPXMACROSCOMS 152365
. 154383) (MAKEPROPSCOMS 154385 . 155011) (MAKEUSERMACROSCOMS 155013 . 156830) (PROPS.WHENCHANGED
156832 . 157453) (FILEGETDEF.LISPXMACROS 157455 . 158754) (FILEGETDEF.ALISTS 158756 . 159347) (
FILEGETDEF.RECORDS 159349 . 160276) (FILEGETDEF.PROPS 160278 . 161073) (FILEGETDEF.MACROS 161075 .
161957) (FILEGETDEF.VARS 161959 . 162562) (FILEGETDEF.FNS 162564 . 163878) (FILEPKGCOMS.PUTDEF 163880
. 165822) (FILES.PUTDEF 165824 . 166692) (VARS.PUTDEF 166694 . 166837) (FILES.WHENCHANGED 166839 .
166959)) (168983 176214 (RENAME 168993 . 170438) (CHANGECALLERS 170440 . 176212)) (176215 224318 (
SHOWDEF 176225 . 177422) (COPYDEF 177424 . 180172) (GETDEF 180174 . 182717) (GETDEFCOM 182719 . 183685
) (GETDEFCOM0 183687 . 184880) (GETDEFCURRENT 184882 . 191388) (GETDEFERR 191390 . 192660) (
GETDEFFROMFILE 192662 . 196891) (GETDEFSAVED 196893 . 197981) (PUTDEF 197983 . 198690) (EDITDEF 198692
. 199675) (DEFAULT.EDITDEF 199677 . 202515) (EDITDEF.FILES 202517 . 202722) (LOADDEF 202724 . 202900)
(DWIMDEF 202902 . 203756) (DELDEF 203758 . 206652) (DELFROMLIST 206654 . 207158) (HASDEF 207160 .
213397) (GETFILEDEF 213399 . 213911) (SAVEDEF 213913 . 215601) (UNSAVEDEF 215603 . 216499) (
COMPAREDEFS 216501 . 220307) (COMPARE 220309 . 221013) (TYPESOF 221015 . 224316)) (224468 232716 (
FILEPKGCOM 224478 . 229254) (FILEPKGTYPE 229256 . 232714)) (244749 262438 (FINDCALLERS 244759 . 245389
) (EDITCALLERS 245391 . 256322) (EDITFROMFILE 256324 . 261753) (FINDATS 261755 . 262027) (LOOKIN
262029 . 262436)) (262439 264110 (SEPRCASE 262449 . 264108)) (264627 269820 (IMPORTFILE 264637 .
265607) (IMPORTEVAL 265609 . 266495) (IMPORTFILESCAN 266497 . 267100) (CHECKIMPORTS 267102 . 268358) (
GATHEREXPORTS 268360 . 269228) (\DUMPEXPORTS 269230 . 269818)) (270158 272228 (CLEARFILEPKG 270168 .
272226)))))
(FILEMAP (NIL (18893 20566 (SEARCHPRETTYTYPELST 18903 . 19872) (PRETTYDEFMACROS 19874 . 20310) (
FILEPKGCOMPROPS 20312 . 20564)) (21379 55778 (CLEANUP 21389 . 22779) (COMPILEFILES 22781 . 23057) (
COMPILEFILES0 23059 . 23872) (CONTINUEDIT 23874 . 25251) (MAKEFILE 25253 . 36979) (FILECHANGES 36981
. 39745) (FILEPKG.MERGECHANGES 39747 . 40382) (FILEPKG.CHANGEDFNS 40384 . 40696) (MAKEFILE1 40698 .
44910) (COMPILE-FILE? 44912 . 46606) (MAKEFILES 46608 . 48136) (ADDFILE 48138 . 50681) (ADDFILE0 50683
. 54807) (LISTFILES 54809 . 55776)) (56450 90249 (FILEPKGCHANGES 56460 . 57639) (GETFILEPKGTYPE 57641
. 60591) (MARKASCHANGED 60593 . 62224) (FILECOMS 62226 . 62610) (WHEREIS 62612 . 64354) (
SMASHFILECOMS 64356 . 64584) (FILEFNSLST 64586 . 64752) (FILECOMSLST 64754 . 65240) (UPDATEFILES 65242
. 69740) (INFILECOMS? 69742 . 71585) (INFILECOMTAIL 71587 . 72705) (INFILECOMS 72707 . 72868) (
INFILECOM 72870 . 82888) (INFILECOMSVALS 82890 . 83197) (INFILECOMSVAL 83199 . 84207) (INFILECOMSPROP
84209 . 85002) (IFCPROPS 85004 . 86084) (IFCEXPRTYPE 86086 . 86702) (IFCPROPSCAN 86704 . 87665) (
IFCDECLARE 87667 . 88926) (INFILEPAIRS 88928 . 89227) (INFILECOMSMACRO 89229 . 90247)) (90284 120970 (
FILES? 90294 . 92405) (FILES?1 92407 . 93109) (FILES?PRINTLST 93111 . 93893) (ADDTOFILES? 93895 .
104438) (ADDTOFILE 104440 . 105356) (WHATIS 105358 . 107334) (ADDTOCOMS 107336 . 108874) (ADDTOCOM
108876 . 115363) (ADDTOCOM1 115365 . 116536) (ADDNEWCOM 116538 . 117588) (MAKENEWCOM 117590 . 119437)
(DEFAULTMAKENEWCOM 119439 . 120968)) (121040 123857 (MERGEINSERT 121050 . 123393) (MERGEINSERT1 123395
. 123855)) (124011 125372 (ADDTOFILEKEYLST 124021 . 125370)) (125489 136290 (DELFROMFILES 125499 .
126329) (DELFROMCOMS 126331 . 128010) (DELFROMCOM 128012 . 133777) (DELFROMCOM1 133779 . 134578) (
REMOVEITEM 134580 . 135456) (MOVETOFILE 135458 . 136288)) (136504 138875 (SAVEPUT 136514 . 138873)) (
139000 147243 (UNMARKASCHANGED 139010 . 140494) (PREEDITFN 140496 . 142977) (POSTEDITPROPS 142979 .
145273) (POSTEDITALISTS 145275 . 147241)) (147388 167392 (ALISTS.GETDEF 147398 . 147777) (
ALISTS.WHENCHANGED 147779 . 148425) (CLEARCLISPARRAY 148427 . 149605) (EXPRESSIONS.WHENCHANGED 149607
. 149985) (MAKEALISTCOMS 149987 . 151002) (MAKEFILESCOMS 151004 . 152334) (MAKELISPXMACROSCOMS 152336
. 154354) (MAKEPROPSCOMS 154356 . 154982) (MAKEUSERMACROSCOMS 154984 . 156801) (PROPS.WHENCHANGED
156803 . 157424) (FILEGETDEF.LISPXMACROS 157426 . 158725) (FILEGETDEF.ALISTS 158727 . 159318) (
FILEGETDEF.RECORDS 159320 . 160247) (FILEGETDEF.PROPS 160249 . 161044) (FILEGETDEF.MACROS 161046 .
161928) (FILEGETDEF.VARS 161930 . 162533) (FILEGETDEF.FNS 162535 . 164309) (FILEPKGCOMS.PUTDEF 164311
. 166253) (FILES.PUTDEF 166255 . 167123) (VARS.PUTDEF 167125 . 167268) (FILES.WHENCHANGED 167270 .
167390)) (169414 176645 (RENAME 169424 . 170869) (CHANGECALLERS 170871 . 176643)) (176646 224749 (
SHOWDEF 176656 . 177853) (COPYDEF 177855 . 180603) (GETDEF 180605 . 183148) (GETDEFCOM 183150 . 184116
) (GETDEFCOM0 184118 . 185311) (GETDEFCURRENT 185313 . 191819) (GETDEFERR 191821 . 193091) (
GETDEFFROMFILE 193093 . 197322) (GETDEFSAVED 197324 . 198412) (PUTDEF 198414 . 199121) (EDITDEF 199123
. 200106) (DEFAULT.EDITDEF 200108 . 202946) (EDITDEF.FILES 202948 . 203153) (LOADDEF 203155 . 203331)
(DWIMDEF 203333 . 204187) (DELDEF 204189 . 207083) (DELFROMLIST 207085 . 207589) (HASDEF 207591 .
213828) (GETFILEDEF 213830 . 214342) (SAVEDEF 214344 . 216032) (UNSAVEDEF 216034 . 216930) (
COMPAREDEFS 216932 . 220738) (COMPARE 220740 . 221444) (TYPESOF 221446 . 224747)) (224899 233147 (
FILEPKGCOM 224909 . 229685) (FILEPKGTYPE 229687 . 233145)) (245180 262869 (FINDCALLERS 245190 . 245820
) (EDITCALLERS 245822 . 256753) (EDITFROMFILE 256755 . 262184) (FINDATS 262186 . 262458) (LOOKIN
262460 . 262867)) (262870 264541 (SEPRCASE 262880 . 264539)) (265058 270251 (IMPORTFILE 265068 .
266038) (IMPORTEVAL 266040 . 266926) (IMPORTFILESCAN 266928 . 267531) (CHECKIMPORTS 267533 . 268789) (
GATHEREXPORTS 268791 . 269659) (\DUMPEXPORTS 269661 . 270249)) (270589 272659 (CLEARFILEPKG 270599 .
272657)))))
STOP