From 721bcecbc01d6b166ad2f61f6b98a970a1857ff5 Mon Sep 17 00:00:00 2001 From: rmkaplan <69548581+rmkaplan@users.noreply.github.com> Date: Mon, 29 Dec 2025 11:09:44 -0800 Subject: [PATCH 1/2] #2353Remove vacuous (BYTESIZE) from DIRECTORY LENGTH column (#2431) Remove vacuous {BYTESIZE) from DIRECTORY LENGTH column --- sources/DIRECTORY | 26 +++++++++++--------------- sources/DIRECTORY.LCOM | Bin 11187 -> 10994 bytes 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/sources/DIRECTORY b/sources/DIRECTORY index b5067edf..7bb1bf2e 100644 --- a/sources/DIRECTORY +++ b/sources/DIRECTORY @@ -1,16 +1,13 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "29-Mar-2022 10:53:16" {DSK}kaplan>Local>medley3.5>my-medley>sources>DIRECTORY.;15 28665 +(FILECREATED " 6-Nov-2025 00:13:55" {WMEDLEY}DIRECTORY.;17 28439 - :CHANGES-TO (FNS DIRECTORY) + :EDIT-BY rmk - :PREVIOUS-DATE "29-Mar-2022 08:29:33" -{DSK}kaplan>Local>medley3.5>my-medley>sources>DIRECTORY.;14) + :CHANGES-TO (VARS DIRCOMMANDS) + :PREVIOUS-DATE "22-Oct-2025 22:07:27" {WMEDLEY}DIRECTORY.;16) -(* ; " -Copyright (c) 1986-1988, 1990, 1992 by Venue & Xerox Corporation. -") (PRETTYCOMPRINT DIRECTORYCOMS) @@ -419,7 +416,7 @@ Copyright (c) 1986-1988, 1990, 1992 by Venue & Xerox Corporation. DELETE (DELETE? PROMPT " delete? " DELETE) DELETED - (LE LENGTH "(" BYTESIZE ")") + (LE . LENGTH) NEWERTHAN OLDVERSIONS (OLD OLDERTHAN 90) OLDERTHAN (OU . OUT) @@ -463,12 +460,11 @@ Copyright (c) 1986-1988, 1990, 1992 by Venue & Xerox Corporation. (GLOBALVARS DIRCOMMANDS ASKUSERTTBL FILEINFOTYPES) ) ) -(PUTPROPS DIRECTORY COPYRIGHT ("Venue & Xerox Corporation" 1986 1987 1988 1990 1992)) (DECLARE%: DONTCOPY - (FILEMAP (NIL (1325 27144 (DODIR 1335 . 1882) (FILDIR 1884 . 2164) (DIRECTORY 2166 . 12883) ( -DIRECTORY.PARSE 12885 . 14179) (DIRECTORY.FILL.PATTERN 14181 . 14711) (DIRCONJ 14713 . 14933) ( -DIRECTORY.NEXTFILE 14935 . 15528) (DMATCH 15530 . 15905) (DIRECTORY.MATCH.SETUP 15907 . 16441) ( -DIRECTORY.MATCH 16443 . 16860) (DIRECTORY.MATCH1 16862 . 18975) (DODIRCOMMANDS 18977 . 24447) ( -DIRPRINTNAME 24449 . 25865) (DPRIN1 25867 . 25952) (DIRFILENAME 25954 . 26675) (DIRGETFILEINFO 26677 - . 26829) (DREAD 26831 . 27142))))) + (FILEMAP (NIL (1200 27019 (DODIR 1210 . 1757) (FILDIR 1759 . 2039) (DIRECTORY 2041 . 12758) ( +DIRECTORY.PARSE 12760 . 14054) (DIRECTORY.FILL.PATTERN 14056 . 14586) (DIRCONJ 14588 . 14808) ( +DIRECTORY.NEXTFILE 14810 . 15403) (DMATCH 15405 . 15780) (DIRECTORY.MATCH.SETUP 15782 . 16316) ( +DIRECTORY.MATCH 16318 . 16735) (DIRECTORY.MATCH1 16737 . 18850) (DODIRCOMMANDS 18852 . 24322) ( +DIRPRINTNAME 24324 . 25740) (DPRIN1 25742 . 25827) (DIRFILENAME 25829 . 26550) (DIRGETFILEINFO 26552 + . 26704) (DREAD 26706 . 27017))))) STOP diff --git a/sources/DIRECTORY.LCOM b/sources/DIRECTORY.LCOM index 0348d4da3708ae7ef164bde477752bc603c93a57..579f3e1b71f797a1642822b7dc6281698298039f 100644 GIT binary patch delta 386 zcmZvY?Mj1C9L6z%!cRec@6U-yiz9lLnuoqPJ=+9d;;0+@Seulz>97&Oi0BRiFGaeb zZXvpW{1Cmd3-~?H?|GWhd-^g`!N6g8kBLfjP*tjRsIDWB(4?F%@>w>8vH%3DQNUcE zjUUhJXJPNjltDzqz|my+MOswTsAeI!sE*JmT9-*IB#Tnd^O?h$oiMkx*S=dho^{aeR hzsb9TSbxaj&XDnL6f>~XWDs!>8-BbcY=)jMegff+W`6(x delta 641 zcmb`F!AiqG5Qgz2FLT@VICTW$UH!Cd zU_hH*rJ7|J*71TMxXI+Fn*#D-n&tZze9gkJ0BFR%51ZqZxHYLe9dCJm9df%e`hx6o1l|lY0pVa4oa+0h~0Orde_~OeYA+ VX05uGleN?eF-vP97%PG2EAK(!xT^pF From 50ab6599ae06091138578ff8b70cf2142a09472d Mon Sep 17 00:00:00 2001 From: Matt Heffron Date: Mon, 29 Dec 2025 11:12:58 -0800 Subject: [PATCH 2/2] Add to `DEFINE-RECORD` expansion providing of arglist info for generated macros. (#2415) **NOTE:** This uses the function `IL:CLSMARTEN` which is from the file `CLSMARTARGS`. The file `CLSMARTARGS` isn't loaded until almost immediately **after** `XCL-EXTRAS`. There are no uses of `DEFINE-RECORD` in making the `lisp.sysout` loadup, so this _ought_ to be safe, but this must be verified! --- sources/XCL-EXTRAS | 90 +++++++++++++++++++++------------------ sources/XCL-EXTRAS.DFASL | Bin 11132 -> 11246 bytes 2 files changed, 48 insertions(+), 42 deletions(-) diff --git a/sources/XCL-EXTRAS b/sources/XCL-EXTRAS index 1312a13b..97655218 100644 --- a/sources/XCL-EXTRAS +++ b/sources/XCL-EXTRAS @@ -1,13 +1,14 @@ -(DEFINE-FILE-INFO READTABLE "XCL" PACKAGE "XCL") -(IL:FILECREATED "18-May-90 01:15:40" IL:|{DSK}local>lde>lispcore>sources>XCL-EXTRAS.;2| 15315 +(DEFINE-FILE-INFO PACKAGE "XEROX-COMMON-LISP" READTABLE "XCL" BASE 10) - IL:|changes| IL:|to:| (IL:VARS IL:XCL-EXTRASCOMS) +(IL:FILECREATED "11-Dec-2025 22:27:58" IL:|{DSK}matt>Interlisp>medley>sources>XCL-EXTRAS.;2| 15547 - IL:|previous| IL:|date:| "11-Jan-88 16:59:17" -IL:|{DSK}local>lde>lispcore>sources>XCL-EXTRAS.;1|) + :EDIT-BY "mth" + :CHANGES-TO (IL:FUNCTIONS DEFINE-RECORD) + + :PREVIOUS-DATE "18-May-90 01:15:40" IL:|{DSK}matt>Interlisp>medley>sources>XCL-EXTRAS.;1| +) -; Copyright (c) 1987, 1988, 1990 by Venue & Xerox Corporation. All rights reserved. (IL:PRETTYCOMPRINT IL:XCL-EXTRASCOMS) @@ -145,8 +146,7 @@ IL:|{DSK}local>lde>lispcore>sources>XCL-EXTRAS.;1|) IL:*INTERLISP-PACKAGE*)) (COLLECT KEYWORD-SYMBOL) (IF (NOT (MEMBER KEYWORD-SYMBOL '(IL:USING IL:COPYING - IL:REUSING IL:SMASHING - ) + IL:REUSING IL:SMASHING) :TEST #'EQ)) (COLLECT 'IL:_)) @@ -162,12 +162,12 @@ IL:|{DSK}local>lde>lispcore>sources>XCL-EXTRAS.;1|) (DEFDEFINER DEFINE-RECORD IL:STRUCTURES (RECORD-NAME INTERLISP-RECORD-NAME &KEY (CONC-NAME NIL - CONC-NAME-P - ) - (CONSTRUCTOR NIL CONSTRUCTOR-P) - (PREDICATE NIL PREDICATE-P) - (FAST-ACCESSORS NIL) - (PACKAGE *PACKAGE*)) + CONC-NAME-P) + (CONSTRUCTOR NIL CONSTRUCTOR-P) + (PREDICATE NIL PREDICATE-P) + (FAST-ACCESSORS NIL) + (PACKAGE *PACKAGE*)) + (IL:* IL:\; "Edited 11-Dec-2025 21:43 by mth") (IF (NOT (PACKAGEP PACKAGE)) (SETQ PACKAGE (FIND-PACKAGE PACKAGE))) (SETQ CONC-NAME (IF CONC-NAME-P @@ -195,7 +195,8 @@ IL:|{DSK}local>lde>lispcore>sources>XCL-EXTRAS.;1|) 'SETF-RECORD-ACCESS-MACRO) (SETF (GET ',NEW-NAME :SLOT-INFO) ',`((,INTERLISP-RECORD-NAME ,FIELD-NAME) - ,FAST-ACCESSORS)))))) + ,FAST-ACCESSORS)) + (IL:CLSMARTEN '((,NEW-NAME IL:OBJECT))))))) FIELD-NAMES) ,@(LET ((NEW-NAME (IF PREDICATE-P PREDICATE @@ -214,7 +215,8 @@ IL:|{DSK}local>lde>lispcore>sources>XCL-EXTRAS.;1|) `((SETF (MACRO-FUNCTION ',NEW-NAME) 'RECORD-PREDICATE-MACRO) (SETF (GET ',NEW-NAME :TYPE-INFO) - ',INTERLISP-RECORD-NAME)))) + ',INTERLISP-RECORD-NAME) + (IL:CLSMARTEN '((,NEW-NAME IL:OBJECT)))))) ,@(LET ((NEW-NAME (IF CONSTRUCTOR-P CONSTRUCTOR (INTERN (CONCATENATE 'STRING "MAKE-" (STRING RECORD-NAME)) @@ -234,7 +236,8 @@ IL:|{DSK}local>lde>lispcore>sources>XCL-EXTRAS.;1|) `((SETF (MACRO-FUNCTION ',NEW-NAME) 'RECORD-CONSTRUCTOR-MACRO) (SETF (GET ',NEW-NAME :FIELD-INFO) - '(,INTERLISP-RECORD-NAME ,FIELD-NAMES)))))))) + '(,INTERLISP-RECORD-NAME ,FIELD-NAMES)) + (IL:CLSMARTEN '((,NEW-NAME &KEY ,@FIELD-NAMES))))))))) (DEFUN RECORD-ACCESS-MACRO (FORM &OPTIONAL ENV) (DECLARE (IGNORE ENV)) @@ -257,8 +260,8 @@ IL:|{DSK}local>lde>lispcore>sources>XCL-EXTRAS.;1|) (DEFUN RECORD-PREDICATE-MACRO (FORM &OPTIONAL ENV) (DECLARE (IGNORE ENV)) `(IL:|type?| ,(OR (GET (CAR FORM) - :TYPE-INFO) - (ERROR "No type information cached.")) + :TYPE-INFO) + (ERROR "No type information cached.")) ,(SECOND FORM))) (DEFUN RECORD-CONSTRUCTOR-MACRO (FORM &OPTIONAL ENV) @@ -267,32 +270,35 @@ IL:|{DSK}local>lde>lispcore>sources>XCL-EXTRAS.;1|) (OR (GET (CAR FORM) :FIELD-INFO) (ERROR "No field information cached.")) - `(IL:|create| ,TYPE - ,@(WITH-COLLECTION (DO* ((KEYWORD (CDR FORM) - (CDDR KEYWORD)) - (KEYWORD-SYMBOL (CAR KEYWORD) - (CAR KEYWORD)) - (VALUE (CADR KEYWORD) - (CADR KEYWORD)) - RESERVED-WORD) - ((NULL KEYWORD)) - (SETQ RESERVED-WORD - (CAR (MEMBER KEYWORD-SYMBOL - '(IL:USING IL:COPYING IL:REUSING - IL:SMASHING) - :TEST - 'STRING=))) - (COLLECT (OR RESERVED-WORD (CAR (MEMBER KEYWORD-SYMBOL - FIELD-NAMES :TEST - 'STRING=)))) - (IF (NOT RESERVED-WORD) - (COLLECT 'IL:_)) - (COLLECT VALUE)))))) + `(IL:|create| ,TYPE ,@(WITH-COLLECTION (DO* ((KEYWORD (CDR FORM) + (CDDR KEYWORD)) + (KEYWORD-SYMBOL (CAR KEYWORD) + (CAR KEYWORD)) + (VALUE (CADR KEYWORD) + (CADR KEYWORD)) + RESERVED-WORD) + ((NULL KEYWORD)) + (SETQ RESERVED-WORD + (CAR (MEMBER KEYWORD-SYMBOL + '(IL:USING IL:COPYING + IL:REUSING IL:SMASHING) + :TEST + 'STRING=))) + (COLLECT (OR RESERVED-WORD + (CAR (MEMBER KEYWORD-SYMBOL + FIELD-NAMES :TEST + 'STRING=)))) + (IF (NOT RESERVED-WORD) + (COLLECT 'IL:_)) + (COLLECT VALUE)))))) (IL:PUTPROPS IL:XCL-EXTRAS IL:FILETYPE :COMPILE-FILE) (IL:PUTPROPS IL:XCL-EXTRAS IL:MAKEFILE-ENVIRONMENT (:READTABLE "XCL" :PACKAGE "XCL")) -(IL:PUTPROPS IL:XCL-EXTRAS IL:COPYRIGHT ("Venue & Xerox Corporation" 1987 1988 1990)) (IL:DECLARE\: IL:DONTCOPY - (IL:FILEMAP (NIL))) + (IL:FILEMAP (NIL (2264 4771 (ONCE-ONLY 2264 . 4771)) (4828 5137 (RECORD-FETCH 4828 . 5137)) (5139 5483 + (SETF-FETCH 5139 . 5483)) (5485 5796 (RECORD-FFETCH 5485 . 5796)) (5798 6144 (SETF-FFETCH 5798 . 6144 +)) (6146 7341 (RECORD-CREATE 6146 . 7341)) (12279 12699 (RECORD-ACCESS-MACRO 12279 . 12699)) (13146 +13397 (RECORD-PREDICATE-MACRO 13146 . 13397)) (13399 15360 (RECORD-CONSTRUCTOR-MACRO 13399 . 15360)))) +) IL:STOP diff --git a/sources/XCL-EXTRAS.DFASL b/sources/XCL-EXTRAS.DFASL index ffaff01bd027935f6c8e49185d6c8f888bd15f9c..ad835e6ed5badbf3ffafb824e3b4f9752688d57e 100644 GIT binary patch delta 3011 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