Skip to content

Commit 69832c5

Browse files
rmkaplanrmkaplan
authored
COMPILE-FILE? wasn't returning the right value for FILETYPE CL:COMPILE-FILE (#2300)
1 parent 2cb8b51 commit 69832c5

File tree

2 files changed

+54
-51
lines changed

2 files changed

+54
-51
lines changed

‎sources/FILEPKG‎

Lines changed: 54 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
22

3-
(FILECREATED "24-Apr-2025 11:18:44" {WMEDLEY}<sources>FILEPKG.;52 274746
3+
(FILECREATED "27-Sep-2025 19:56:28" 
4+
{DSK}<Users>kaplan>Local>medley3.5>working-medley>sources>FILEPKG.;53 274937
45

56
:EDIT-BY rmk
67

7-
:CHANGES-TO (FNS EDITCALLERS)
8+
:CHANGES-TO (FNS COMPILE-FILE?)
89

9-
:PREVIOUS-DATE "20-Apr-2025 21:58:17" {WMEDLEY}<sources>FILEPKG.;51)
10+
:PREVIOUS-DATE "24-Apr-2025 11:18:44"
11+
{DSK}<Users>kaplan>Local>medley3.5>working-medley>sources>FILEPKG.;52)
1012

1113

1214
(PRETTYCOMPRINT FILEPKGCOMS)
@@ -743,7 +745,8 @@ compiling " T)
743745
T T])
744746

745747
(COMPILE-FILE?
746-
[LAMBDA (FILE) (* ; "Edited 27-Oct-2020 15:39 by rmk:")
748+
[LAMBDA (FILE) (* ; "Edited 27-Sep-2025 19:54 by rmk")
749+
(* ; "Edited 27-Oct-2020 15:39 by rmk:")
747750
(* ; "Edited 19-Jan-87 21:12 by Pavel")
748751

749752
(* ;; "RMK: Argument is FILE instead of ROOTFILENAME, maybe more information")
@@ -758,10 +761,10 @@ compiling " T)
758761
(RETURN 'TCOMPL))
759762
((BCOMPL :BCOMPL)
760763
(RETURN 'BCOMPL))
761-
((:FAKE-COMPILE-FILE CL:COMPILE-FILE COMPILE-FILE)
762-
(RETURN 'FAKE-COMPILE-FILE))
763-
((:COMPILE-FILE :XCL-COMPILE-FILE)
764+
((:COMPILE-FILE CL:COMPILE-FILE :XCL-COMPILE-FILE COMPILE-FILE)
764765
(RETURN 'CL:COMPILE-FILE))
766+
(:FAKE-COMPILE-FILE
767+
(RETURN 'FAKE-COMPILE-FILE))
765768
((CLISP)
766769
NIL)
767770
(SETQ UNKNOWN T)) finally (if UNKNOWN
@@ -3041,14 +3044,14 @@ compiling " T)
30413044

30423045

30433046
(ADDTOVAR USERMACROS
3047+
(M NIL (MAKE FILE FILE))
30443048
(M (X . Y)
30453049
(E (MARKASCHANGED (COND ((LISTP 'X)
30463050
(CAR 'X))
30473051
(T 'X))
30483052
'USERMACROS)
30493053
T)
3050-
(ORIGINAL (M X . Y)))
3051-
(M NIL (MAKE FILE FILE)))
3054+
(ORIGINAL (M X . Y))))
30523055

30533056
(ADDTOVAR EDITMACROS
30543057
(M (X . Y)
@@ -4865,46 +4868,46 @@ compiling " T)
48654868
(ADDTOVAR LAMA FILEPKGTYPE FILEPKGCOM FILEPKGCHANGES)
48664869
)
48674870
(DECLARE%: DONTCOPY
4868-
(FILEMAP (NIL (18890 20563 (SEARCHPRETTYTYPELST 18900 . 19869) (PRETTYDEFMACROS 19871 . 20307) (
4869-
FILEPKGCOMPROPS 20309 . 20561)) (21376 55668 (CLEANUP 21386 . 22776) (COMPILEFILES 22778 . 23054) (
4870-
COMPILEFILES0 23056 . 23869) (CONTINUEDIT 23871 . 25248) (MAKEFILE 25250 . 36976) (FILECHANGES 36978
4871-
. 39742) (FILEPKG.MERGECHANGES 39744 . 40379) (FILEPKG.CHANGEDFNS 40381 . 40693) (MAKEFILE1 40695 .
4872-
44907) (COMPILE-FILE? 44909 . 46496) (MAKEFILES 46498 . 48026) (ADDFILE 48028 . 50571) (ADDFILE0 50573
4873-
. 54697) (LISTFILES 54699 . 55666)) (56340 90139 (FILEPKGCHANGES 56350 . 57529) (GETFILEPKGTYPE 57531
4874-
. 60481) (MARKASCHANGED 60483 . 62114) (FILECOMS 62116 . 62500) (WHEREIS 62502 . 64244) (
4875-
SMASHFILECOMS 64246 . 64474) (FILEFNSLST 64476 . 64642) (FILECOMSLST 64644 . 65130) (UPDATEFILES 65132
4876-
. 69630) (INFILECOMS? 69632 . 71475) (INFILECOMTAIL 71477 . 72595) (INFILECOMS 72597 . 72758) (
4877-
INFILECOM 72760 . 82778) (INFILECOMSVALS 82780 . 83087) (INFILECOMSVAL 83089 . 84097) (INFILECOMSPROP
4878-
84099 . 84892) (IFCPROPS 84894 . 85974) (IFCEXPRTYPE 85976 . 86592) (IFCPROPSCAN 86594 . 87555) (
4879-
IFCDECLARE 87557 . 88816) (INFILEPAIRS 88818 . 89117) (INFILECOMSMACRO 89119 . 90137)) (90174 120860 (
4880-
FILES? 90184 . 92295) (FILES?1 92297 . 92999) (FILES?PRINTLST 93001 . 93783) (ADDTOFILES? 93785 .
4881-
104328) (ADDTOFILE 104330 . 105246) (WHATIS 105248 . 107224) (ADDTOCOMS 107226 . 108764) (ADDTOCOM
4882-
108766 . 115253) (ADDTOCOM1 115255 . 116426) (ADDNEWCOM 116428 . 117478) (MAKENEWCOM 117480 . 119327)
4883-
(DEFAULTMAKENEWCOM 119329 . 120858)) (120930 123747 (MERGEINSERT 120940 . 123283) (MERGEINSERT1 123285
4884-
. 123745)) (123901 125262 (ADDTOFILEKEYLST 123911 . 125260)) (125379 136180 (DELFROMFILES 125389 .
4885-
126219) (DELFROMCOMS 126221 . 127900) (DELFROMCOM 127902 . 133667) (DELFROMCOM1 133669 . 134468) (
4886-
REMOVEITEM 134470 . 135346) (MOVETOFILE 135348 . 136178)) (136394 138765 (SAVEPUT 136404 . 138763)) (
4887-
138890 147133 (UNMARKASCHANGED 138900 . 140384) (PREEDITFN 140386 . 142867) (POSTEDITPROPS 142869 .
4888-
145163) (POSTEDITALISTS 145165 . 147131)) (147278 166748 (ALISTS.GETDEF 147288 . 147667) (
4889-
ALISTS.WHENCHANGED 147669 . 148315) (CLEARCLISPARRAY 148317 . 149495) (EXPRESSIONS.WHENCHANGED 149497
4890-
. 149875) (MAKEALISTCOMS 149877 . 150892) (MAKEFILESCOMS 150894 . 152224) (MAKELISPXMACROSCOMS 152226
4891-
. 154244) (MAKEPROPSCOMS 154246 . 154872) (MAKEUSERMACROSCOMS 154874 . 156691) (PROPS.WHENCHANGED
4892-
156693 . 157314) (FILEGETDEF.LISPXMACROS 157316 . 158615) (FILEGETDEF.ALISTS 158617 . 159208) (
4893-
FILEGETDEF.RECORDS 159210 . 160137) (FILEGETDEF.PROPS 160139 . 160934) (FILEGETDEF.MACROS 160936 .
4894-
161818) (FILEGETDEF.VARS 161820 . 162423) (FILEGETDEF.FNS 162425 . 163665) (FILEPKGCOMS.PUTDEF 163667
4895-
. 165609) (FILES.PUTDEF 165611 . 166479) (VARS.PUTDEF 166481 . 166624) (FILES.WHENCHANGED 166626 .
4896-
166746)) (168770 176001 (RENAME 168780 . 170225) (CHANGECALLERS 170227 . 175999)) (176002 223911 (
4897-
SHOWDEF 176012 . 177209) (COPYDEF 177211 . 179959) (GETDEF 179961 . 182504) (GETDEFCOM 182506 . 183472
4898-
) (GETDEFCOM0 183474 . 184667) (GETDEFCURRENT 184669 . 190981) (GETDEFERR 190983 . 192253) (
4899-
GETDEFFROMFILE 192255 . 196484) (GETDEFSAVED 196486 . 197574) (PUTDEF 197576 . 198283) (EDITDEF 198285
4900-
. 199268) (DEFAULT.EDITDEF 199270 . 202108) (EDITDEF.FILES 202110 . 202315) (LOADDEF 202317 . 202493)
4901-
(DWIMDEF 202495 . 203349) (DELDEF 203351 . 206245) (DELFROMLIST 206247 . 206751) (HASDEF 206753 .
4902-
212990) (GETFILEDEF 212992 . 213504) (SAVEDEF 213506 . 215194) (UNSAVEDEF 215196 . 216092) (
4903-
COMPAREDEFS 216094 . 219900) (COMPARE 219902 . 220606) (TYPESOF 220608 . 223909)) (224061 232309 (
4904-
FILEPKGCOM 224071 . 228847) (FILEPKGTYPE 228849 . 232307)) (244342 262031 (FINDCALLERS 244352 . 244982
4905-
) (EDITCALLERS 244984 . 255915) (EDITFROMFILE 255917 . 261346) (FINDATS 261348 . 261620) (LOOKIN
4906-
261622 . 262029)) (262032 263703 (SEPRCASE 262042 . 263701)) (264220 269223 (IMPORTFILE 264230 .
4907-
265200) (IMPORTEVAL 265202 . 266088) (IMPORTFILESCAN 266090 . 266503) (CHECKIMPORTS 266505 . 267761) (
4908-
GATHEREXPORTS 267763 . 268631) (\DUMPEXPORTS 268633 . 269221)) (269561 271631 (CLEARFILEPKG 269571 .
4909-
271629)))))
4871+
(FILEMAP (NIL (18974 20647 (SEARCHPRETTYTYPELST 18984 . 19953) (PRETTYDEFMACROS 19955 . 20391) (
4872+
FILEPKGCOMPROPS 20393 . 20645)) (21460 55859 (CLEANUP 21470 . 22860) (COMPILEFILES 22862 . 23138) (
4873+
COMPILEFILES0 23140 . 23953) (CONTINUEDIT 23955 . 25332) (MAKEFILE 25334 . 37060) (FILECHANGES 37062
4874+
. 39826) (FILEPKG.MERGECHANGES 39828 . 40463) (FILEPKG.CHANGEDFNS 40465 . 40777) (MAKEFILE1 40779 .
4875+
44991) (COMPILE-FILE? 44993 . 46687) (MAKEFILES 46689 . 48217) (ADDFILE 48219 . 50762) (ADDFILE0 50764
4876+
. 54888) (LISTFILES 54890 . 55857)) (56531 90330 (FILEPKGCHANGES 56541 . 57720) (GETFILEPKGTYPE 57722
4877+
. 60672) (MARKASCHANGED 60674 . 62305) (FILECOMS 62307 . 62691) (WHEREIS 62693 . 64435) (
4878+
SMASHFILECOMS 64437 . 64665) (FILEFNSLST 64667 . 64833) (FILECOMSLST 64835 . 65321) (UPDATEFILES 65323
4879+
. 69821) (INFILECOMS? 69823 . 71666) (INFILECOMTAIL 71668 . 72786) (INFILECOMS 72788 . 72949) (
4880+
INFILECOM 72951 . 82969) (INFILECOMSVALS 82971 . 83278) (INFILECOMSVAL 83280 . 84288) (INFILECOMSPROP
4881+
84290 . 85083) (IFCPROPS 85085 . 86165) (IFCEXPRTYPE 86167 . 86783) (IFCPROPSCAN 86785 . 87746) (
4882+
IFCDECLARE 87748 . 89007) (INFILEPAIRS 89009 . 89308) (INFILECOMSMACRO 89310 . 90328)) (90365 121051 (
4883+
FILES? 90375 . 92486) (FILES?1 92488 . 93190) (FILES?PRINTLST 93192 . 93974) (ADDTOFILES? 93976 .
4884+
104519) (ADDTOFILE 104521 . 105437) (WHATIS 105439 . 107415) (ADDTOCOMS 107417 . 108955) (ADDTOCOM
4885+
108957 . 115444) (ADDTOCOM1 115446 . 116617) (ADDNEWCOM 116619 . 117669) (MAKENEWCOM 117671 . 119518)
4886+
(DEFAULTMAKENEWCOM 119520 . 121049)) (121121 123938 (MERGEINSERT 121131 . 123474) (MERGEINSERT1 123476
4887+
. 123936)) (124092 125453 (ADDTOFILEKEYLST 124102 . 125451)) (125570 136371 (DELFROMFILES 125580 .
4888+
126410) (DELFROMCOMS 126412 . 128091) (DELFROMCOM 128093 . 133858) (DELFROMCOM1 133860 . 134659) (
4889+
REMOVEITEM 134661 . 135537) (MOVETOFILE 135539 . 136369)) (136585 138956 (SAVEPUT 136595 . 138954)) (
4890+
139081 147324 (UNMARKASCHANGED 139091 . 140575) (PREEDITFN 140577 . 143058) (POSTEDITPROPS 143060 .
4891+
145354) (POSTEDITALISTS 145356 . 147322)) (147469 166939 (ALISTS.GETDEF 147479 . 147858) (
4892+
ALISTS.WHENCHANGED 147860 . 148506) (CLEARCLISPARRAY 148508 . 149686) (EXPRESSIONS.WHENCHANGED 149688
4893+
. 150066) (MAKEALISTCOMS 150068 . 151083) (MAKEFILESCOMS 151085 . 152415) (MAKELISPXMACROSCOMS 152417
4894+
. 154435) (MAKEPROPSCOMS 154437 . 155063) (MAKEUSERMACROSCOMS 155065 . 156882) (PROPS.WHENCHANGED
4895+
156884 . 157505) (FILEGETDEF.LISPXMACROS 157507 . 158806) (FILEGETDEF.ALISTS 158808 . 159399) (
4896+
FILEGETDEF.RECORDS 159401 . 160328) (FILEGETDEF.PROPS 160330 . 161125) (FILEGETDEF.MACROS 161127 .
4897+
162009) (FILEGETDEF.VARS 162011 . 162614) (FILEGETDEF.FNS 162616 . 163856) (FILEPKGCOMS.PUTDEF 163858
4898+
. 165800) (FILES.PUTDEF 165802 . 166670) (VARS.PUTDEF 166672 . 166815) (FILES.WHENCHANGED 166817 .
4899+
166937)) (168961 176192 (RENAME 168971 . 170416) (CHANGECALLERS 170418 . 176190)) (176193 224102 (
4900+
SHOWDEF 176203 . 177400) (COPYDEF 177402 . 180150) (GETDEF 180152 . 182695) (GETDEFCOM 182697 . 183663
4901+
) (GETDEFCOM0 183665 . 184858) (GETDEFCURRENT 184860 . 191172) (GETDEFERR 191174 . 192444) (
4902+
GETDEFFROMFILE 192446 . 196675) (GETDEFSAVED 196677 . 197765) (PUTDEF 197767 . 198474) (EDITDEF 198476
4903+
. 199459) (DEFAULT.EDITDEF 199461 . 202299) (EDITDEF.FILES 202301 . 202506) (LOADDEF 202508 . 202684)
4904+
(DWIMDEF 202686 . 203540) (DELDEF 203542 . 206436) (DELFROMLIST 206438 . 206942) (HASDEF 206944 .
4905+
213181) (GETFILEDEF 213183 . 213695) (SAVEDEF 213697 . 215385) (UNSAVEDEF 215387 . 216283) (
4906+
COMPAREDEFS 216285 . 220091) (COMPARE 220093 . 220797) (TYPESOF 220799 . 224100)) (224252 232500 (
4907+
FILEPKGCOM 224262 . 229038) (FILEPKGTYPE 229040 . 232498)) (244533 262222 (FINDCALLERS 244543 . 245173
4908+
) (EDITCALLERS 245175 . 256106) (EDITFROMFILE 256108 . 261537) (FINDATS 261539 . 261811) (LOOKIN
4909+
261813 . 262220)) (262223 263894 (SEPRCASE 262233 . 263892)) (264411 269414 (IMPORTFILE 264421 .
4910+
265391) (IMPORTEVAL 265393 . 266279) (IMPORTFILESCAN 266281 . 266694) (CHECKIMPORTS 266696 . 267952) (
4911+
GATHEREXPORTS 267954 . 268822) (\DUMPEXPORTS 268824 . 269412)) (269752 271822 (CLEARFILEPKG 269762 .
4912+
271820)))))
49104913
STOP

‎sources/FILEPKG.LCOM‎

127 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)