Rmk138 MCCS stragglers (#2332)

* ATBL:  Use :MCCS instead of :XCCS for old-interlisp files

* AOFD:  put MCCS in comment, for cleanliness

Author: rmkaplan

sources/AOFD

@@ -1,10 +1,12 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "17-May-2023 08:29:55" {DSK}<home>larry>il>medley>sources>AOFD.;5
 36263  
+
(FILECREATED "24-Apr-2025 21:46:04" {WMEDLEY}<sources>AOFD.;10
 36381  
 
-      :EDIT-BY "lmm"
+      :EDIT-BY rmk
 
-      :PREVIOUS-DATE "17-May-2023 08:05:56" {DSK}<home>larry>il>medley>sources>AOFD.;4)
+      :CHANGES-TO (FNS MAKE-STRING-FORMAT)
+
+      :PREVIOUS-DATE "17-May-2023 08:29:55" {WMEDLEY}<sources>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

sources/AOFD.LCOM

@@ -1,16 +1,13 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "26-Dec-2021 14:32:50" {DSK}<Users>kaplan>Local>medley3.5>my-medley>sources>ATBL.;32
 91860  
+
(FILECREATED "24-Apr-2025 21:52:35" {WMEDLEY}<sources>ATBL.;33
 91754  
 
-      :CHANGES-TO (FNS MAKE-READER-ENVIRONMENT)
+      :EDIT-BY rmk
 
-      :PREVIOUS-DATE "19-Dec-2021 14:09:43" 
-{DSK}<Users>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}<sources>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,24 +1776,24 @@ 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)
                     (READTABLEPROP
 NEW-IL-RDTBL 'COMMONNUMSYNTAX T)
                     (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