Skip to content

Commit c5dd583

Browse files
AnzusAnzus
authored
Fixed issue 1883, error in printing class from CLOS browser (#2187)
2 parents 499e3ab + 356fd62 commit c5dd583

File tree

2 files changed

+40
-37
lines changed

2 files changed

+40
-37
lines changed

‎clos/NEW-CLOS-BROWSER

Lines changed: 40 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
(DEFINE-FILE-INFO PACKAGE (PROGN (DEFPACKAGE "CLOS-BROWSER" (USE "CLOS") (EXPORT "CLOS-ICON"
2-
"CLOS-BROWSER" "ADD-BROWSER-METHOD" "BROWSE-CLASS")) (CLFIND-PACKAGE "USER")) READTABLE "XCL" BASE
3-
10)
1+
(DEFINE-FILE-INFO PACKAGE (PROGN (DEFPACKAGE "CLOS-BROWSER" (USE "CLOS" "LISP") (EXPORT "CLOS-ICON"
2+
"CLOS-BROWSER" "ADD-BROWSER-METHOD" "BROWSE-CLASS")) (CLFIND-PACKAGE "USER")) READTABLE "XCL" BASE
3+
10)
44

5-
(IL:FILECREATED " 5-Dec-2023 12:07:41" IL:{CLOS}NEW-CLOS-BROWSER.\;3 91622
5+
(IL:FILECREATED "28-Apr-2025 18:32:38" 
6+
IL:|{DSK}<Users>arunwelch>DOCUMENTS>MEDLEY-WORKSPACE>RELEASE>NEW-CLOS-BROWSER.;4| 91934
67

7-
:EDIT-BY "mth"
8+
:EDIT-BY "akw"
89

910
:CHANGES-TO (IL:PROPS (IL:NEW-CLOS-BROWSER IL:MAKEFILE-ENVIRONMENT))
1011

11-
:PREVIOUS-DATE " 5-Dec-2023 00:58:05" IL:{CLOS}NEW-CLOS-BROWSER.\;2)
12+
:PREVIOUS-DATE "26-Apr-2025 17:16:46"
13+
IL:|{DSK}<Users>arunwelch>DOCUMENTS>MEDLEY-WORKSPACE>RELEASE>NEW-CLOS-BROWSER.;3|)
1214

1315

14-
; Copyright (c) 1991, 2020, 2023 by Venue.
15-
1616
(IL:PRETTYCOMPRINT IL:NEW-CLOS-BROWSERCOMS)
1717

1818
(IL:RPAQQ IL:NEW-CLOS-BROWSERCOMS
@@ -275,7 +275,7 @@
275275

276276
(IL:PUTPROPS IL:NEW-CLOS-BROWSER IL:MAKEFILE-ENVIRONMENT (:PACKAGE (PROGN (XCL:DEFPACKAGE
277277
"CLOS-BROWSER"
278-
(:USE "CLOS")
278+
(:USE "CLOS" "LISP")
279279
(:EXPORT "CLOS-ICON"
280280
"CLOS-BROWSER"
281281
"ADD-BROWSER-METHOD"
@@ -1159,9 +1159,14 @@ Below this line operates on individual slots and methods."
11591159
(DOCUMENTATION (SLOT-VALUE CLOS-BROWSER::SELF 'CLOS-BROWSER::CLASS)))
11601160

11611161
(DEFMETHOD CLOS-BROWSER::PRINT-CLASS ((CLOS-BROWSER::SELF CLOS-BROWSER::CLOS-BROWSER-NODE))
1162-
(PPRINT (IL:GETDEF (SLOT-VALUE (SLOT-VALUE CLOS-BROWSER::SELF `CLOS-BROWSER::CLASS)
1163-
'CLOS::NAME)
1164-
'CLOS-BROWSER::CLASSES)))
1162+
(IF (IL:HASDEF (SLOT-VALUE (SLOT-VALUE CLOS-BROWSER::SELF 'CLOS-BROWSER::CLASS)
1163+
'CLOS::NAME)
1164+
'CLOS-BROWSER::CLASSES)
1165+
(PPRINT (IL:GETDEF (SLOT-VALUE (SLOT-VALUE CLOS-BROWSER::SELF `CLOS-BROWSER::CLASS)
1166+
'CLOS::NAME)
1167+
'CLOS-BROWSER::CLASSES))
1168+
(IL:PROMPTPRINT "No Printable Definition for the class " (SLOT-VALUE CLOS-BROWSER::SELF
1169+
'WEB::NAME))))
11651170

11661171
(DEFMETHOD CLOS-BROWSER::SPECIALIZE-CLASS ((CLOS-BROWSER::NODE CLOS-BROWSER::CLOS-BROWSER-NODE)
11671172
&OPTIONAL CLOS-BROWSER::FORM CLOS-BROWSER::NEW-CLASS-NAME)
@@ -1211,7 +1216,8 @@ Below this line operates on individual slots and methods."
12111216
(RETURN))))))
12121217
(IL:SETCURSOR CLOS-BROWSER::ORIGINALCURSOR))))))
12131218

1214-
(DEFUN CLOS-BROWSER::LYRIC-COMPLETE-SPECIALIZE (IGNORE STRUCTURE)
1219+
(DEFUN CLOS-BROWSER::LYRIC-COMPLETE-SPECIALIZE (IGNORE STRUCTURE)
1220+
(IL:* IL:\; "Edited 26-Apr-2025 14:31 by arunwelch")
12151221
(LET ((CLOS-BROWSER::ORIGINALCURSOR (IL:CURSOR)))
12161222
(UNWIND-PROTECT
12171223
(PROGN (IL:SETCURSOR IL:WAITINGCURSOR)
@@ -1224,8 +1230,7 @@ Below this line operates on individual slots and methods."
12241230
(IL:* IL:|;;| "check for bug")
12251231

12261232
(WHEN (SYMBOLP CLOS-BROWSER::SUB-CLASS)
1227-
(SETQ CLOS-BROWSER::SUB-CLASS (CLOS::SYMBOL-CLASS CLOS-BROWSER::SUB-CLASS
1228-
)))
1233+
(SETQ CLOS-BROWSER::SUB-CLASS (FIND-CLASS CLOS-BROWSER::SUB-CLASS)))
12291234
(DOLIST (CLOS-BROWSER::BROWSER (SLOT-VALUE CLOS-BROWSER:CLOS-ICON
12301235
'CLOS-BROWSER::CLASS-BROWSERS))
12311236
(DOLIST (CLOS-BROWSER::SUPER-CLASS (SLOT-VALUE CLOS-BROWSER::SUB-CLASS
@@ -1387,14 +1392,12 @@ Below this line operates on individual slots and methods."
13871392
(0 (FORMAT T "Unspecialized methods cannot be copied. ~A" (CLOS::FULL-METHOD-NAME
13881393
CLOS-BROWSER::METHOD NIL)))
13891394
(1 (SETQ CLOS-BROWSER::FROM-CLASS (CAR CLOS-BROWSER::NON-T-CLASSES)))
1390-
(OTHERWISE (SETQ CLOS-BROWSER::FROM-CLASS (CLOS::SYMBOL-CLASS
1391-
(IL:PROMPTFORWORD (FORMAT NIL
1395+
(OTHERWISE (SETQ CLOS-BROWSER::FROM-CLASS (FIND-CLASS (IL:PROMPTFORWORD
1396+
(FORMAT NIL
13921397
"Which class in ~A do you wish to move from?"
1393-
(
1394-
CLOS::FULL-METHOD-NAME
1395-
1396-
CLOS-BROWSER::METHOD
1397-
NIL))))))))
1398+
(CLOS::FULL-METHOD-NAME
1399+
CLOS-BROWSER::METHOD
1400+
NIL))))))))
13981401

13991402
(IL:* IL:|;;| "should contain from-class. If it is not the same, abort.")
14001403

@@ -1465,7 +1468,7 @@ Below this line operates on individual slots and methods."
14651468
 "fix bug in the inconsistent way CLOS objects store T class specializers and do method lookup.")
14661469

14671470
(WHEN (EQ CLOS-BROWSER::CLASS T)
1468-
(SETQ CLOS-BROWSER::CLASS (CLOS::SYMBOL-CLASS T)))
1471+
(SETQ CLOS-BROWSER::CLASS (FIND-CLASS T)))
14691472
(LET ((CLOS-BROWSER::NODE (CLOS-BROWSER::BROWSER-CONTAINS-P
14701473
CLOS-BROWSER::CLASS CLOS-BROWSER::BROWSER)))
14711474
(WHEN CLOS-BROWSER::NODE
@@ -1582,7 +1585,8 @@ Below this line operates on individual slots and methods."
15821585
(IL:|if| PACKAGE
15831586
IL:|then| (IN-PACKAGE PACKAGE))))
15841587

1585-
(DEFUN CLOS-BROWSER::CLASSES-IN-PACKAGE (PACKAGE &OPTIONAL CLOS-BROWSER::MAP-ON-PACKAGE)
1588+
(DEFUN CLOS-BROWSER::CLASSES-IN-PACKAGE (PACKAGE &OPTIONAL CLOS-BROWSER::MAP-ON-PACKAGE)
1589+
(IL:* IL:\; "Edited 26-Apr-2025 14:25 by arunwelch")
15861590
"Retrieves a list of all the classes for a given package. When map-on-package is t this can be very slow."
15871591

15881592
(IL:* IL:|;;| "The maphash is always fast, whereas for some strange reason map-on-package varys among packages greatly.")
@@ -1594,7 +1598,7 @@ Below this line operates on individual slots and methods."
15941598
(DO-SYMBOLS (CLOS-BROWSER::SYM PACKAGE)
15951599
(IF (AND (EQ (SYMBOL-PACKAGE CLOS-BROWSER::SYM)
15961600
PACKAGE)
1597-
(CLOS::SYMBOL-CLASS CLOS-BROWSER::SYM T))
1601+
(FIND-CLASS CLOS-BROWSER::SYM T))
15981602
(PUSH CLOS-BROWSER::SYM CLOS-BROWSER::CLASSES)))
15991603
(MAPHASH #'(LAMBDA (CLOS-BROWSER::KEY CLOS-BROWSER::VAL)
16001604
(IF (EQ (SYMBOL-PACKAGE CLOS-BROWSER::KEY)
@@ -1623,17 +1627,16 @@ Below this line operates on individual slots and methods."
16231627
IL:|BackgroundMenuCommands|)
16241628

16251629
(SETQ IL:|BackgroundMenu| NIL)
1626-
(IL:PUTPROPS IL:NEW-CLOS-BROWSER IL:COPYRIGHT ("Venue" 1991 2020 2023))
16271630
(IL:DECLARE\: IL:DONTCOPY
1628-
(IL:FILEMAP (NIL (11770 13440 (CLOS-BROWSER:BROWSE-CLASS 11770 . 13440)) (13442 14785 (
1629-
CLOS-BROWSER::COLLECT-FAMILY 13442 . 14785)) (14787 16819 (CLOS-BROWSER::MAKE-NODES 14787 . 16819)) (
1630-
16821 17496 (CLOS-BROWSER::CLOS-BROWSER-CLOSE-FN 16821 . 17496)) (17498 18430 (CLOS-BROWSER::BROWSER-CONTAINS-P
1631-
17498 . 18430)) (42263 42587 (CLOS-BROWSER::EDIT 42263 . 42587)) (42589 48183 (
1632-
CLOS-BROWSER::MAKE-METHOD-MENU-ITEMS 42589 . 48183)) (48185 49663 (CLOS-BROWSER::MAKE-TOP-LEVEL-METHOD-MENU-ITEMS
1633-
48185 . 49663)) (49665 50955 (CLOS-BROWSER::MAKE-MULTI-METHOD-SUB-MENU 49665 . 50955)) (64981 65598 (
1634-
CLOS-BROWSER::COMPLETE-ADD-METHOD 64981 . 65598)) (65600 67812 (CLOS-BROWSER::COMPLETE-SPECIALIZE
1635-
65600 . 67812)) (67814 69482 (CLOS-BROWSER::LYRIC-COMPLETE-SPECIALIZE 67814 . 69482)) (69484 69649 (
1636-
CLOS-BROWSER::THIS-CLASS-NODE-P 69484 . 69649)) (69651 69753 (CLOS::CLASS-DIRECT-METHODS 69651 . 69753
1637-
)) (86457 87472 (CLOS-BROWSER::REPLACE-SPECIALIZERS 86457 . 87472)) (87783 89367 (CLOS-BROWSER::IN-SELECT-PACKAGE
1638-
87783 . 89367)) (89369 90516 (CLOS-BROWSER::CLASSES-IN-PACKAGE 89369 . 90516)))))
1631+
(IL:FILEMAP (NIL (11846 13516 (CLOS-BROWSER:BROWSE-CLASS 11846 . 13516)) (13518 14861 (
1632+
CLOS-BROWSER::COLLECT-FAMILY 13518 . 14861)) (14863 16895 (CLOS-BROWSER::MAKE-NODES 14863 . 16895)) (
1633+
16897 17572 (CLOS-BROWSER::CLOS-BROWSER-CLOSE-FN 16897 . 17572)) (17574 18506 (CLOS-BROWSER::BROWSER-CONTAINS-P
1634+
17574 . 18506)) (42339 42663 (CLOS-BROWSER::EDIT 42339 . 42663)) (42665 48259 (
1635+
CLOS-BROWSER::MAKE-METHOD-MENU-ITEMS 42665 . 48259)) (48261 49739 (CLOS-BROWSER::MAKE-TOP-LEVEL-METHOD-MENU-ITEMS
1636+
48261 . 49739)) (49741 51031 (CLOS-BROWSER::MAKE-MULTI-METHOD-SUB-MENU 49741 . 51031)) (65408 66025 (
1637+
CLOS-BROWSER::COMPLETE-ADD-METHOD 65408 . 66025)) (66027 68239 (CLOS-BROWSER::COMPLETE-SPECIALIZE
1638+
66027 . 68239)) (68241 69946 (CLOS-BROWSER::LYRIC-COMPLETE-SPECIALIZE 68241 . 69946)) (69948 70113 (
1639+
CLOS-BROWSER::THIS-CLASS-NODE-P 69948 . 70113)) (70115 70217 (CLOS::CLASS-DIRECT-METHODS 70115 . 70217
1640+
)) (86738 87753 (CLOS-BROWSER::REPLACE-SPECIALIZERS 86738 . 87753)) (88064 89648 (CLOS-BROWSER::IN-SELECT-PACKAGE
1641+
88064 . 89648)) (89650 90900 (CLOS-BROWSER::CLASSES-IN-PACKAGE 89650 . 90900)))))
16391642
IL:STOP

‎clos/NEW-CLOS-BROWSER.DFASL

379 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)