Skip to content

Remove DIRECTORYNAMEP check in EDITCALLERS #2123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 29, 2025
Merged

Remove DIRECTORYNAMEP check in EDITCALLERS #2123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
101 changes: 53 additions & 48 deletions sources/FILEPKG
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)

(FILECREATED "20-Apr-2025 21:58:17" {WMEDLEY}<sources>FILEPKG.;51 274528
(FILECREATED "24-Apr-2025 11:18:44" {WMEDLEY}<sources>FILEPKG.;52 274746

:EDIT-BY rmk

:CHANGES-TO (FNS WHEREIS)
:CHANGES-TO (FNS EDITCALLERS)

:PREVIOUS-DATE "18-Jul-2023 23:40:13" {WMEDLEY}<sources>FILEPKG.;50)
:PREVIOUS-DATE "20-Apr-2025 21:58:17" {WMEDLEY}<sources>FILEPKG.;51)


(PRETTYCOMPRINT FILEPKGCOMS)
Expand Down Expand Up @@ -3041,14 +3041,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))))
(ORIGINAL (M X . Y)))
(M NIL (MAKE FILE FILE)))

(ADDTOVAR EDITMACROS
(M (X . Y)
Expand Down Expand Up @@ -4317,6 +4317,8 @@ compiling " T)
(EDITCALLERS
[LAMBDA (ATOMS FILES COMS DEPTH)

(* ;; "Edited 24-Apr-2025 11:18 by rmk")

(* ;; "Edited 13-Jul-2023 14:56 by rmk")

(* ;; "Edited 31-Oct-2022 16:04 by rmk")
Expand Down Expand Up @@ -4349,8 +4351,11 @@ compiling " T)
FILES)
((STRPOS "*" FILES) (* ; "Depth 2 for TMAX>TMAX")
(FILDIR FILES (OR DEPTH 2)))
(T (LIST FILES))) unless (DIRECTORYNAMEP FILE)
(T (LIST FILES))) unless (AND NIL (DIRECTORYNAMEP FILE))
do

(* ;; "RMK: Not sure about the DIRECTORYNAMEP. UNICODE is both a directory and a file, (EDITCALLERS 'xxx 'UNICODE) would be a no-op. ")

(RESETLST
[PROG (PATTERNS CA RDTBL MAP FILESTREAM PRINTFLG ENV TOP I CASEINSENSITIVE)
(OR (SETQ FULL (FINDFILE FILE))
Expand Down Expand Up @@ -4860,46 +4865,46 @@ compiling " T)
(ADDTOVAR LAMA FILEPKGTYPE FILEPKGCOM FILEPKGCHANGES)
)
(DECLARE%: DONTCOPY
(FILEMAP (NIL (18886 20559 (SEARCHPRETTYTYPELST 18896 . 19865) (PRETTYDEFMACROS 19867 . 20303) (
FILEPKGCOMPROPS 20305 . 20557)) (21372 55664 (CLEANUP 21382 . 22772) (COMPILEFILES 22774 . 23050) (
COMPILEFILES0 23052 . 23865) (CONTINUEDIT 23867 . 25244) (MAKEFILE 25246 . 36972) (FILECHANGES 36974
. 39738) (FILEPKG.MERGECHANGES 39740 . 40375) (FILEPKG.CHANGEDFNS 40377 . 40689) (MAKEFILE1 40691 .
44903) (COMPILE-FILE? 44905 . 46492) (MAKEFILES 46494 . 48022) (ADDFILE 48024 . 50567) (ADDFILE0 50569
. 54693) (LISTFILES 54695 . 55662)) (56336 90135 (FILEPKGCHANGES 56346 . 57525) (GETFILEPKGTYPE 57527
. 60477) (MARKASCHANGED 60479 . 62110) (FILECOMS 62112 . 62496) (WHEREIS 62498 . 64240) (
SMASHFILECOMS 64242 . 64470) (FILEFNSLST 64472 . 64638) (FILECOMSLST 64640 . 65126) (UPDATEFILES 65128
. 69626) (INFILECOMS? 69628 . 71471) (INFILECOMTAIL 71473 . 72591) (INFILECOMS 72593 . 72754) (
INFILECOM 72756 . 82774) (INFILECOMSVALS 82776 . 83083) (INFILECOMSVAL 83085 . 84093) (INFILECOMSPROP
84095 . 84888) (IFCPROPS 84890 . 85970) (IFCEXPRTYPE 85972 . 86588) (IFCPROPSCAN 86590 . 87551) (
IFCDECLARE 87553 . 88812) (INFILEPAIRS 88814 . 89113) (INFILECOMSMACRO 89115 . 90133)) (90170 120856 (
FILES? 90180 . 92291) (FILES?1 92293 . 92995) (FILES?PRINTLST 92997 . 93779) (ADDTOFILES? 93781 .
104324) (ADDTOFILE 104326 . 105242) (WHATIS 105244 . 107220) (ADDTOCOMS 107222 . 108760) (ADDTOCOM
108762 . 115249) (ADDTOCOM1 115251 . 116422) (ADDNEWCOM 116424 . 117474) (MAKENEWCOM 117476 . 119323)
(DEFAULTMAKENEWCOM 119325 . 120854)) (120926 123743 (MERGEINSERT 120936 . 123279) (MERGEINSERT1 123281
. 123741)) (123897 125258 (ADDTOFILEKEYLST 123907 . 125256)) (125375 136176 (DELFROMFILES 125385 .
126215) (DELFROMCOMS 126217 . 127896) (DELFROMCOM 127898 . 133663) (DELFROMCOM1 133665 . 134464) (
REMOVEITEM 134466 . 135342) (MOVETOFILE 135344 . 136174)) (136390 138761 (SAVEPUT 136400 . 138759)) (
138886 147129 (UNMARKASCHANGED 138896 . 140380) (PREEDITFN 140382 . 142863) (POSTEDITPROPS 142865 .
145159) (POSTEDITALISTS 145161 . 147127)) (147274 166744 (ALISTS.GETDEF 147284 . 147663) (
ALISTS.WHENCHANGED 147665 . 148311) (CLEARCLISPARRAY 148313 . 149491) (EXPRESSIONS.WHENCHANGED 149493
. 149871) (MAKEALISTCOMS 149873 . 150888) (MAKEFILESCOMS 150890 . 152220) (MAKELISPXMACROSCOMS 152222
. 154240) (MAKEPROPSCOMS 154242 . 154868) (MAKEUSERMACROSCOMS 154870 . 156687) (PROPS.WHENCHANGED
156689 . 157310) (FILEGETDEF.LISPXMACROS 157312 . 158611) (FILEGETDEF.ALISTS 158613 . 159204) (
FILEGETDEF.RECORDS 159206 . 160133) (FILEGETDEF.PROPS 160135 . 160930) (FILEGETDEF.MACROS 160932 .
161814) (FILEGETDEF.VARS 161816 . 162419) (FILEGETDEF.FNS 162421 . 163661) (FILEPKGCOMS.PUTDEF 163663
. 165605) (FILES.PUTDEF 165607 . 166475) (VARS.PUTDEF 166477 . 166620) (FILES.WHENCHANGED 166622 .
166742)) (168766 175997 (RENAME 168776 . 170221) (CHANGECALLERS 170223 . 175995)) (175998 223907 (
SHOWDEF 176008 . 177205) (COPYDEF 177207 . 179955) (GETDEF 179957 . 182500) (GETDEFCOM 182502 . 183468
) (GETDEFCOM0 183470 . 184663) (GETDEFCURRENT 184665 . 190977) (GETDEFERR 190979 . 192249) (
GETDEFFROMFILE 192251 . 196480) (GETDEFSAVED 196482 . 197570) (PUTDEF 197572 . 198279) (EDITDEF 198281
. 199264) (DEFAULT.EDITDEF 199266 . 202104) (EDITDEF.FILES 202106 . 202311) (LOADDEF 202313 . 202489)
(DWIMDEF 202491 . 203345) (DELDEF 203347 . 206241) (DELFROMLIST 206243 . 206747) (HASDEF 206749 .
212986) (GETFILEDEF 212988 . 213500) (SAVEDEF 213502 . 215190) (UNSAVEDEF 215192 . 216088) (
COMPAREDEFS 216090 . 219896) (COMPARE 219898 . 220602) (TYPESOF 220604 . 223905)) (224057 232305 (
FILEPKGCOM 224067 . 228843) (FILEPKGTYPE 228845 . 232303)) (244338 261813 (FINDCALLERS 244348 . 244978
) (EDITCALLERS 244980 . 255697) (EDITFROMFILE 255699 . 261128) (FINDATS 261130 . 261402) (LOOKIN
261404 . 261811)) (261814 263485 (SEPRCASE 261824 . 263483)) (264002 269005 (IMPORTFILE 264012 .
264982) (IMPORTEVAL 264984 . 265870) (IMPORTFILESCAN 265872 . 266285) (CHECKIMPORTS 266287 . 267543) (
GATHEREXPORTS 267545 . 268413) (\DUMPEXPORTS 268415 . 269003)) (269343 271413 (CLEARFILEPKG 269353 .
271411)))))
(FILEMAP (NIL (18890 20563 (SEARCHPRETTYTYPELST 18900 . 19869) (PRETTYDEFMACROS 19871 . 20307) (
FILEPKGCOMPROPS 20309 . 20561)) (21376 55668 (CLEANUP 21386 . 22776) (COMPILEFILES 22778 . 23054) (
COMPILEFILES0 23056 . 23869) (CONTINUEDIT 23871 . 25248) (MAKEFILE 25250 . 36976) (FILECHANGES 36978
. 39742) (FILEPKG.MERGECHANGES 39744 . 40379) (FILEPKG.CHANGEDFNS 40381 . 40693) (MAKEFILE1 40695 .
44907) (COMPILE-FILE? 44909 . 46496) (MAKEFILES 46498 . 48026) (ADDFILE 48028 . 50571) (ADDFILE0 50573
. 54697) (LISTFILES 54699 . 55666)) (56340 90139 (FILEPKGCHANGES 56350 . 57529) (GETFILEPKGTYPE 57531
. 60481) (MARKASCHANGED 60483 . 62114) (FILECOMS 62116 . 62500) (WHEREIS 62502 . 64244) (
SMASHFILECOMS 64246 . 64474) (FILEFNSLST 64476 . 64642) (FILECOMSLST 64644 . 65130) (UPDATEFILES 65132
. 69630) (INFILECOMS? 69632 . 71475) (INFILECOMTAIL 71477 . 72595) (INFILECOMS 72597 . 72758) (
INFILECOM 72760 . 82778) (INFILECOMSVALS 82780 . 83087) (INFILECOMSVAL 83089 . 84097) (INFILECOMSPROP
84099 . 84892) (IFCPROPS 84894 . 85974) (IFCEXPRTYPE 85976 . 86592) (IFCPROPSCAN 86594 . 87555) (
IFCDECLARE 87557 . 88816) (INFILEPAIRS 88818 . 89117) (INFILECOMSMACRO 89119 . 90137)) (90174 120860 (
FILES? 90184 . 92295) (FILES?1 92297 . 92999) (FILES?PRINTLST 93001 . 93783) (ADDTOFILES? 93785 .
104328) (ADDTOFILE 104330 . 105246) (WHATIS 105248 . 107224) (ADDTOCOMS 107226 . 108764) (ADDTOCOM
108766 . 115253) (ADDTOCOM1 115255 . 116426) (ADDNEWCOM 116428 . 117478) (MAKENEWCOM 117480 . 119327)
(DEFAULTMAKENEWCOM 119329 . 120858)) (120930 123747 (MERGEINSERT 120940 . 123283) (MERGEINSERT1 123285
. 123745)) (123901 125262 (ADDTOFILEKEYLST 123911 . 125260)) (125379 136180 (DELFROMFILES 125389 .
126219) (DELFROMCOMS 126221 . 127900) (DELFROMCOM 127902 . 133667) (DELFROMCOM1 133669 . 134468) (
REMOVEITEM 134470 . 135346) (MOVETOFILE 135348 . 136178)) (136394 138765 (SAVEPUT 136404 . 138763)) (
138890 147133 (UNMARKASCHANGED 138900 . 140384) (PREEDITFN 140386 . 142867) (POSTEDITPROPS 142869 .
145163) (POSTEDITALISTS 145165 . 147131)) (147278 166748 (ALISTS.GETDEF 147288 . 147667) (
ALISTS.WHENCHANGED 147669 . 148315) (CLEARCLISPARRAY 148317 . 149495) (EXPRESSIONS.WHENCHANGED 149497
. 149875) (MAKEALISTCOMS 149877 . 150892) (MAKEFILESCOMS 150894 . 152224) (MAKELISPXMACROSCOMS 152226
. 154244) (MAKEPROPSCOMS 154246 . 154872) (MAKEUSERMACROSCOMS 154874 . 156691) (PROPS.WHENCHANGED
156693 . 157314) (FILEGETDEF.LISPXMACROS 157316 . 158615) (FILEGETDEF.ALISTS 158617 . 159208) (
FILEGETDEF.RECORDS 159210 . 160137) (FILEGETDEF.PROPS 160139 . 160934) (FILEGETDEF.MACROS 160936 .
161818) (FILEGETDEF.VARS 161820 . 162423) (FILEGETDEF.FNS 162425 . 163665) (FILEPKGCOMS.PUTDEF 163667
. 165609) (FILES.PUTDEF 165611 . 166479) (VARS.PUTDEF 166481 . 166624) (FILES.WHENCHANGED 166626 .
166746)) (168770 176001 (RENAME 168780 . 170225) (CHANGECALLERS 170227 . 175999)) (176002 223911 (
SHOWDEF 176012 . 177209) (COPYDEF 177211 . 179959) (GETDEF 179961 . 182504) (GETDEFCOM 182506 . 183472
) (GETDEFCOM0 183474 . 184667) (GETDEFCURRENT 184669 . 190981) (GETDEFERR 190983 . 192253) (
GETDEFFROMFILE 192255 . 196484) (GETDEFSAVED 196486 . 197574) (PUTDEF 197576 . 198283) (EDITDEF 198285
. 199268) (DEFAULT.EDITDEF 199270 . 202108) (EDITDEF.FILES 202110 . 202315) (LOADDEF 202317 . 202493)
(DWIMDEF 202495 . 203349) (DELDEF 203351 . 206245) (DELFROMLIST 206247 . 206751) (HASDEF 206753 .
212990) (GETFILEDEF 212992 . 213504) (SAVEDEF 213506 . 215194) (UNSAVEDEF 215196 . 216092) (
COMPAREDEFS 216094 . 219900) (COMPARE 219902 . 220606) (TYPESOF 220608 . 223909)) (224061 232309 (
FILEPKGCOM 224071 . 228847) (FILEPKGTYPE 228849 . 232307)) (244342 262031 (FINDCALLERS 244352 . 244982
) (EDITCALLERS 244984 . 255915) (EDITFROMFILE 255917 . 261346) (FINDATS 261348 . 261620) (LOOKIN
261622 . 262029)) (262032 263703 (SEPRCASE 262042 . 263701)) (264220 269223 (IMPORTFILE 264230 .
265200) (IMPORTEVAL 265202 . 266088) (IMPORTFILESCAN 266090 . 266503) (CHECKIMPORTS 266505 . 267761) (
GATHEREXPORTS 267763 . 268631) (\DUMPEXPORTS 268633 . 269221)) (269561 271631 (CLEARFILEPKG 269571 .
271629)))))
STOP
Binary file modified sources/FILEPKG.LCOM
View file
Open in desktop
Binary file not shown.