Merge branch 'master' into mth49--some-errors-parsing-BDF
This commit is contained in:
Matt Heffron
commit
17292d3ea1
@ -1,12 +1,12 @@
|
||||
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
|
||||
|
||||
(FILECREATED "22-Oct-2025 13:05:51" {WMEDLEY}<library>UNIXUTILS.;33 17919
|
||||
(FILECREATED " 4-Nov-2025 10:11:10" {WMEDLEY}<library>UNIXUTILS.;34 18037
|
||||
|
||||
:EDIT-BY rmk
|
||||
|
||||
:CHANGES-TO (FNS SLASHIT)
|
||||
|
||||
:PREVIOUS-DATE "27-Sep-2025 16:25:07" {WMEDLEY}<library>UNIXUTILS.;32)
|
||||
:PREVIOUS-DATE "22-Oct-2025 13:05:51" {WMEDLEY}<library>UNIXUTILS.;33)
|
||||
|
||||
|
||||
(PRETTYCOMPRINT UNIXUTILSCOMS)
|
||||
@ -240,7 +240,8 @@
|
||||
0))) DO (BLOCK) FINALLY (RETURN CODE])
|
||||
|
||||
(SLASHIT
|
||||
[LAMBDA (X LCASEDIRS NOHOST) (* ; "Edited 22-Oct-2025 13:05 by rmk")
|
||||
[LAMBDA (X LCASEDIRS NOHOST) (* ; "Edited 4-Nov-2025 10:10 by rmk")
|
||||
(* ; "Edited 22-Oct-2025 13:05 by rmk")
|
||||
(* ; "Edited 25-Sep-2025 09:57 by rmk")
|
||||
(* ; "Edited 23-Sep-2023 15:27 by rmk")
|
||||
|
||||
@ -259,7 +260,7 @@
|
||||
(CONS (CHARCODE /)))
|
||||
(/ (SETQ LASTDIRPOS I)
|
||||
(CONS C))
|
||||
(SPACE (CHARCODE (\ SPACE)))
|
||||
(SPACE (APPEND (CHARCODE (\ SPACE))))
|
||||
(CONS C]
|
||||
(CL:WHEN (AND LCASEDIRS LASTDIRPOS)
|
||||
(SETQ LASTDIRPOS (ADD1 (IDIFFERENCE LASTDIRPOS DIRPOS)))
|
||||
@ -326,7 +327,7 @@
|
||||
|
||||
(PUTPROPS UNIXUTILS FILETYPE CL:COMPILE-FILE)
|
||||
(DECLARE%: DONTCOPY
|
||||
(FILEMAP (NIL (1110 1483 (ShellCommand 1110 . 1483)) (1485 1882 (ShellWhich 1485 . 1882)) (1972 17841
|
||||
(FILEMAP (NIL (1110 1483 (ShellCommand 1110 . 1483)) (1485 1882 (ShellWhich 1485 . 1882)) (1972 17959
|
||||
(ShellBrowser 1982 . 3754) (ShellBrowse 3756 . 4441) (ShellOpener 4443 . 6131) (ShellOpen 6133 . 11612
|
||||
) (PROCESS-COMMAND 11614 . 12227) (SLASHIT 12229 . 14566) (UNIX-FILE-NAME 14568 . 17839)))))
|
||||
) (PROCESS-COMMAND 11614 . 12227) (SLASHIT 12229 . 14684) (UNIX-FILE-NAME 14686 . 17957)))))
|
||||
STOP
|
||||
|
||||
Binary file not shown.
35
sources/AOFD
35
sources/AOFD
@ -1,10 +1,12 @@
|
||||
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
|
||||
|
||||
(FILECREATED "17-May-2023 08:29:55" {DSK}<home>larry>il>medley>sources>AOFD.;5 36263
|
||||
(FILECREATED "24-Apr-2025 21:46:04" {WMEDLEY}<sources>AOFD.;10 36381
|
||||
|
||||
:EDIT-BY "lmm"
|
||||
:EDIT-BY rmk
|
||||
|
||||
:PREVIOUS-DATE "17-May-2023 08:05:56" {DSK}<home>larry>il>medley>sources>AOFD.;4)
|
||||
:CHANGES-TO (FNS MAKE-STRING-FORMAT)
|
||||
|
||||
:PREVIOUS-DATE "17-May-2023 08:29:55" {WMEDLEY}<sources>AOFD.;9)
|
||||
|
||||
|
||||
(PRETTYCOMPRINT AOFDCOMS)
|
||||
@ -558,9 +560,10 @@
|
||||
STREAM])
|
||||
|
||||
(MAKE-STRING-FORMAT
|
||||
[LAMBDA NIL (* ; "Edited 8-Aug-2021 00:10 by rmk:")
|
||||
[LAMBDA NIL (* ; "Edited 24-Apr-2025 21:45 by rmk")
|
||||
(* ; "Edited 8-Aug-2021 00:10 by rmk:")
|
||||
|
||||
(* ;; "We are looking at an in-core string, we know that EOL is CR, that the characters have the internal (XCCS) encoding, and that the string is fat. ")
|
||||
(* ;; "We are looking at an in-core string, we know that EOL is CR, that the characters have the internal (MCCS) encoding, and that the string is fat. ")
|
||||
|
||||
(MAKE-EXTERNALFORMAT :STRING [FUNCTION (LAMBDA (STRM COUNTP)
|
||||
(DECLARE (USEDFREE *BYTECOUNTER*))
|
||||
@ -761,15 +764,15 @@
|
||||
(ADDTOVAR LAMA WHENCLOSE)
|
||||
)
|
||||
(DECLARE%: DONTCOPY
|
||||
(FILEMAP (NIL (2363 3482 (\ADD-OPEN-STREAM 2373 . 2654) (\GENERIC-UNREGISTER-STREAM 2656 . 3480)) (
|
||||
3523 10587 (CLOSEALL 3533 . 4011) (CLOSEF 4013 . 5227) (EOFCLOSEF 5229 . 5529) (INPUT 5531 . 6301) (
|
||||
OPENP 6303 . 6706) (OUTPUT 6708 . 7480) (POSITION 7482 . 8290) (RANDACCESSP 8292 . 8682) (\IOMODEP
|
||||
8684 . 9313) (WHENCLOSE 9315 . 10585)) (10588 10710 (STREAMADDPROP 10598 . 10708)) (11668 24521 (
|
||||
\BASEBYTES.IO.INIT 11678 . 14878) (\MAKEBASEBYTESTREAM 14880 . 17808) (\MBS.OUTCHARFN 17810 . 18210) (
|
||||
\BASEBYTES.NAME.FROM.STREAM 18212 . 18671) (\BASEBYTES.BOUT 18673 . 19427) (\BASEBYTES.SETFILEPTR
|
||||
19429 . 20050) (\BASEBYTES.READP 20052 . 20696) (\BASEBYTES.BIN 20698 . 21205) (\BASEBYTES.PEEKBIN
|
||||
21207 . 22037) (\BASEBYTES.TRUNCATEFN 22039 . 22547) (\BASEBYTES.OPENFN 22549 . 23343) (
|
||||
\BASEBYTES.BLOCKIO 23345 . 24519)) (24644 27948 (OPENSTRINGSTREAM 24654 . 26363) (MAKE-STRING-FORMAT
|
||||
26365 . 27946)) (28220 32528 (\STRINGSTREAM.INIT 28230 . 32526)) (32605 35305 (GETSTREAM 32615 . 32846
|
||||
) (\CLEAROFD 32848 . 33141) (\GETSTREAM 33143 . 35303)))))
|
||||
(FILEMAP (NIL (2372 3491 (\ADD-OPEN-STREAM 2382 . 2663) (\GENERIC-UNREGISTER-STREAM 2665 . 3489)) (
|
||||
3532 10596 (CLOSEALL 3542 . 4020) (CLOSEF 4022 . 5236) (EOFCLOSEF 5238 . 5538) (INPUT 5540 . 6310) (
|
||||
OPENP 6312 . 6715) (OUTPUT 6717 . 7489) (POSITION 7491 . 8299) (RANDACCESSP 8301 . 8691) (\IOMODEP
|
||||
8693 . 9322) (WHENCLOSE 9324 . 10594)) (10597 10719 (STREAMADDPROP 10607 . 10717)) (11677 24530 (
|
||||
\BASEBYTES.IO.INIT 11687 . 14887) (\MAKEBASEBYTESTREAM 14889 . 17817) (\MBS.OUTCHARFN 17819 . 18219) (
|
||||
\BASEBYTES.NAME.FROM.STREAM 18221 . 18680) (\BASEBYTES.BOUT 18682 . 19436) (\BASEBYTES.SETFILEPTR
|
||||
19438 . 20059) (\BASEBYTES.READP 20061 . 20705) (\BASEBYTES.BIN 20707 . 21214) (\BASEBYTES.PEEKBIN
|
||||
21216 . 22046) (\BASEBYTES.TRUNCATEFN 22048 . 22556) (\BASEBYTES.OPENFN 22558 . 23352) (
|
||||
\BASEBYTES.BLOCKIO 23354 . 24528)) (24653 28066 (OPENSTRINGSTREAM 24663 . 26372) (MAKE-STRING-FORMAT
|
||||
26374 . 28064)) (28338 32646 (\STRINGSTREAM.INIT 28348 . 32644)) (32723 35423 (GETSTREAM 32733 . 32964
|
||||
) (\CLEAROFD 32966 . 33259) (\GETSTREAM 33261 . 35421)))))
|
||||
STOP
|
||||
|
||||
Binary file not shown.
88
sources/ATBL
88
sources/ATBL
@ -1,16 +1,13 @@
|
||||
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
|
||||
|
||||
(FILECREATED "26-Dec-2021 14:32:50" {DSK}<Users>kaplan>Local>medley3.5>my-medley>sources>ATBL.;32 91860
|
||||
(FILECREATED "24-Apr-2025 21:52:35" {WMEDLEY}<sources>ATBL.;33 91754
|
||||
|
||||
:CHANGES-TO (FNS MAKE-READER-ENVIRONMENT)
|
||||
:EDIT-BY rmk
|
||||
|
||||
:PREVIOUS-DATE "19-Dec-2021 14:09:43"
|
||||
{DSK}<Users>kaplan>Local>medley3.5>my-medley>sources>ATBL.;31)
|
||||
:CHANGES-TO (FNS \ATBLSET EQUAL-READER-ENVIRONMENT)
|
||||
|
||||
:PREVIOUS-DATE "26-Dec-2021 14:32:50" {WMEDLEY}<sources>ATBL.;32)
|
||||
|
||||
(* ; "
|
||||
Copyright (c) 1982-1987, 1990, 1993, 2018, 2021 by Venue & Xerox Corporation.
|
||||
")
|
||||
|
||||
(PRETTYCOMPRINT ATBLCOMS)
|
||||
|
||||
@ -1733,26 +1730,27 @@ Copyright (c) 1982-1987, 1990, 1993, 2018, 2021 by Venue & Xerox Corporation.
|
||||
(DEFINEQ
|
||||
|
||||
(\ATBLSET
|
||||
[LAMBDA NIL (* ; "Edited 28-Jun-2021 09:29 by rmk:")
|
||||
(* ; "Edited 3-Dec-86 18:07 by Pavel")
|
||||
[LAMBDA NIL (* ; "Edited 24-Apr-2025 21:51 by rmk")
|
||||
(* ; "Edited 28-Jun-2021 09:29 by rmk:")
|
||||
(* ; "Edited 3-Dec-86 18:07 by Pavel")
|
||||
(DECLARE (GLOBALVARS \ORIGREADTABLE \ORIGTERMTABLE))
|
||||
(COND
|
||||
((NULL (BOUNDP '\PRIMREADTABLE))
|
||||
(initrecord CHARTABLE)
|
||||
|
||||
(* ;; "Read tables")
|
||||
(* ;; "Read tables")
|
||||
|
||||
(* ;; "RMK: If reloading, don't smash an existing hash table")
|
||||
(* ;; "RMK: If reloading, don't smash an existing hash table")
|
||||
|
||||
[OR (HARRAYP \READTABLEHASH)
|
||||
(SETQ \READTABLEHASH (HASHARRAY 20 NIL (FUNCTION STRING-EQUAL-HASHBITS)
|
||||
(FUNCTION STRING-EQUAL]
|
||||
(LET (TRDTBL NEW-IL-RDTBL)
|
||||
(PROGN (* ; "The ORIG read table")
|
||||
(PROGN (* ; "The ORIG read table")
|
||||
(SETQ \ORIGREADTABLE (\ORIGREADTABLE))
|
||||
(READTABLEPROP \ORIGREADTABLE 'NAME 'ORIG))
|
||||
(PROGN (* ;
|
||||
"The old Interlisp T read table. May not have a use for this any more")
|
||||
(PROGN (* ;
|
||||
"The old Interlisp T read table. May not have a use for this any more")
|
||||
(SETQ TRDTBL (COPYREADTABLE \ORIGREADTABLE))
|
||||
(SETSYNTAX (CHARCODE "|")
|
||||
'(MACRO READVBAR)
|
||||
@ -1767,9 +1765,9 @@ Copyright (c) 1982-1987, 1990, 1993, 2018, 2021 by Venue & Xerox Corporation.
|
||||
'(MACRO FIRST READQUOTE)
|
||||
TRDTBL)
|
||||
(READTABLEPROP TRDTBL 'NAME "OLD-INTERLISP-T")
|
||||
(PROGN (* ; "Temporary")
|
||||
(PROGN (* ; "Temporary")
|
||||
(SETTOPVAL '%#CURRENTRDTBL# TRDTBL)))
|
||||
(PROGN (* ; "The old FILERDTBL")
|
||||
(PROGN (* ; "The old FILERDTBL")
|
||||
(SETQ FILERDTBL (COPYREADTABLE \ORIGREADTABLE))
|
||||
(SETSYNTAX (CHARCODE "|")
|
||||
TRDTBL FILERDTBL)
|
||||
@ -1778,12 +1776,12 @@ Copyright (c) 1982-1987, 1990, 1993, 2018, 2021 by Venue & Xerox Corporation.
|
||||
(create READER-ENVIRONMENT
|
||||
REREADTABLE _ FILERDTBL
|
||||
REBASE _ 10
|
||||
REFORMAT _ :XCCS)) (* ;
|
||||
"need this to read files in the loadup")
|
||||
REFORMAT _ :MCCS)) (* ;
|
||||
"need this to read files in the loadup")
|
||||
)
|
||||
(PROGN (SETQ NEW-IL-RDTBL (COPYREADTABLE TRDTBL))
|
||||
(* ;
|
||||
"The new Interlisp read table is more common lispy")
|
||||
(* ;
|
||||
"The new Interlisp read table is more common lispy")
|
||||
(READTABLEPROP NEW-IL-RDTBL 'MULTIPLE-ESCAPECHAR (CHARCODE "|"))
|
||||
(READTABLEPROP NEW-IL-RDTBL 'HASHMACROCHAR (CHARCODE "#"))
|
||||
(SET-DEFAULT-HASHMACRO-SETTINGS NEW-IL-RDTBL)
|
||||
@ -1791,11 +1789,11 @@ Copyright (c) 1982-1987, 1990, 1993, 2018, 2021 by Venue & Xerox Corporation.
|
||||
(READTABLEPROP NEW-IL-RDTBL 'USESILPACKAGE NIL)
|
||||
(READTABLEPROP NEW-IL-RDTBL 'NAME "INTERLISP")
|
||||
(for I from 1 to 26 do (SETSYNTAX I 'SEPRCHAR FILERDTBL)
|
||||
(* ; "Make font switch chars seprs")
|
||||
(SETSYNTAX I 'SEPRCHAR NEW-IL-RDTBL))
|
||||
(* ; "Make font switch chars seprs")
|
||||
(SETSYNTAX I 'SEPRCHAR NEW-IL-RDTBL))
|
||||
(SETQ *READTABLE* NEW-IL-RDTBL))
|
||||
|
||||
(* ;; "Make ^Y like #. in the old T readtable and the new INTERLISP one.")
|
||||
(* ;; "Make ^Y like #. in the old T readtable and the new INTERLISP one.")
|
||||
|
||||
(SETSYNTAX (CHARCODE ^Y)
|
||||
'[MACRO ALWAYS (LAMBDA (FILE RDTBL)
|
||||
@ -1805,7 +1803,7 @@ Copyright (c) 1982-1987, 1990, 1993, 2018, 2021 by Venue & Xerox Corporation.
|
||||
TRDTBL NEW-IL-RDTBL)
|
||||
(DEFPRINT 'READTABLEP '\READTABLEP.DEFPRINT))
|
||||
|
||||
(* ;; "Terminal tables")
|
||||
(* ;; "Terminal tables")
|
||||
|
||||
(SETQ \ORIGTERMTABLE (\ORIGTERMTABLE))
|
||||
(SETQ \PRIMTERMTABLE (COPYTERMTABLE \ORIGTERMTABLE))
|
||||
@ -1868,7 +1866,9 @@ Copyright (c) 1982-1987, 1990, 1993, 2018, 2021 by Venue & Xerox Corporation.
|
||||
(EQUAL-READER-ENVIRONMENT
|
||||
[LAMBDA (ENV1 ENV2)
|
||||
|
||||
(* ;; "Edited 19-Dec-2021 14:09 by rmk: Replace constant :XCCS with *DEFAULT-EXTERNALFORMAT*")
|
||||
(* ;; "Edited 24-Apr-2025 21:52 by rmk")
|
||||
|
||||
(* ;; "Edited 19-Dec-2021 14:09 by rmk: Use *DEFAULT-EXTERNALFORMAT*")
|
||||
|
||||
(* ;; "Edited 19-Dec-2021 14:01 by rmk")
|
||||
|
||||
@ -1921,25 +1921,23 @@ Copyright (c) 1982-1987, 1990, 1993, 2018, 2021 by Venue & Xerox Corporation.
|
||||
|
||||
(ADDTOVAR LAMA READTABLEPROP)
|
||||
)
|
||||
(PUTPROPS ATBL COPYRIGHT ("Venue & Xerox Corporation" 1982 1983 1984 1985 1986 1987 1990 1993 2018
|
||||
2021))
|
||||
(DECLARE%: DONTCOPY
|
||||
(FILEMAP (NIL (17749 28901 (GETSYNTAX 17759 . 22590) (SETSYNTAX 22592 . 23665) (SYNTAXP 23667 . 26164)
|
||||
(\COPYSYNTAX 26166 . 26883) (\GETCHARCODE 26885 . 27173) (\SETFATSYNCODE 27175 . 28466) (
|
||||
\MAPCHARTABLE 28468 . 28899)) (28934 43900 (CONTROL 28944 . 29196) (COPYTERMTABLE 29198 . 29565) (
|
||||
DELETECONTROL 29567 . 32208) (GETDELETECONTROL 32210 . 33172) (ECHOCHAR 33174 . 34615) (ECHOCONTROL
|
||||
34617 . 35074) (ECHOMODE 35076 . 35322) (GETECHOMODE 35324 . 35488) (GETCONTROL 35490 . 35656) (
|
||||
GETTERMTABLE 35658 . 35725) (RAISE 35727 . 36153) (GETRAISE 36155 . 36317) (RESETTERMTABLE 36319 .
|
||||
37403) (SETTERMTABLE 37405 . 37639) (TERMTABLEP 37641 . 37802) (\GETTERMSYNTAX 37804 . 38075) (
|
||||
\GTTERMTABLE 38077 . 38413) (\ORIGTERMTABLE 38415 . 42025) (\SETTERMSYNTAX 42027 . 42662) (
|
||||
\TERMCLASSTOCODE 42664 . 43093) (\TERMCODETOCLASS 43095 . 43482) (\LITCHECK 43484 . 43898)) (46411
|
||||
70235 (COPYREADTABLE 46421 . 46619) (FIND-READTABLE 46621 . 46768) (IN-READTABLE 46770 . 46930) (
|
||||
ESCAPE 46932 . 47185) (GETBRK 47187 . 47325) (GETREADTABLE 47327 . 47463) (GETSEPR 47465 . 47603) (
|
||||
READMACROS 47605 . 47868) (READTABLEP 47870 . 48033) (READTABLEPROP 48035 . 53193) (RESETREADTABLE
|
||||
53195 . 57442) (SETBRK 57444 . 59054) (SETREADTABLE 59056 . 59244) (SETSEPR 59246 . 60788) (
|
||||
\GETREADSYNTAX 60790 . 63480) (\GTREADTABLE 63482 . 63707) (\GTREADTABLE1 63709 . 63965) (
|
||||
\ORIGREADTABLE 63967 . 65875) (\READCLASSTOCODE 65877 . 66328) (\SETMACROSYNTAX 66330 . 68125) (
|
||||
\SETREADSYNTAX 68127 . 69188) (\READTABLEP.DEFPRINT 69190 . 70233)) (83067 87520 (\ATBLSET 83077 .
|
||||
87518)) (87967 91384 (MAKE-READER-ENVIRONMENT 87977 . 89634) (EQUAL-READER-ENVIRONMENT 89636 . 90786)
|
||||
(SET-READER-ENVIRONMENT 90788 . 91382)))))
|
||||
(FILEMAP (NIL (17619 28771 (GETSYNTAX 17629 . 22460) (SETSYNTAX 22462 . 23535) (SYNTAXP 23537 . 26034)
|
||||
(\COPYSYNTAX 26036 . 26753) (\GETCHARCODE 26755 . 27043) (\SETFATSYNCODE 27045 . 28336) (
|
||||
\MAPCHARTABLE 28338 . 28769)) (28804 43770 (CONTROL 28814 . 29066) (COPYTERMTABLE 29068 . 29435) (
|
||||
DELETECONTROL 29437 . 32078) (GETDELETECONTROL 32080 . 33042) (ECHOCHAR 33044 . 34485) (ECHOCONTROL
|
||||
34487 . 34944) (ECHOMODE 34946 . 35192) (GETECHOMODE 35194 . 35358) (GETCONTROL 35360 . 35526) (
|
||||
GETTERMTABLE 35528 . 35595) (RAISE 35597 . 36023) (GETRAISE 36025 . 36187) (RESETTERMTABLE 36189 .
|
||||
37273) (SETTERMTABLE 37275 . 37509) (TERMTABLEP 37511 . 37672) (\GETTERMSYNTAX 37674 . 37945) (
|
||||
\GTTERMTABLE 37947 . 38283) (\ORIGTERMTABLE 38285 . 41895) (\SETTERMSYNTAX 41897 . 42532) (
|
||||
\TERMCLASSTOCODE 42534 . 42963) (\TERMCODETOCLASS 42965 . 43352) (\LITCHECK 43354 . 43768)) (46281
|
||||
70105 (COPYREADTABLE 46291 . 46489) (FIND-READTABLE 46491 . 46638) (IN-READTABLE 46640 . 46800) (
|
||||
ESCAPE 46802 . 47055) (GETBRK 47057 . 47195) (GETREADTABLE 47197 . 47333) (GETSEPR 47335 . 47473) (
|
||||
READMACROS 47475 . 47738) (READTABLEP 47740 . 47903) (READTABLEPROP 47905 . 53063) (RESETREADTABLE
|
||||
53065 . 57312) (SETBRK 57314 . 58924) (SETREADTABLE 58926 . 59114) (SETSEPR 59116 . 60658) (
|
||||
\GETREADSYNTAX 60660 . 63350) (\GTREADTABLE 63352 . 63577) (\GTREADTABLE1 63579 . 63835) (
|
||||
\ORIGREADTABLE 63837 . 65745) (\READCLASSTOCODE 65747 . 66198) (\SETMACROSYNTAX 66200 . 67995) (
|
||||
\SETREADSYNTAX 67997 . 69058) (\READTABLEP.DEFPRINT 69060 . 70103)) (82937 87494 (\ATBLSET 82947 .
|
||||
87492)) (87941 91385 (MAKE-READER-ENVIRONMENT 87951 . 89608) (EQUAL-READER-ENVIRONMENT 89610 . 90787)
|
||||
(SET-READER-ENVIRONMENT 90789 . 91383)))))
|
||||
STOP
|
||||
|
||||
Binary file not shown.
@ -1,12 +1,12 @@
|
||||
(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 " 2-Nov-2025 19:49:02" IL:|{DSK}<home>matt>Interlisp>medley>sources>LLPACKAGE.;2| 92970
|
||||
|
||||
:EDIT-BY "mth"
|
||||
|
||||
:CHANGES-TO (IL:FNS XCL:DEFPACKAGE)
|
||||
|
||||
:PREVIOUS-DATE " 4-Sep-2024 13:17:23" IL:|{DSK}<home>matt>Interlisp>medley>sources>LLPACKAGE.;2|
|
||||
:PREVIOUS-DATE "30-Oct-2025 14:25:43" IL:|{DSK}<home>matt>Interlisp>medley>sources>LLPACKAGE.;1|
|
||||
)
|
||||
|
||||
|
||||
@ -524,7 +524,9 @@
|
||||
(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 2-Nov-2025 19:48 by mth")
|
||||
(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
|
||||
@ -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))))))
|
||||
PACKAGE)))
|
||||
((:SHADOW :SHADOWING-IMPORT)
|
||||
(LET ((IL:SYMBOLS-TO-SHADOW (IL:MAPCONC
|
||||
VALUES
|
||||
@ -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))
|
||||
@ -648,6 +675,37 @@
|
||||
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)))))
|
||||
)
|
||||
PACKAGE)))
|
||||
(:SHADOWING-IMPORT
|
||||
(SHADOWING-IMPORT (CDR IL:FORM)
|
||||
PACKAGE))
|
||||
@ -1663,7 +1721,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
|
||||
@ -1691,23 +1749,23 @@ IL:\\PKG-FIND-FREE-PACKAGE-INDEX 17838 . 18248)) (18305 18451 (IL:SETF-SYMBOL-PA
|
||||
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)))))
|
||||
23194)) (23196 24845 (MAKE-PACKAGE 23196 . 24845)) (24846 39766 (XCL:DEFPACKAGE 24859 . 39764)) (39815
|
||||
40037 (FIND-PACKAGE 39815 . 40037)) (40039 43400 (USE-PACKAGE 40039 . 43400)) (43402 43882 (
|
||||
IN-PACKAGE 43402 . 43882)) (43884 44158 (XCL:PKG-GOTO 43884 . 44158)) (44160 45260 (RENAME-PACKAGE
|
||||
44160 . 45260)) (45262 46713 (XCL:DELETE-PACKAGE 45262 . 46713)) (46715 49661 (EXPORT 46715 . 49661))
|
||||
(49663 50906 (UNEXPORT 49663 . 50906)) (50908 52552 (IMPORT 50908 . 52552)) (52554 53834 (
|
||||
SHADOWING-IMPORT 52554 . 53834)) (53836 54890 (SHADOW 53836 . 54890)) (54892 55547 (UNUSE-PACKAGE
|
||||
54892 . 55547)) (55611 55917 (LIST-ALL-PACKAGES 55611 . 55917)) (55974 59657 (IL:ADD-SYMBOL 55974 .
|
||||
59657)) (59659 63712 (IL:WITH-SYMBOL 59659 . 63712)) (63714 65017 (IL:INTERN* 63714 . 65017)) (65019
|
||||
70851 (IL:FIND-SYMBOL* 65019 . 70851)) (70853 72304 (INTERN 70853 . 72304)) (72306 72884 (FIND-SYMBOL
|
||||
72306 . 72884)) (72942 73838 (IL:NUKE-SYMBOL 72942 . 73838)) (73840 75954 (UNINTERN 73840 . 75954)) (
|
||||
75956 77099 (IL:MOBY-UNINTERN 75956 . 77099)) (77158 77230 (IL:\\INDEXATOMPNAME 77158 . 77230)) (77342
|
||||
77489 (IL:MAKE-DO-SYMBOLS-VARS 77342 . 77489)) (77491 78946 (IL:MAKE-DO-SYMBOLS-CODE 77491 . 78946))
|
||||
(78950 79728 (DO-EXTERNAL-SYMBOLS 78950 . 79728)) (79730 81076 (XCL:DO-LOCAL-SYMBOLS 79730 . 81076)) (
|
||||
81078 82194 (XCL:DO-INTERNAL-SYMBOLS 81078 . 82194)) (82196 84494 (DO-SYMBOLS 82196 . 84494)) (84496
|
||||
86178 (DO-ALL-SYMBOLS 84496 . 86178)) (86246 86771 (FIND-ALL-SYMBOLS 86246 . 86771)) (86773 87052 (
|
||||
IL:BRIEFLY-DESCRIBE-SYMBOL 86773 . 87052)) (87054 88568 (APROPOS 87054 . 88568)) (88570 90137 (
|
||||
APROPOS-LIST 88570 . 90137)) (90241 91768 (IL:FIND-EXTERNAL-SYMBOL 90241 . 91768)) (91770 92290 (
|
||||
IL:FIND-EXACT-SYMBOL 91770 . 92290)) (92292 92372 (IL:PACKAGE-NAME-AS-SYMBOL 92292 . 92372)) (92374
|
||||
92523 (IL:\\FIND.PACKAGE.INTERNAL 92374 . 92523)))))
|
||||
IL:STOP
|
||||
|
||||
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user