From 2d91426dc145173dc680407a671ad825abc7d5f4 Mon Sep 17 00:00:00 2001 From: Matt Heffron Date: Sun, 2 Nov 2025 20:14:07 -0800 Subject: [PATCH 1/2] Add :IMPORT-FROM option to DEFPACKAGE (#2335) * Add :IMPORT-FROM option to DEFPACKAGE * Fix a couple of variable reference typos. Change the FILETYPE to be :FAKE-COMPILE-FILE (per #2336) * Fix error of missing arg in call to IMPORT. --- sources/LLPACKAGE | 106 +++++++++++++++++++++++++++++++---------- sources/LLPACKAGE.LCOM | Bin 67318 -> 68206 bytes 2 files changed, 82 insertions(+), 24 deletions(-) diff --git a/sources/LLPACKAGE b/sources/LLPACKAGE index e8ff841d..e7031140 100644 --- a/sources/LLPACKAGE +++ b/sources/LLPACKAGE @@ -1,12 +1,12 @@ (DEFINE-FILE-INFO PACKAGE "LISP" READTABLE "XCL" BASE 10) -(IL:FILECREATED " 5-Sep-2024 17:42:20" IL:|{DSK}matt>Interlisp>medley>sources>LLPACKAGE.;3| 87515 +(IL:FILECREATED " 2-Nov-2025 19:49:02" IL:|{DSK}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}matt>Interlisp>medley>sources>LLPACKAGE.;2| + :PREVIOUS-DATE "30-Oct-2025 14:25:43" IL:|{DSK}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 diff --git a/sources/LLPACKAGE.LCOM b/sources/LLPACKAGE.LCOM index aab75ccfb9b1a58be1e9e2bb9d34c55cb80ad2e9..f0f9a44b53e8d215e0f2d0c1acd84eca7af41382 100644 GIT binary patch delta 2283 zcmb_eT}+#06z2Vq2n@Ereu=7mZnr@!IIkOpF)acwu&>iSh5e-%o)-VvKUr_dVyl z&vVXm&T0AOy{4aUH@%S{ zei&1!kRB`>#8=h5JHrVIxg_x0eQX9%@(Y!W{g6J?Yr$-sJg+-Ht&jg%|wS1(KA|TBugv|8QHdUG^O2IdeznR{nPryQdhHcZlLCTMZdN* z8g`x-EnalM-=hy|PKUGlqj}kWCe}=?Up;lJ#{5*G$5@SdsQn|(CM& zJ6*f?NQc+V-RG-0Zj74wd}@7eFM8P4L^Vuv@Q|RTLz@A4j|6A@Z_RiM0oNAk-t8rU z0xEP<%&!UZdKj-=?sjLLoQ?&IN7XK~fNm1#tbS{feMnC0k(KWDKkn3=FMC>jhIN4P zu+0NC$2a<=l`*EIKUfL*qGtTgb2jphU;l08WK)m7(4%*jPicK=uiv1#PkL%h-k>_4 z?5zGk^KT=)jMd(c>ZI3cckFq~xII?~O46%W%CA*wj{8T%I_}!BS11C29_SW4c2@KM zN5Awh%KnPaSM4?{-fX1%uF+JZu(}VVc3rLgxjW;F8J1Q@FXjZ{z^Eh4aS^&4xfnT{ z98TxKfJKyxMTg0`c=}8zp30CcSg|6a##w?DtRz(}n=tFYz^YXQL$;Tue>z#(nS%z(ubP1IsyE3AOx>AaRrBZcM$ zC0Hbi3>8@(`5>JVk!^aLPvO91l#66VLdj?@k7SCFRHK+Kng!g%XqLFz73y0+u70zT9Wm|kC@}NUfO=+n?B!JmcUl6eYmNvu} zc-hik;J5?Q3)qOWMG;tRS8fQ;OZ)-d^_k0mRiHZpf>C(9`K-ht)#Nw7G%*WVSQe!4 z5>l-$DL7&SAelc3Oy(eZKb8!VnudN*9VgToxH9Fkxp)l60!iI16cCea+z@u37Q9{e0|p3P|}0(GRK2`yxgL*z&WL{Q64 zMTCX1qeXmVxS;H*z>Dy7U%mR>H$Q2Dt;2e1^;898nD*e{L=lxPT$-9JquB+d&dx8E zmdl~(<)%Z?<|(`2YX_ delta 1438 zcmZuxOKcle6!nWk)VQJbCn}9`+FMsb>B44a-kX^>qgKi^p2YuWja@Ynq81{B2=PfG zBO%4a2(hUOg78401tBCV!O~7tiJjF2s*tEyAhDqv7Hlh4u%o>BC02)x#sotoFXX%WZfi+sYp97S7vbc0%WnAE5H4^Uz9|Jm{{GppIsh- z^Z9%hN>#JF`cmimYWK(XYL{7+U)s19jSf%p zuQz5V(8Kuwdcf~(l=Eo2y!vWHeE#};fHubZfBH9j&lD$I^rsV_4$up4xtGNOs&Zp9 z^BnOhw<^V$ix1HGP~!HmSP8I`d~5TKUgVp@Qb><{==XnL4y@J_QmoR?uc8Dx&Q1ls z)1J;9c4{sC-deI9kKSg5kP-viST= z|2N;{i?BLO-SoC8d-}svDka3C?+^Z!2k6H{{ArIqj}p?v{2=l(*E-AS75;H27o)z= ze!9$m={!50PPfziQRm!}QctEmtshugba>t`R%iNuxci)785G3()sSVzg2W=<2H@Un zL*c|S{T9Emd9Bx%1N_TFa(~u0zID)k!&|^J3Wk4tX)RUsfOuriP&H^+3l(e0&eg4& z4F)#cgV8LqE7d~11%^VQS+ol5YN@`IE7cmz5uhwVFSw?L1opBAQ%!YyZO35_P*s6a zy=6OfpagrGEk|fHfMRh5gNm!}9Xa2f%363IOa;0wAa4NBi3(M#*#ccC^n{buXjE4~ zm$XA$RnQM+P{j-td*v!~3Jp-nXhj$wR0tiJo9NH5wEH)QbHM@41 z@4oZ6XUIB;;GW2e8WhYRD_t0wL0Gy*LN;hr39m;|)^x!RIyFsb2c4RF-~$?wUEGcN zxK+)uy2wMrm?Lw#CtgsdpR=g=DK|kAF95UQ*o&oQKXTO&K)tk3aUXvZRH}h_rD=mI zQK(rJI~P6(q6w@2tw*pFqJSw54-;VR>``>A;*iddZG9ItFyZ@K=b}`lyxo01s!I~z t>7IEi2C6Rcsck^+_n9cs4S}B>R}36;iTuI47g20~a{Hf~yAv_A_8;FnZtMU6 From eb14868208d6a447f1267def40621a9e61003a3e Mon Sep 17 00:00:00 2001 From: rmkaplan <69548581+rmkaplan@users.noreply.github.com> Date: Mon, 3 Nov 2025 14:54:31 -0800 Subject: [PATCH 2/2] Rmk138 MCCS stragglers (#2332) * ATBL: Use :MCCS instead of :XCCS for old-interlisp files * AOFD: put MCCS in comment, for cleanliness --- sources/AOFD | 35 +++++++++--------- sources/AOFD.LCOM | Bin 14110 -> 14123 bytes sources/ATBL | 88 ++++++++++++++++++++++------------------------ sources/ATBL.LCOM | Bin 35244 -> 35079 bytes 4 files changed, 62 insertions(+), 61 deletions(-) diff --git a/sources/AOFD b/sources/AOFD index 411e85aa..0493ebb5 100644 --- a/sources/AOFD +++ b/sources/AOFD @@ -1,10 +1,12 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "17-May-2023 08:29:55" {DSK}larry>il>medley>sources>AOFD.;5 36263 +(FILECREATED "24-Apr-2025 21:46:04" {WMEDLEY}AOFD.;10 36381 - :EDIT-BY "lmm" + :EDIT-BY rmk - :PREVIOUS-DATE "17-May-2023 08:05:56" {DSK}larry>il>medley>sources>AOFD.;4) + :CHANGES-TO (FNS MAKE-STRING-FORMAT) + + :PREVIOUS-DATE "17-May-2023 08:29:55" {WMEDLEY}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 diff --git a/sources/AOFD.LCOM b/sources/AOFD.LCOM index 52305183724b8959533289159ef751477a62e2f9..d6269a0838a92dcaf9aa6cffd6401a97d50e7d67 100644 GIT binary patch delta 346 zcmbQ2w>ob^c)gK{u46%wu91O}se+NAm5HU5fvJ*$hEj5VZb4>FYKlUBo`RA>b-1sq zi;rt$txa)$X;E@&v7Mv8n~R>cp@F7?60#A77FGtvR;C6@Tna_0a5GXX3UV@&GfQ$R zRjm|!9lc$3gF}Km{oHlk>ivU!9YYi{ftI+1`uHdyo293xr=*aQSORneHakp}G`Td~ zJbhf9gIpa$TwPEVf&5}-WnhBO?Fz_u-v?lF~Jl7hP+>Y delta 347 zcmZ3TH!p8Oc)g*yu5V(cu91O}v4Vkxm9e3fv5}I3hEj5VZb4>FYKlUBo`RA>wM(#f ztxZOLZmL~QVo_10U1pA5ZfZ(SYNcIqerZv1YO$T8znhDmwW+28mlB$pM#feqW=aZ4 zMX7K@9esQhGJyuW)rSIE$m;d<^pq4*5=($KV>8E6Ns~*%&C|!#Imp#9#MK2;k)@TX zDe(@Lv^G^RHZw9aR)Y*?gKY!4v?B CZDpkZ diff --git a/sources/ATBL b/sources/ATBL index a3dc9fc0..b8edac7d 100644 --- a/sources/ATBL +++ b/sources/ATBL @@ -1,16 +1,13 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "26-Dec-2021 14:32:50" {DSK}kaplan>Local>medley3.5>my-medley>sources>ATBL.;32 91860 +(FILECREATED "24-Apr-2025 21:52:35" {WMEDLEY}ATBL.;33 91754 - :CHANGES-TO (FNS MAKE-READER-ENVIRONMENT) + :EDIT-BY rmk - :PREVIOUS-DATE "19-Dec-2021 14:09:43" -{DSK}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}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 diff --git a/sources/ATBL.LCOM b/sources/ATBL.LCOM index 49a09944f99350703ee4aeb10db5932d3a483b80..0ca358952bdd542cb70b664ecbfb241bf06088b9 100644 GIT binary patch delta 697 zcmZ28nW=pe(}eJP1tVSG#7bQw10z!f14}C-b1MU5B?S$oKE9^?N!Mut7ReNwzXZ&Kf%&j1AJAi{$iObQ@z_IqVtiP~@yS;Qy% zO3a313>wDf1`4ju9{xZt1t}Pt8X<9vEhleOdnRFKqTuQ0;^_?Xh_Q*80x&3j6pW3H zCofaKA!ux5p`c+5bfB@Jfr7Dth34j34G&F5-_6GYzo@V%xG5M+eo!LAT*1IN`9PV7 zZK?ws$Z;nb9HI1wEkRHr7N`)*hb{I{A&#xg0Z>s8bFyT){^a;_2}ZNYiRB`bd&PGV}3G>;M@mXH_};@FXsHmwk9 zHzXDw{srs|6)6*-va(kKv9T~$z=#CCG|&oxgv1@r)pzdWob&14dyglc1``jjuAxLU zZ8xJxKq82770aq9u)wiRuiI-ob_+ZgSYYm?%ky_HR{OT!*E)@!({MG*Yc?FMYquPG z6~`p4yBggsw7$3GH|@Tbs?1rj3mEahB56+sAr&Q6q_A+qkJ!J27<;AXw43dLvwBvA z;K(4d)(*8ZRm+0?$78V=3$4Z=^!A5qvBdHWmoY6vFBz$dkq$Tg77?jZ81Wwx;lD=$ zMiG+<0aQJg%4dyov{C>rlP?qBr*HD07E8vWS*Vty>CgnQqOzAiY_p)Kar~cc6-Te> zuPl9g^lCs5_;m92(xOKU+UEg@WpRqdI*Eil$9F{N` zdae-WC;`S&P@nyHG%kagPn$Zij*$}7&b=GWaao?OjqWdenVI5&TBoSs$?^%KdufU& zyrEL#d1tderY6VK