Skip to content

Commit 2961670

Browse files
rmkaplanrmkaplan
authored
Qualify record names in MASTERSCOPE COMPAREDIRECTORIES TTYIN (#2270)
To avoid conflicts when creating fuller.database
1 parent 0206fb6 commit 2961670

File tree

6 files changed

+179
-188
lines changed

6 files changed

+179
-188
lines changed

‎library/MASTERSCOPE‎

Lines changed: 80 additions & 90 deletions
Large diffs are not rendered by default.

‎library/MASTERSCOPE.DFASL‎

-1 Bytes
Binary file not shown.

‎lispusers/COMPAREDIRECTORIES‎

Lines changed: 36 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
22

3-
(FILECREATED "26-Mar-2025 09:41:31" {WMEDLEY}<lispusers>COMPAREDIRECTORIES.;267 133447
3+
(FILECREATED "24-Aug-2025 13:38:35" {WMEDLEY}<lispusers>COMPAREDIRECTORIES.;268 133743
44

55
:EDIT-BY rmk
66

7-
:CHANGES-TO (VARS COMPAREDIRECTORIESCOMS)
8-
(FNS CD-MENUFN)
7+
:CHANGES-TO (FNS CDENTRIES.SELECT CDPRINT.LINE)
98

10-
:PREVIOUS-DATE "18-Feb-2025 23:37:14" {WMEDLEY}<lispusers>COMPAREDIRECTORIES.;264)
9+
:PREVIOUS-DATE "26-Mar-2025 09:41:31" {WMEDLEY}<lispusers>COMPAREDIRECTORIES.;267)
1110

1211

1312
(PRETTYCOMPRINT COMPAREDIRECTORIESCOMS)
@@ -262,7 +261,8 @@
262261
INFO2 _ I2] FINALLY (RETURN CANDIDATES])
263262

264263
(CDENTRIES.SELECT
265-
[LAMBDA (CANDIDATES SELECT) (* ; "Edited 23-Feb-2022 20:45 by rmk")
264+
[LAMBDA (CANDIDATES SELECT) (* ; "Edited 24-Aug-2025 13:36 by rmk")
265+
(* ; "Edited 23-Feb-2022 20:45 by rmk")
266266
(* ; "Edited 4-Jan-2022 21:31 by rmk")
267267

268268
(* ;; "Does the pairwise select filter and inserts the date relation")
@@ -273,8 +273,8 @@
273273
(SETQ INFO1 (FETCH (CDENTRY INFO1) OF CDE))
274274
(SETQ INFO2 (FETCH (CDENTRY INFO2) OF CDE))
275275
(if (AND INFO1 INFO2)
276-
then (SETQ IDATE1 (IDATE (fetch DATE of INFO1)))
277-
(SETQ IDATE2 (IDATE (fetch DATE of INFO2)))
276+
then (SETQ IDATE1 (IDATE (fetch (CDINFO DATE) of INFO1)))
277+
(SETQ IDATE2 (IDATE (fetch (CDINFO DATE) of INFO2)))
278278
(SETQ DATEREL (if (IGREATERP IDATE1 IDATE2)
279279
then '>
280280
elseif (ILESSP IDATE1 IDATE2)
@@ -643,23 +643,24 @@
643643

644644
(CDPRINT.LINE
645645
[LAMBDA (STREAM ENTRY PRINTAUTHOR DATE1POS ENDDATE1 NCHARSDIR1 NCHARSDIR2 LENGTH2END)
646+
(* ; "Edited 24-Aug-2025 13:38 by rmk")
646647
(* ; "Edited 16-Jul-2022 10:19 by rmk")
647648
(* ; "Edited 22-Nov-2021 22:38 by rmk:")
648649
(* ; "Edited 9-Jan-2021 10:12 by rmk:")
649650

650651
(* ;; "Format one line of the directory comparison listing. If PRINTAUTHOR and AUTHOR1 or AUTHOR2 are non-NIL, list the author in parens; otherwise omit it.")
651652

652-
(LET ((INFO1 (fetch INFO1 of ENTRY))
653-
(INFO2 (fetch INFO2 of ENTRY)))
654-
(PRINTOUT STREAM (SELECTQ (fetch EQUIV of ENTRY)
653+
(LET ((INFO1 (fetch (CDENTRY INFO1) of ENTRY))
654+
(INFO2 (fetch (CDENTRY INFO2) of ENTRY)))
655+
(PRINTOUT STREAM (SELECTQ (fetch (CDENTRY EQUIV) of ENTRY)
655656
(T "==")
656657
(NIL " ")
657-
(CONCAT (SELECTQ (CAR (fetch EQUIV of ENTRY))
658+
(CONCAT (SELECTQ (CAR (fetch (CDENTRY EQUIV) of ENTRY))
658659
(CR 'C)
659660
(LF 'L)
660661
(CRLF 2)
661662
"x")
662-
(SELECTQ (CADR (fetch EQUIV of ENTRY))
663+
(SELECTQ (CADR (fetch (CDENTRY EQUIV) of ENTRY))
663664
(CR 'C)
664665
(LF 'L)
665666
(CRLF 2)
@@ -677,7 +678,7 @@
677678
(PRINTOUT STREAM .FR (IDIFFERENCE DATE1POS 2)
678679
(fetch (CDINFO LENGTH) OF INFO1)
679680
" "
680-
(fetch DATE of INFO1)))
681+
(fetch (CDINFO DATE) of INFO1)))
681682
(PRINTOUT STREAM .TAB0 ENDDATE1 " " (SELECTQ (fetch DATEREL of ENTRY)
682683
(< "< ")
683684
(> " >")
@@ -687,7 +688,7 @@
687688
(SHOULDNT))
688689
" ")
689690
(CL:WHEN INFO2
690-
(PRINTOUT STREAM (fetch DATE of INFO2)
691+
(PRINTOUT STREAM (fetch (CDINFO DATE) of INFO2)
691692
" "
692693
(SUBSTRING (fetch (CDINFO FULLNAME) OF INFO2)
693694
(ADD1 NCHARSDIR2)
@@ -2250,25 +2251,25 @@
22502251

22512252
(MOVD? 'NILL 'TEDIT.FILEDATE)
22522253
(DECLARE%: DONTCOPY
2253-
(FILEMAP (NIL (2701 23064 (COMPAREDIRECTORIES 2711 . 8046) (COMPAREDIRECTORIES.INFOS 8048 . 11006) (
2254-
COMPAREDIRECTORIES.CANDIDATES 11008 . 14393) (CDENTRIES.SELECT 14395 . 19170) (
2255-
COMPAREDIRECTORIES.INFOS.TYPE 19172 . 20298) (MATCHNAME 20300 . 20980) (CD.INSURECDVALUE 20982 . 22596
2256-
) (CD.UPDATEWIDTHS 22598 . 23062)) (23065 33687 (CDFILES 23075 . 29089) (CDFILES.MATCH 29091 . 30716)
2257-
(CDFILES.PATS 30718 . 33685)) (33688 51509 (CDPRINT 33698 . 36215) (CDPRINT.HEADER 36217 . 37114) (
2258-
CDPRINT.LINE 37116 . 40348) (CDPRINT.MAXWIDTHS 40350 . 44465) (CDPRINT.COLHEADERS 44467 . 45752) (
2259-
CDPRINT.COLUMNS 45754 . 50874) (CDTEDIT 50876 . 51507)) (51510 60631 (CDMAP 51520 . 52952) (CDENTRY
2260-
52954 . 53263) (CDSUBSET 53265 . 54704) (CDMERGE 54706 . 58690) (CDMERGE.COMMON 58692 . 60007) (
2261-
CD.SORT 60009 . 60629)) (60632 68170 (BINCOMP 60642 . 64931) (EOLTYPE 64933 . 67495) (EOLTYPE.SHOW
2262-
67497 . 68168)) (68698 81225 (FIND-UNCOMPILED-FILES 68708 . 72351) (FIND-UNSOURCED-FILES 72353 . 74737
2263-
) (FIND-SOURCE-FILES 74739 . 76477) (FIND-COMPILED-FILES 76479 . 78356) (FIND-UNLOADED-FILES 78358 .
2264-
79211) (FIND-LOADED-FILES 79213 . 79641) (FIND-MULTICOMPILED-FILES 79643 . 81223)) (81226 89657 (
2265-
CREATED-AS 81236 . 86033) (SOURCE-FOR-COMPILED-P 86035 . 88962) (COMPILE-SOURCE-DATE-DIFF 88964 .
2266-
89655)) (89658 100421 (FIX-DIRECTORY-DATES 89668 . 93118) (FIX-EQUIV-DATES 93120 . 94645) (
2267-
COPY-COMPARED-FILES 94647 . 96468) (COPY-MISSING-FILES 96470 . 98627) (COMPILED-ON-SAME-SOURCE 98629
2268-
. 100419)) (100615 108453 (CDBROWSER 100625 . 104552) (CDBROWSER.STRINGS 104554 . 108451)) (108615
2269-
110351 (CD.TABLEITEM 108625 . 108845) (CD.TABLEITEM.PRINTFN 108847 . 109046) (CD.TABLEITEM.COPYFN
2270-
109048 . 110106) (CDTABLEBROWSER.HEADING.REPAINTFN 110108 . 110349)) (110352 132922 (
2271-
CDTABLEBROWSER.WHENSELECTEDFN 110362 . 110830) (CD.COMMANDSELECTEDFN 110832 . 115933) (CD-MENUFN
2272-
115935 . 122161) (CD-COMPARE-FILES 122163 . 125515) (CDBROWSER-COPY 125517 . 129186) (
2273-
CDBROWSER-DELETE-FILE 129188 . 132401) (CD-SWAPDIRS 132403 . 132920)))))
2254+
(FILEMAP (NIL (2673 23163 (COMPAREDIRECTORIES 2683 . 8018) (COMPAREDIRECTORIES.INFOS 8020 . 10978) (
2255+
COMPAREDIRECTORIES.CANDIDATES 10980 . 14365) (CDENTRIES.SELECT 14367 . 19269) (
2256+
COMPAREDIRECTORIES.INFOS.TYPE 19271 . 20397) (MATCHNAME 20399 . 21079) (CD.INSURECDVALUE 21081 . 22695
2257+
) (CD.UPDATEWIDTHS 22697 . 23161)) (23164 33786 (CDFILES 23174 . 29188) (CDFILES.MATCH 29190 . 30815)
2258+
(CDFILES.PATS 30817 . 33784)) (33787 51805 (CDPRINT 33797 . 36314) (CDPRINT.HEADER 36316 . 37213) (
2259+
CDPRINT.LINE 37215 . 40644) (CDPRINT.MAXWIDTHS 40646 . 44761) (CDPRINT.COLHEADERS 44763 . 46048) (
2260+
CDPRINT.COLUMNS 46050 . 51170) (CDTEDIT 51172 . 51803)) (51806 60927 (CDMAP 51816 . 53248) (CDENTRY
2261+
53250 . 53559) (CDSUBSET 53561 . 55000) (CDMERGE 55002 . 58986) (CDMERGE.COMMON 58988 . 60303) (
2262+
CD.SORT 60305 . 60925)) (60928 68466 (BINCOMP 60938 . 65227) (EOLTYPE 65229 . 67791) (EOLTYPE.SHOW
2263+
67793 . 68464)) (68994 81521 (FIND-UNCOMPILED-FILES 69004 . 72647) (FIND-UNSOURCED-FILES 72649 . 75033
2264+
) (FIND-SOURCE-FILES 75035 . 76773) (FIND-COMPILED-FILES 76775 . 78652) (FIND-UNLOADED-FILES 78654 .
2265+
79507) (FIND-LOADED-FILES 79509 . 79937) (FIND-MULTICOMPILED-FILES 79939 . 81519)) (81522 89953 (
2266+
CREATED-AS 81532 . 86329) (SOURCE-FOR-COMPILED-P 86331 . 89258) (COMPILE-SOURCE-DATE-DIFF 89260 .
2267+
89951)) (89954 100717 (FIX-DIRECTORY-DATES 89964 . 93414) (FIX-EQUIV-DATES 93416 . 94941) (
2268+
COPY-COMPARED-FILES 94943 . 96764) (COPY-MISSING-FILES 96766 . 98923) (COMPILED-ON-SAME-SOURCE 98925
2269+
. 100715)) (100911 108749 (CDBROWSER 100921 . 104848) (CDBROWSER.STRINGS 104850 . 108747)) (108911
2270+
110647 (CD.TABLEITEM 108921 . 109141) (CD.TABLEITEM.PRINTFN 109143 . 109342) (CD.TABLEITEM.COPYFN
2271+
109344 . 110402) (CDTABLEBROWSER.HEADING.REPAINTFN 110404 . 110645)) (110648 133218 (
2272+
CDTABLEBROWSER.WHENSELECTEDFN 110658 . 111126) (CD.COMMANDSELECTEDFN 111128 . 116229) (CD-MENUFN
2273+
116231 . 122457) (CD-COMPARE-FILES 122459 . 125811) (CDBROWSER-COPY 125813 . 129482) (
2274+
CDBROWSER-DELETE-FILE 129484 . 132697) (CD-SWAPDIRS 132699 . 133216)))))
22742275
STOP

‎lispusers/COMPAREDIRECTORIES.LCOM‎

10 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)