Skip to content

Add :IMPORT-FROM option to DEFPACKAGE #2335

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add :IMPORT-FROM option to DEFPACKAGE #2335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2d89e5
Add :IMPORT-FROM option to DEFPACKAGE
MattHeffron Oct 30, 2025
9d32cfe
Fix a couple of variable reference typos.
MattHeffron Oct 30, 2025
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
139 changes: 98 additions & 41 deletions sources/LLPACKAGE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
(DEFINE-FILE-INFO PACKAGE "LISP" READTABLE "XCL" BASE 10)

(IL:FILECREATED " 5-Sep-2024 17:42:20" IL:|{DSK}<home>matt>Interlisp>medley>sources>LLPACKAGE.;3| 87515
(IL:FILECREATED "30-Oct-2025 14:25:43" IL:|{DSK}<home>matt>Interlisp>medley>sources>LLPACKAGE.;3| 92825

:EDIT-BY "mth"

:CHANGES-TO (IL:FNS XCL:DEFPACKAGE)
:CHANGES-TO (IL:VARS IL:LLPACKAGECOMS)
(IL:FNS XCL:DEFPACKAGE)

:PREVIOUS-DATE " 4-Sep-2024 13:17:23" IL:|{DSK}<home>matt>Interlisp>medley>sources>LLPACKAGE.;2|
:PREVIOUS-DATE "29-Oct-2025 23:19:15" IL:|{DSK}<home>matt>Interlisp>medley>sources>LLPACKAGE.;1|
)


Expand Down Expand Up @@ -524,7 +525,8 @@
(IL:DEFINEQ

(XCL:DEFPACKAGE
(IL:NLAMBDA IL:ARGS (IL:* IL:\; "Edited 4-Sep-2024 13:17 by mth")
(IL:NLAMBDA IL:ARGS (IL:* IL:\; "Edited 30-Oct-2025 11:34 by mth")
(IL:* IL:\; "Edited 4-Sep-2024 13:17 by mth")
(IL:* IL:\; "Edited 2-Dec-87 10:39 by raf")
(IL:SETQ IL:ARGS (XCL:REMOVE-COMMENTS IL:ARGS))
(LET
Expand Down Expand Up @@ -571,6 +573,30 @@
IL:SYMBOL)))
PACKAGE))
(:IMPORT (IMPORT VALUES PACKAGE))
(:IMPORT-FROM (LET* ((PACKAGE-NAME (POP VALUES))
(XCL::PACKAGE-FROM (FIND-PACKAGE PACKAGE-NAME)))
(IMPORT (IL:MAPCAR VALUES
(IL:FUNCTION (IL:LAMBDA (XCL::SN)
(COND
((IL:LITATOM XCL::SN)
(SETQ XCL::SN
(SYMBOL-NAME
XCL::SN))))
(COND
((IL:STRINGP XCL::SN)
(OR (FIND-SYMBOL
XCL::SN
XCL::PACKAGE-FROM
)
(ERROR
"Symbol ~S not found in package ~S in :import-from option of defpackage"
XCL::SN
PACKAGE-NAME
)))
(T (IL:ERROR
"Bad object in :import-from option of defpackage "
XCL::SN)))))))
))
((:SHADOW :SHADOWING-IMPORT)
(LET ((IL:SYMBOLS-TO-SHADOW (IL:MAPCONC
VALUES
Expand Down Expand Up @@ -620,7 +646,8 @@
((:PREFIX-NAME :INTERNAL-SYMBOLS :EXTERNAL-SYMBOLS
:EXTERNAL-ONLY)
(LIST IL:KEY (CAR VALUES)))
((:SHADOW :EXPORT :IMPORT :SHADOWING-IMPORT)
((:SHADOW :EXPORT :IMPORT :IMPORT-FROM
:SHADOWING-IMPORT)
(IL:SETQ IL:POST-MAKE-FORMS
(CONS (CONS IL:KEY VALUES)
IL:POST-MAKE-FORMS))
Expand Down Expand Up @@ -648,6 +675,36 @@
PACKAGE))
(:IMPORT (IMPORT (CDR IL:FORM)
PACKAGE))
(:IMPORT-FROM (LET* ((PACKAGE-NAME (CADR IL:FORM))
(XCL::PACKAGE-FROM (FIND-PACKAGE PACKAGE-NAME)))
(IMPORT (IL:MAPCAR (CDDR IL:FORM)
(IL:FUNCTION (IL:LAMBDA (XCL::SN)
(COND
((IL:LITATOM
XCL::SN)
(SETQ
XCL::SN
(SYMBOL-NAME
XCL::SN))))
(COND
((IL:STRINGP
XCL::SN)
(OR
(FIND-SYMBOL
XCL::SN
XCL::PACKAGE-FROM
)
(ERROR
"Symbol ~S not found in package ~S in :import-from option of defpackage"
XCL::SN

PACKAGE-NAME
)))
(T (IL:ERROR

"Bad object in :import-from option of defpackage "
XCL::SN)))))
))))
(:SHADOWING-IMPORT
(SHADOWING-IMPORT (CDR IL:FORM)
PACKAGE))
Expand Down Expand Up @@ -1663,7 +1720,7 @@
(IL:* IL:|;;| "Proper compiler, readtable and package environment")


(IL:PUTPROPS IL:LLPACKAGE IL:FILETYPE COMPILE-FILE)
(IL:PUTPROPS IL:LLPACKAGE IL:FILETYPE :FAKE-COMPILE-FILE)

(IL:PUTPROPS IL:LLPACKAGE IL:MAKEFILE-ENVIRONMENT (:READTABLE "XCL" :PACKAGE "LISP"))
(IL:DECLARE\: IL:DONTEVAL@LOAD IL:DOEVAL@COMPILE IL:DONTCOPY IL:COMPILERVARS
Expand All @@ -1675,39 +1732,39 @@
(IL:ADDTOVAR IL:LAMA )
)
(IL:DECLARE\: IL:DONTCOPY
(IL:FILEMAP (NIL (5304 5829 (IL:PACKAGE-LISTIFY 5304 . 5829)) (5831 6219 (IL:\\SIMPLE-STRINGIFY 5831
. 6219)) (6221 6713 (IL:SYMBOL-LISTIFY 6221 . 6713)) (6715 6777 (IL:COPY-STRING 6715 . 6777)) (6779
7517 (IL:\\SYMBOL-EQUALBASE 6779 . 7517)) (7521 7957 (IL:\\FATCHARSEENP 7521 . 7957)) (7959 8487 (
IL:\\PACKAGIFY 7959 . 8487)) (8489 9526 (IL:\\STRING-EQUALBASE 8489 . 9526)) (9528 9752 (
IL:NUMERIC-UPCASE 9528 . 9752)) (9754 10111 (IL:\\UPCASEBASE 9754 . 10111)) (10113 11230 (
IL:APROPOS-SEARCH 10113 . 11230)) (12750 12832 (PACKAGE-NAME 12750 . 12832)) (12834 12926 (
PACKAGE-NICKNAMES 12834 . 12926)) (12928 13036 (PACKAGE-SHADOWING-SYMBOLS 12928 . 13036)) (13038 13128
(PACKAGE-USE-LIST 13038 . 13128)) (13130 13228 (PACKAGE-USED-BY-LIST 13130 . 13228)) (13230 14385 (
IL:MAKE-PACKAGE-HASHTABLE 13230 . 14385)) (14387 14549 (PRINT-PACKAGE 14387 . 14549)) (14551 14942 (
PRINT-PACKAGE-HASHTABLE 14551 . 14942)) (16006 16787 (MAKE-SYMBOL 16006 . 16787)) (17838 18248 (
IL:\\PKG-FIND-FREE-PACKAGE-INDEX 17838 . 18248)) (18305 18451 (IL:SETF-SYMBOL-PACKAGE 18305 . 18451))
(18453 18545 (SYMBOL-PACKAGE 18453 . 18545)) (18587 20224 (IL:SYMBOL-HASH 18587 . 20224)) (20226 20358
(IL:REHASH-FACTOR 20226 . 20358)) (20360 20526 (IL:SYMBOL-HASH-REPROBE 20360 . 20526)) (20528 20919 (
IL:ENTRY-HASH 20528 . 20919)) (20968 21314 (IL:COUNT-PACKAGE-HASHTABLE 20968 . 21314)) (21316 21488 (
IL:INTERNAL-SYMBOL-COUNT 21316 . 21488)) (21490 21608 (IL:EXTERNAL-SYMBOL-COUNT 21490 . 21608)) (21610
22766 (IL:ENTER-NEW-NICKNAMES 21610 . 22766)) (22768 23194 (IL:MAKE-PRIME-HASHTABLE-SIZE 22768 .
23194)) (23196 24845 (MAKE-PACKAGE 23196 . 24845)) (24846 34317 (XCL:DEFPACKAGE 24859 . 34315)) (34366
34588 (FIND-PACKAGE 34366 . 34588)) (34590 37951 (USE-PACKAGE 34590 . 37951)) (37953 38433 (
IN-PACKAGE 37953 . 38433)) (38435 38709 (XCL:PKG-GOTO 38435 . 38709)) (38711 39811 (RENAME-PACKAGE
38711 . 39811)) (39813 41264 (XCL:DELETE-PACKAGE 39813 . 41264)) (41266 44212 (EXPORT 41266 . 44212))
(44214 45457 (UNEXPORT 44214 . 45457)) (45459 47103 (IMPORT 45459 . 47103)) (47105 48385 (
SHADOWING-IMPORT 47105 . 48385)) (48387 49441 (SHADOW 48387 . 49441)) (49443 50098 (UNUSE-PACKAGE
49443 . 50098)) (50162 50468 (LIST-ALL-PACKAGES 50162 . 50468)) (50525 54208 (IL:ADD-SYMBOL 50525 .
54208)) (54210 58263 (IL:WITH-SYMBOL 54210 . 58263)) (58265 59568 (IL:INTERN* 58265 . 59568)) (59570
65402 (IL:FIND-SYMBOL* 59570 . 65402)) (65404 66855 (INTERN 65404 . 66855)) (66857 67435 (FIND-SYMBOL
66857 . 67435)) (67493 68389 (IL:NUKE-SYMBOL 67493 . 68389)) (68391 70505 (UNINTERN 68391 . 70505)) (
70507 71650 (IL:MOBY-UNINTERN 70507 . 71650)) (71709 71781 (IL:\\INDEXATOMPNAME 71709 . 71781)) (71893
72040 (IL:MAKE-DO-SYMBOLS-VARS 71893 . 72040)) (72042 73497 (IL:MAKE-DO-SYMBOLS-CODE 72042 . 73497))
(73501 74279 (DO-EXTERNAL-SYMBOLS 73501 . 74279)) (74281 75627 (XCL:DO-LOCAL-SYMBOLS 74281 . 75627)) (
75629 76745 (XCL:DO-INTERNAL-SYMBOLS 75629 . 76745)) (76747 79045 (DO-SYMBOLS 76747 . 79045)) (79047
80729 (DO-ALL-SYMBOLS 79047 . 80729)) (80797 81322 (FIND-ALL-SYMBOLS 80797 . 81322)) (81324 81603 (
IL:BRIEFLY-DESCRIBE-SYMBOL 81324 . 81603)) (81605 83119 (APROPOS 81605 . 83119)) (83121 84688 (
APROPOS-LIST 83121 . 84688)) (84792 86319 (IL:FIND-EXTERNAL-SYMBOL 84792 . 86319)) (86321 86841 (
IL:FIND-EXACT-SYMBOL 86321 . 86841)) (86843 86923 (IL:PACKAGE-NAME-AS-SYMBOL 86843 . 86923)) (86925
87074 (IL:\\FIND.PACKAGE.INTERNAL 86925 . 87074)))))
(IL:FILEMAP (NIL (5349 5874 (IL:PACKAGE-LISTIFY 5349 . 5874)) (5876 6264 (IL:\\SIMPLE-STRINGIFY 5876
. 6264)) (6266 6758 (IL:SYMBOL-LISTIFY 6266 . 6758)) (6760 6822 (IL:COPY-STRING 6760 . 6822)) (6824
7562 (IL:\\SYMBOL-EQUALBASE 6824 . 7562)) (7566 8002 (IL:\\FATCHARSEENP 7566 . 8002)) (8004 8532 (
IL:\\PACKAGIFY 8004 . 8532)) (8534 9571 (IL:\\STRING-EQUALBASE 8534 . 9571)) (9573 9797 (
IL:NUMERIC-UPCASE 9573 . 9797)) (9799 10156 (IL:\\UPCASEBASE 9799 . 10156)) (10158 11275 (
IL:APROPOS-SEARCH 10158 . 11275)) (12795 12877 (PACKAGE-NAME 12795 . 12877)) (12879 12971 (
PACKAGE-NICKNAMES 12879 . 12971)) (12973 13081 (PACKAGE-SHADOWING-SYMBOLS 12973 . 13081)) (13083 13173
(PACKAGE-USE-LIST 13083 . 13173)) (13175 13273 (PACKAGE-USED-BY-LIST 13175 . 13273)) (13275 14430 (
IL:MAKE-PACKAGE-HASHTABLE 13275 . 14430)) (14432 14594 (PRINT-PACKAGE 14432 . 14594)) (14596 14987 (
PRINT-PACKAGE-HASHTABLE 14596 . 14987)) (16051 16832 (MAKE-SYMBOL 16051 . 16832)) (17883 18293 (
IL:\\PKG-FIND-FREE-PACKAGE-INDEX 17883 . 18293)) (18350 18496 (IL:SETF-SYMBOL-PACKAGE 18350 . 18496))
(18498 18590 (SYMBOL-PACKAGE 18498 . 18590)) (18632 20269 (IL:SYMBOL-HASH 18632 . 20269)) (20271 20403
(IL:REHASH-FACTOR 20271 . 20403)) (20405 20571 (IL:SYMBOL-HASH-REPROBE 20405 . 20571)) (20573 20964 (
IL:ENTRY-HASH 20573 . 20964)) (21013 21359 (IL:COUNT-PACKAGE-HASHTABLE 21013 . 21359)) (21361 21533 (
IL:INTERNAL-SYMBOL-COUNT 21361 . 21533)) (21535 21653 (IL:EXTERNAL-SYMBOL-COUNT 21535 . 21653)) (21655
22811 (IL:ENTER-NEW-NICKNAMES 21655 . 22811)) (22813 23239 (IL:MAKE-PRIME-HASHTABLE-SIZE 22813 .
23239)) (23241 24890 (MAKE-PACKAGE 23241 . 24890)) (24891 39621 (XCL:DEFPACKAGE 24904 . 39619)) (39670
39892 (FIND-PACKAGE 39670 . 39892)) (39894 43255 (USE-PACKAGE 39894 . 43255)) (43257 43737 (
IN-PACKAGE 43257 . 43737)) (43739 44013 (XCL:PKG-GOTO 43739 . 44013)) (44015 45115 (RENAME-PACKAGE
44015 . 45115)) (45117 46568 (XCL:DELETE-PACKAGE 45117 . 46568)) (46570 49516 (EXPORT 46570 . 49516))
(49518 50761 (UNEXPORT 49518 . 50761)) (50763 52407 (IMPORT 50763 . 52407)) (52409 53689 (
SHADOWING-IMPORT 52409 . 53689)) (53691 54745 (SHADOW 53691 . 54745)) (54747 55402 (UNUSE-PACKAGE
54747 . 55402)) (55466 55772 (LIST-ALL-PACKAGES 55466 . 55772)) (55829 59512 (IL:ADD-SYMBOL 55829 .
59512)) (59514 63567 (IL:WITH-SYMBOL 59514 . 63567)) (63569 64872 (IL:INTERN* 63569 . 64872)) (64874
70706 (IL:FIND-SYMBOL* 64874 . 70706)) (70708 72159 (INTERN 70708 . 72159)) (72161 72739 (FIND-SYMBOL
72161 . 72739)) (72797 73693 (IL:NUKE-SYMBOL 72797 . 73693)) (73695 75809 (UNINTERN 73695 . 75809)) (
75811 76954 (IL:MOBY-UNINTERN 75811 . 76954)) (77013 77085 (IL:\\INDEXATOMPNAME 77013 . 77085)) (77197
77344 (IL:MAKE-DO-SYMBOLS-VARS 77197 . 77344)) (77346 78801 (IL:MAKE-DO-SYMBOLS-CODE 77346 . 78801))
(78805 79583 (DO-EXTERNAL-SYMBOLS 78805 . 79583)) (79585 80931 (XCL:DO-LOCAL-SYMBOLS 79585 . 80931)) (
80933 82049 (XCL:DO-INTERNAL-SYMBOLS 80933 . 82049)) (82051 84349 (DO-SYMBOLS 82051 . 84349)) (84351
86033 (DO-ALL-SYMBOLS 84351 . 86033)) (86101 86626 (FIND-ALL-SYMBOLS 86101 . 86626)) (86628 86907 (
IL:BRIEFLY-DESCRIBE-SYMBOL 86628 . 86907)) (86909 88423 (APROPOS 86909 . 88423)) (88425 89992 (
APROPOS-LIST 88425 . 89992)) (90096 91623 (IL:FIND-EXTERNAL-SYMBOL 90096 . 91623)) (91625 92145 (
IL:FIND-EXACT-SYMBOL 91625 . 92145)) (92147 92227 (IL:PACKAGE-NAME-AS-SYMBOL 92147 . 92227)) (92229
92378 (IL:\\FIND.PACKAGE.INTERNAL 92229 . 92378)))))
IL:STOP
Binary file modified sources/LLPACKAGE.LCOM
View file
Open in desktop
Binary file not shown.