INSPECT: Sort datatype fields alphabetically, fixed a small bug (#1247)
* INSPECT: Sort datatype fields alphabetically, fixed a small bug * INSPECT: Sort only DATATYPE records * INSPECT: had wrong test in deciding whether to sort or not --------- Co-authored-by: Larry Masinter <lmm@acm.org>
This commit is contained in:
rmkaplan
GitHub
134
sources/INSPECT
134
sources/INSPECT
@@ -1,12 +1,12 @@
|
|||||||
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
|
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
|
||||||
|
|
||||||
(FILECREATED "17-Sep-2022 22:30:33"
|
(FILECREATED "14-Sep-2023 23:40:42" {WMEDLEY}<sources>INSPECT.;28 124779
|
||||||
{DSK}<users>kaplan>local>medley3.5>working-medley>sources>INSPECT.;22 123809
|
|
||||||
|
|
||||||
:CHANGES-TO (FNS INSPECT)
|
:EDIT-BY rmk
|
||||||
|
|
||||||
:PREVIOUS-DATE "12-Sep-2022 21:12:51"
|
:CHANGES-TO (FNS INSPECTABLEFIELDNAMES)
|
||||||
{DSK}<users>kaplan>local>medley3.5>working-medley>sources>INSPECT.;21)
|
|
||||||
|
:PREVIOUS-DATE "15-Jun-2023 16:03:17" {WMEDLEY}<sources>INSPECT.;27)
|
||||||
|
|
||||||
|
|
||||||
(* ; "
|
(* ; "
|
||||||
@@ -41,13 +41,14 @@ Copyright (c) 1982-1987, 1990-1991, 1993, 1995, 1999, 2018, 2021 by Venue & Xero
|
|||||||
INSPECT/TYPERECORD INSPECT/AS/RECORD SELECT.LIST.INSPECTOR STANDARDEDITE
|
INSPECT/TYPERECORD INSPECT/AS/RECORD SELECT.LIST.INSPECTOR STANDARDEDITE
|
||||||
NTHTOPLEVELELT SETNTHTOPLEVELELT DEDITE FINDRECDECL FINDSYSRECDECL
|
NTHTOPLEVELELT SETNTHTOPLEVELELT DEDITE FINDRECDECL FINDSYSRECDECL
|
||||||
MAKE-INSPECTOR-PROFILE CONFIRM-SET)
|
MAKE-INSPECTOR-PROFILE CONFIRM-SET)
|
||||||
(GLOBALVARS INSPECTMACROS INSPECTALLFIELDSFLG SetPropertyMenu SetStackMenu InspectMenu
|
(GLOBALVARS INSPECTMACROS INSPECTALLFIELDSFLG INSPECTDONTSORTFIELDS SetPropertyMenu
|
||||||
PropertyLeftMargin MaxValueLeftMargin INSPECTPRINTLEVEL InspectBitmapMenu
|
SetStackMenu InspectMenu PropertyLeftMargin MaxValueLeftMargin INSPECTPRINTLEVEL
|
||||||
ItemWCommandMenu InspectPropsMenu MAXINSPECTARRAYLEVEL MAXINSPECTCDRLEVEL
|
InspectBitmapMenu ItemWCommandMenu InspectPropsMenu MAXINSPECTARRAYLEVEL
|
||||||
MaxInspectorWindowWidth MaxInspectorWindowHeight INSPECT.HUNK.COMMANDS
|
MAXINSPECTCDRLEVEL MaxInspectorWindowWidth MaxInspectorWindowHeight
|
||||||
USERRECLST SYSPROPS IT MinSpaceBetweenProperyAndValue
|
INSPECT.HUNK.COMMANDS USERRECLST SYSPROPS IT MinSpaceBetweenProperyAndValue
|
||||||
MaxInspectorPropertyValueWidth)
|
MaxInspectorPropertyValueWidth)
|
||||||
(INITVARS (INSPECTALLFIELDSFLG T)
|
(INITVARS (INSPECTDONTSORTFIELDS T)
|
||||||
|
(INSPECTALLFIELDSFLG T)
|
||||||
(MaxInspectorWindowWidth 330)
|
(MaxInspectorWindowWidth 330)
|
||||||
(MaxInspectorWindowHeight 606))
|
(MaxInspectorWindowHeight 606))
|
||||||
(VARS INSPECTPRINTLEVEL)
|
(VARS INSPECTPRINTLEVEL)
|
||||||
@@ -1213,7 +1214,8 @@ Copyright (c) 1982-1987, 1990-1991, 1993, 1995, 1999, 2018, 2021 by Venue & Xero
|
|||||||
NIL])
|
NIL])
|
||||||
|
|
||||||
(INSPECT/DATATYPE
|
(INSPECT/DATATYPE
|
||||||
[LAMBDA (DATUM TYPE WHERE TAG) (* ; "Edited 12-Sep-2022 20:58 by rmk")
|
[LAMBDA (DATUM TYPE WHERE TAG) (* ; "Edited 1-Jun-2023 22:33 by rmk")
|
||||||
|
(* ; "Edited 12-Sep-2022 20:58 by rmk")
|
||||||
(* ; "Edited 9-Aug-2022 08:56 by rmk")
|
(* ; "Edited 9-Aug-2022 08:56 by rmk")
|
||||||
(* ; "Edited 1-Dec-96 20:15 by rmk:")
|
(* ; "Edited 1-Dec-96 20:15 by rmk:")
|
||||||
(* ; "Edited 7-Aug-87 10:21 by jop")
|
(* ; "Edited 7-Aug-87 10:21 by jop")
|
||||||
@@ -1265,21 +1267,33 @@ Copyright (c) 1982-1987, 1990-1991, 1993, 1995, 1999, 2018, 2021 by Venue & Xero
|
|||||||
(PLIST (CL:WHEN (PROPLISTP DATUM)
|
(PLIST (CL:WHEN (PROPLISTP DATUM)
|
||||||
(INSPECT/PLIST DATUM WHERE TAG)
|
(INSPECT/PLIST DATUM WHERE TAG)
|
||||||
T))
|
T))
|
||||||
(LIST (INSPECT/TOP/LEVEL/LIST DATUM WHERE TAG)
|
(LIST (INSPECT/TOP/LEVEL/LIST DATUM WHERE TAG))
|
||||||
T)
|
|
||||||
NIL)))
|
NIL)))
|
||||||
(T (printout PROMPTWINDOW T "No declaration for " DATUM T "Can not inspect.")
|
(T (printout PROMPTWINDOW T "No declaration for " DATUM T "Can not inspect.")
|
||||||
NIL])
|
NIL])
|
||||||
|
|
||||||
(INSPECTABLEFIELDNAMES
|
(INSPECTABLEFIELDNAMES
|
||||||
[LAMBDA (DECL TOPONLYFLG) (* ; "Edited 3-Feb-87 16:51 by jop")
|
[LAMBDA (DECL TOPONLYFLG) (* ; "Edited 14-Sep-2023 23:28 by rmk")
|
||||||
|
(* ; "Edited 15-Jun-2023 15:36 by rmk")
|
||||||
|
(* ; "Edited 2-Jun-2023 20:18 by rmk")
|
||||||
|
(* ; "Edited 3-Feb-87 16:51 by jop")
|
||||||
|
|
||||||
(* ;; "returns the list of record field names suitable for inspecting. This is everything unless TOPONLYFLG is T which is the case for system records.")
|
(* ;; "returns the list of record field names suitable for inspecting. This is everything unless TOPONLYFLG is T which is the case for system records.")
|
||||||
|
|
||||||
(COND
|
(LET (FIELDNAMES)
|
||||||
(TOPONLYFLG (for FIELDNAME in (CDR (RECORDFIELDNAMES DECL T))
|
[SETQ FIELDNAMES (COND
|
||||||
when (AND FIELDNAME (NLISTP FIELDNAME)) collect FIELDNAME))
|
(TOPONLYFLG (for FIELDNAME in (CDR (RECORDFIELDNAMES DECL T))
|
||||||
(T (REMOVEDUPS (RECORDFIELDNAMES DECL])
|
when (AND FIELDNAME (NLISTP FIELDNAME)) collect FIELDNAME
|
||||||
|
))
|
||||||
|
(T (REMOVEDUPS (RECORDFIELDNAMES DECL]
|
||||||
|
(CL:IF (OR (NEQ 'DATATYPE (CAR (LISTP DECL)))
|
||||||
|
(EQ T INSPECTDONTSORTFIELDS)
|
||||||
|
(MEMB (CADR DECL)
|
||||||
|
INSPECTDONTSORTFIELDS)
|
||||||
|
(ILEQ (LENGTH FIELDNAMES)
|
||||||
|
5))
|
||||||
|
FIELDNAMES
|
||||||
|
(SORT FIELDNAMES))])
|
||||||
|
|
||||||
(REMOVEDUPS
|
(REMOVEDUPS
|
||||||
[LAMBDA (LST) (* ; "Edited 3-Feb-87 16:54 by jop")
|
[LAMBDA (LST) (* ; "Edited 3-Feb-87 16:54 by jop")
|
||||||
@@ -1571,13 +1585,15 @@ Copyright (c) 1982-1987, 1990-1991, 1993, 1995, 1999, 2018, 2021 by Venue & Xero
|
|||||||
)
|
)
|
||||||
(DECLARE%: DOEVAL@COMPILE DONTCOPY
|
(DECLARE%: DOEVAL@COMPILE DONTCOPY
|
||||||
|
|
||||||
(GLOBALVARS INSPECTMACROS INSPECTALLFIELDSFLG SetPropertyMenu SetStackMenu InspectMenu
|
(GLOBALVARS INSPECTMACROS INSPECTALLFIELDSFLG INSPECTDONTSORTFIELDS SetPropertyMenu SetStackMenu
|
||||||
PropertyLeftMargin MaxValueLeftMargin INSPECTPRINTLEVEL InspectBitmapMenu ItemWCommandMenu
|
InspectMenu PropertyLeftMargin MaxValueLeftMargin INSPECTPRINTLEVEL InspectBitmapMenu
|
||||||
InspectPropsMenu MAXINSPECTARRAYLEVEL MAXINSPECTCDRLEVEL MaxInspectorWindowWidth
|
ItemWCommandMenu InspectPropsMenu MAXINSPECTARRAYLEVEL MAXINSPECTCDRLEVEL
|
||||||
MaxInspectorWindowHeight INSPECT.HUNK.COMMANDS USERRECLST SYSPROPS IT
|
MaxInspectorWindowWidth MaxInspectorWindowHeight INSPECT.HUNK.COMMANDS USERRECLST SYSPROPS IT
|
||||||
MinSpaceBetweenProperyAndValue MaxInspectorPropertyValueWidth)
|
MinSpaceBetweenProperyAndValue MaxInspectorPropertyValueWidth)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
(RPAQ? INSPECTDONTSORTFIELDS T)
|
||||||
|
|
||||||
(RPAQ? INSPECTALLFIELDSFLG T)
|
(RPAQ? INSPECTALLFIELDSFLG T)
|
||||||
|
|
||||||
(RPAQ? MaxInspectorWindowWidth 330)
|
(RPAQ? MaxInspectorWindowWidth 330)
|
||||||
@@ -2208,40 +2224,40 @@ Copyright (c) 1982-1987, 1990-1991, 1993, 1995, 1999, 2018, 2021 by Venue & Xero
|
|||||||
(PUTPROPS INSPECT COPYRIGHT ("Venue & Xerox Corporation" 1982 1983 1984 1985 1986 1987 1990 1991 1993
|
(PUTPROPS INSPECT COPYRIGHT ("Venue & Xerox Corporation" 1982 1983 1984 1985 1986 1987 1990 1991 1993
|
||||||
1995 1999 2018 2021))
|
1995 1999 2018 2021))
|
||||||
(DECLARE%: DONTCOPY
|
(DECLARE%: DONTCOPY
|
||||||
(FILEMAP (NIL (6980 45333 (INSPECTW.CREATE 6990 . 12285) (INSPECTW.REPAINTFN 12287 . 17823) (
|
(FILEMAP (NIL (7001 45354 (INSPECTW.CREATE 7011 . 12306) (INSPECTW.REPAINTFN 12308 . 17844) (
|
||||||
INSPECTW.REDISPLAY 17825 . 26697) (\INSPECTW.VALUE.MARGIN 26699 . 27102) (INSPECTW.REPLACE 27104 .
|
INSPECTW.REDISPLAY 17846 . 26718) (\INSPECTW.VALUE.MARGIN 26720 . 27123) (INSPECTW.REPLACE 27125 .
|
||||||
27812) (INSPECTW.SELECTITEM 27814 . 28804) (\INSPECTW.REDISPLAYPROP 28806 . 31236) (INSPECTW.FETCH
|
27833) (INSPECTW.SELECTITEM 27835 . 28825) (\INSPECTW.REDISPLAYPROP 28827 . 31257) (INSPECTW.FETCH
|
||||||
31238 . 31661) (INSPECTW.PROPERTIES 31663 . 32304) (DECODE.WINDOW.ARG 32306 . 34034) (
|
31259 . 31682) (INSPECTW.PROPERTIES 31684 . 32325) (DECODE.WINDOW.ARG 32327 . 34055) (
|
||||||
DEFAULT.INSPECTW.PROPCOMMANDFN 34036 . 36064) (DEFAULT.INSPECTW.VALUECOMMANDFN 36066 . 37482) (
|
DEFAULT.INSPECTW.PROPCOMMANDFN 34057 . 36085) (DEFAULT.INSPECTW.VALUECOMMANDFN 36087 . 37503) (
|
||||||
DEFAULT.INSPECTW.TITLECOMMANDFN 37484 . 40933) (\SELITEM.FROM.PROPERTY 40935 . 41377) (
|
DEFAULT.INSPECTW.TITLECOMMANDFN 37505 . 40954) (\SELITEM.FROM.PROPERTY 40956 . 41398) (
|
||||||
\INSPECT.COMPUTE.TITLE 41379 . 42663) (LEVELEDFORM 42665 . 43384) (MAKEWITHINREGION 43386 . 45331)) (
|
\INSPECT.COMPUTE.TITLE 41400 . 42684) (LEVELEDFORM 42686 . 43405) (MAKEWITHINREGION 43407 . 45352)) (
|
||||||
45334 62639 (ITEMW.REPAINTFN 45344 . 46564) (\ITEM.WINDOW.BUTTON.HANDLER 46566 . 46985) (
|
45355 62660 (ITEMW.REPAINTFN 45365 . 46585) (\ITEM.WINDOW.BUTTON.HANDLER 46587 . 47006) (
|
||||||
\ITEM.WINDOW.SELECTION.HANDLER 46987 . 49654) (\INSPECTW.COMMAND.HANDLER 49656 . 53657) (
|
\ITEM.WINDOW.SELECTION.HANDLER 47008 . 49675) (\INSPECTW.COMMAND.HANDLER 49677 . 53678) (
|
||||||
ITEM.WINDOW.SET.STACK.ARG 53659 . 55863) (REPLACESTKARG 55865 . 56964) (IN/ITEM? 56966 . 57848) (
|
ITEM.WINDOW.SET.STACK.ARG 53680 . 55884) (REPLACESTKARG 55886 . 56985) (IN/ITEM? 56987 . 57869) (
|
||||||
\ITEMW.DESELECTITEM 57850 . 58114) (\ITEMW.SELECTITEM 58116 . 58378) (\ITEMW.CLEARSELECTION 58380 .
|
\ITEMW.DESELECTITEM 57871 . 58135) (\ITEMW.SELECTITEM 58137 . 58399) (\ITEMW.CLEARSELECTION 58401 .
|
||||||
58735) (\ITEMW.FLIPITEM 58737 . 59210) (PRINTANDBOX 59212 . 61721) (PRINTATBOX 61723 . 62240) (
|
58756) (\ITEMW.FLIPITEM 58758 . 59231) (PRINTANDBOX 59233 . 61742) (PRINTATBOX 61744 . 62261) (
|
||||||
ITEMOFPROPERTYVALUE 62242 . 62637)) (62640 66381 (\ITEM.WINDOW.COPY.HANDLER 62650 . 64507) (
|
ITEMOFPROPERTYVALUE 62263 . 62658)) (62661 66402 (\ITEM.WINDOW.COPY.HANDLER 62671 . 64528) (
|
||||||
\ITEMW.FLIPCOPY 64509 . 64968) (BKSYSBUF.GENERAL 64970 . 66379)) (66773 90797 (INSPECT 66783 . 71313)
|
\ITEMW.FLIPCOPY 64530 . 64989) (BKSYSBUF.GENERAL 64991 . 66400)) (66794 91709 (INSPECT 66804 . 71334)
|
||||||
(\APPLYINSPECTMACRO 71315 . 72376) (INSPECT/BITMAP 72378 . 73530) (INSPECT/DATATYPE 73532 . 76967) (
|
(\APPLYINSPECTMACRO 71336 . 72397) (INSPECT/BITMAP 72399 . 73551) (INSPECT/DATATYPE 73553 . 77067) (
|
||||||
INSPECTABLEFIELDNAMES 76969 . 77490) (REMOVEDUPS 77492 . 77697) (INSPECT/ARRAY 77699 . 78764) (
|
INSPECTABLEFIELDNAMES 77069 . 78402) (REMOVEDUPS 78404 . 78609) (INSPECT/ARRAY 78611 . 79676) (
|
||||||
INSPECT/TOP/LEVEL/LIST 78766 . 79883) (INSPECT/PROPLIST 79885 . 80973) (NONSYSPROPNAMES 80975 . 81271)
|
INSPECT/TOP/LEVEL/LIST 79678 . 80795) (INSPECT/PROPLIST 80797 . 81885) (NONSYSPROPNAMES 81887 . 82183)
|
||||||
(INSPECT/LISTP 81273 . 81712) (ALISTP 81714 . 81923) (PROPLISTP 81925 . 82565) (INSPECT/ALIST 82567
|
(INSPECT/LISTP 82185 . 82624) (ALISTP 82626 . 82835) (PROPLISTP 82837 . 83477) (INSPECT/ALIST 83479
|
||||||
. 83043) (ASSOCGET 83045 . 83256) (/ASSOCPUT 83258 . 83523) (INSPECT/PLIST 83525 . 84009) (
|
. 83955) (ASSOCGET 83957 . 84168) (/ASSOCPUT 84170 . 84435) (INSPECT/PLIST 84437 . 84921) (
|
||||||
INSPECT/TYPERECORD 84011 . 84368) (INSPECT/AS/RECORD 84370 . 85607) (SELECT.LIST.INSPECTOR 85609 .
|
INSPECT/TYPERECORD 84923 . 85280) (INSPECT/AS/RECORD 85282 . 86519) (SELECT.LIST.INSPECTOR 86521 .
|
||||||
87660) (STANDARDEDITE 87662 . 87945) (NTHTOPLEVELELT 87947 . 88263) (SETNTHTOPLEVELELT 88265 . 89025)
|
88572) (STANDARDEDITE 88574 . 88857) (NTHTOPLEVELELT 88859 . 89175) (SETNTHTOPLEVELELT 89177 . 89937)
|
||||||
(DEDITE 89027 . 89234) (FINDRECDECL 89236 . 89819) (FINDSYSRECDECL 89821 . 90222) (
|
(DEDITE 89939 . 90146) (FINDRECDECL 90148 . 90731) (FINDSYSRECDECL 90733 . 91134) (
|
||||||
MAKE-INSPECTOR-PROFILE 90224 . 90609) (CONFIRM-SET 90611 . 90795)) (92563 100777 (INSPECT/ATOM 92573
|
MAKE-INSPECTOR-PROFILE 91136 . 91521) (CONFIRM-SET 91523 . 91707)) (93533 101747 (INSPECT/ATOM 93543
|
||||||
. 96678) (SELECT.ATOM.ASPECT 96680 . 97824) (INSPECT/AS/FUNCTION 97826 . 100112) (SELECT.FNS.EDITOR
|
. 97648) (SELECT.ATOM.ASPECT 97650 . 98794) (INSPECT/AS/FUNCTION 98796 . 101082) (SELECT.FNS.EDITOR
|
||||||
100114 . 100775)) (100818 106243 (INSPECTCODE 100828 . 101980) (\TEDIT.INSPECTCODE 101982 . 103960) (
|
101084 . 101745)) (101788 107213 (INSPECTCODE 101798 . 102950) (\TEDIT.INSPECTCODE 102952 . 104930) (
|
||||||
\INSPECT/CODE/RESHAPEFN 103962 . 105501) (\INSPECT/CODE/REPAINTFN 105503 . 106241)) (106281 107887 (
|
\INSPECT/CODE/RESHAPEFN 104932 . 106471) (\INSPECT/CODE/REPAINTFN 106473 . 107211)) (107251 108857 (
|
||||||
INSPECT/HARRAYP 106291 . 107039) (HARRAYKEYS 107041 . 107420) (INSPECTW.GETHASH 107422 . 107649) (
|
INSPECT/HARRAYP 107261 . 108009) (HARRAYKEYS 108011 . 108390) (INSPECTW.GETHASH 108392 . 108619) (
|
||||||
INSPECTW.PUTHASH 107651 . 107885)) (107936 114145 (RDTBL\NONOTHERCODES 107946 . 108966) (GETSYNTAXPROP
|
INSPECTW.PUTHASH 108621 . 108855)) (108906 115115 (RDTBL\NONOTHERCODES 108916 . 109936) (GETSYNTAXPROP
|
||||||
108968 . 110466) (SETSYNTAXPROP 110468 . 112195) (GETTTBLPROP 112197 . 113115) (SETTTBLPROP 113117 .
|
109938 . 111436) (SETSYNTAXPROP 111438 . 113165) (GETTTBLPROP 113167 . 114085) (SETTTBLPROP 114087 .
|
||||||
114143)) (114624 123266 (INSPECT/AS/BLOCKRECORD 114634 . 115634) (INSPECT/TYPELESS 115636 . 117027) (
|
115113)) (115594 124236 (INSPECT/AS/BLOCKRECORD 115604 . 116604) (INSPECT/TYPELESS 116606 . 117997) (
|
||||||
LIST-ALL-BLOCKRECORDS 117029 . 117304) (INSPECT/HUNK 117306 . 119909) (\INSPECT.DATATYPE.RAW.FETCH
|
LIST-ALL-BLOCKRECORDS 117999 . 118274) (INSPECT/HUNK 118276 . 120879) (\INSPECT.DATATYPE.RAW.FETCH
|
||||||
119911 . 120237) (\INSPECT.FETCH.8 120239 . 120388) (\INSPECT.FETCH.32 120390 . 120561) (
|
120881 . 121207) (\INSPECT.FETCH.8 121209 . 121358) (\INSPECT.FETCH.32 121360 . 121531) (
|
||||||
\INSPECT.FETCH.CHAR 120563 . 120726) (\INSPECT.FETCH.FATCHAR 120728 . 120890) (\INSPECT.FETCH.PTR
|
\INSPECT.FETCH.CHAR 121533 . 121696) (\INSPECT.FETCH.FATCHAR 121698 . 121860) (\INSPECT.FETCH.PTR
|
||||||
120892 . 121063) (\INSPECT.STORE.8 121065 . 121371) (\INSPECT.STORE.16 121373 . 121673) (
|
121862 . 122033) (\INSPECT.STORE.8 122035 . 122341) (\INSPECT.STORE.16 122343 . 122643) (
|
||||||
\INSPECT.STORE.32 121675 . 122110) (\INSPECT.STORE.CHAR 122112 . 122438) (\INSPECT.STORE.FATCHAR
|
\INSPECT.STORE.32 122645 . 123080) (\INSPECT.STORE.CHAR 123082 . 123408) (\INSPECT.STORE.FATCHAR
|
||||||
122440 . 122762) (\INSPECT.STORE.PTR 122764 . 123111) (INSPECT/MAKE/CCODEP 123113 . 123264)))))
|
123410 . 123732) (\INSPECT.STORE.PTR 123734 . 124081) (INSPECT/MAKE/CCODEP 124083 . 124234)))))
|
||||||
STOP
|
STOP
|
||||||
|
|||||||
Binary file not shown.
Reference in New Issue
Block a user