Minor compatibility adjustments

Author: rmkaplan

sources/CMLREAD

@@ -1,12 +1,12 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "23-Sep-2024 11:55:33" {DSK}<home>matt>Interlisp>medley>sources>CMLREAD.;4
 12882  
+
(FILECREATED "24-Apr-2025 21:59:48" {WMEDLEY}<sources>CMLREAD.;17
 12829  
 
-      :EDIT-BY "mth"
+      :EDIT-BY rmk
 
-      :CHANGES-TO (FNS CL:READ-FROM-STRING)
+      :CHANGES-TO (VARS CMLREADCOMS)
 
-      :PREVIOUS-DATE "16-Sep-2024 12:26:09" {DSK}<home>matt>Interlisp>medley>sources>CMLREAD.;3)
+      :PREVIOUS-DATE "23-Sep-2024 11:55:33" {WMEDLEY}<sources>CMLREAD.;16)
 
 
 (PRETTYCOMPRINT CMLREADCOMS)
@@ -37,7 +37,7 @@
               (INITVARS (*COMMON-LISP-READ-ENVIRONMENT* (create READER-ENVIRONMENT REPACKAGE _
                                                                (CL:FIND-PACKAGE "USER")
                                                                REREADTABLE _ CMLRDTBL REBASE _ 10 
-                                                               REFORMAT _ :XCCS]
+                                                               REFORMAT _ :MCCS]
         (PROP FILETYPE CMLREAD)
         (DECLARE%: DONTEVAL@LOAD DOEVAL@COMPILE DONTCOPY COMPILERVARS
                (ADDVARS (NLAMA)
@@ -274,7 +274,7 @@
 )
 
 (RPAQ? *COMMON-LISP-READ-ENVIRONMENT*
 (create READER-ENVIRONMENT REPACKAGE _ (CL:FIND-PACKAGE "USER")
-                                             REREADTABLE _ CMLRDTBL REBASE _ 10 REFORMAT _ :XCCS))
+                                             REREADTABLE _ CMLRDTBL REBASE _ 10 REFORMAT _ :MCCS))
 
 (PUTPROPS CMLREAD
 FILETYPE
 CL:COMPILE-FILE)
 (DECLARE%: DONTEVAL@LOAD DOEVAL@COMPILE DONTCOPY COMPILERVARS 
@@ -287,9 +287,9 @@
                      CL:UNREAD-CHAR CL:READ-CHAR CL:READ-LINE CL:COPY-READTABLE)
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (2433 3418 (CL:COPY-READTABLE 2443 . 3416)) (3419 10627 (CL:READ-LINE 3429 . 4301) (
-CL:READ-CHAR 4303 . 4853) (CL:UNREAD-CHAR 4855 . 5316) (CL:PEEK-CHAR 5318 . 7612) (CL:LISTEN 7614 . 
-7879) (CL:READ-CHAR-NO-HANG 7881 . 8653) (CL:CLEAR-INPUT 8655 . 8892) (CL:READ-FROM-STRING 8894 . 9914
-) (CL:READ-BYTE 9916 . 10369) (CL:WRITE-BYTE 10371 . 10625)) (11621 12094 (WITH-READER-ENVIRONMENT 
-11621 . 12094)))))
+  (FILEMAP (NIL (2380 3365 (CL:COPY-READTABLE 2390 . 3363)) (3366 10574 (CL:READ-LINE 3376 . 4248) (
+CL:READ-CHAR 4250 . 4800) (CL:UNREAD-CHAR 4802 . 5263) (CL:PEEK-CHAR 5265 . 7559) (CL:LISTEN 7561 . 
+7826) (CL:READ-CHAR-NO-HANG 7828 . 8600) (CL:CLEAR-INPUT 8602 . 8839) (CL:READ-FROM-STRING 8841 . 9861
+) (CL:READ-BYTE 9863 . 10316) (CL:WRITE-BYTE 10318 . 10572)) (11568 12041 (WITH-READER-ENVIRONMENT 
+11568 . 12041)))))
 STOP

sources/CMLREAD.LCOM

@@ -1,15 +1,16 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "11-Sep-2022 20:07:43" {DSK}<home>larry>medley>sources>IOCHAR.;2
 100127 
+
(FILECREATED "24-Aug-2025 11:45:37" 
+{DSK}<Users>kaplan>Local>medley3.5>working-medley>sources>IOCHAR.;49
 100320 
 
-      :CHANGES-TO (VARS IOCHARCOMS)
+      :EDIT-BY rmk
 
-      :PREVIOUS-DATE "24-Jul-2022 14:56:20" {DSK}<home>larry>medley>sources>IOCHAR.;1)
+      :CHANGES-TO (RESOURCES \FFDELTA1)
+                  (FNS MAKEBITTABLE \SETUP.FFILEPOS)
 
+      :PREVIOUS-DATE "24-Apr-2025 22:08:18" 
+{DSK}<Users>kaplan>Local>medley3.5>working-medley>sources>IOCHAR.;48)
 
-(* ; "
-Copyright (c) 1981-1988, 1990-1991, 2018, 2020 by Venue & Xerox Corporation.
-")
 
 (PRETTYCOMPRINT IOCHARCOMS)
 
@@ -203,17 +204,18 @@ Copyright (c) 1981-1988, 1990-1991, 2018, 2020 by Venue & Xerox Corporation.
 )
 
 (MAKEBITTABLE

-  [LAMBDA (L NEG A)
                                      (* ; "Edited 29-Apr-91 23:02 by jds")

+  [LAMBDA (L NEG A)
                                          (* ; "Edited 24-Aug-2025 11:45 by rmk")


+                                                             (* ; "Edited 29-Apr-91 23:02 by jds")

     [COND
-       [(type?
 CHARTABLE A)                              (* ; "Clear it")

+       [(type?
 CHARTABLE A)                                  (* ; "Clear it")

         (\ZEROBYTES A 0 \MAXTHINCHAR)
         (if
 (fetch
 (CHARTABLE NSCHARHASH) of
 A)
             then
 (CLRHASH (fetch
 (CHARTABLE NSCHARHASH) of
 A]
        (T (SETQ A (create
 CHARTABLE]
     (for
 X in
 L do
 (\SETSYNCODE A (OR (SMALLP X)
-                                                  (CHCON1 X))
-                                      1))                    (* ; "Invert 1 and 0 if NEG")

-    [AND NEG (for
 I from
 0 to
 \MAXCHAR do
 (\SETSYNCODE A I (LOGXOR 1 (\SYNCODE A I]
+                                      (CHCON1 X))
+                          1))                                (* ; "Invert 1 and 0 if NEG")

+    [AND NEG (for
 I from
 0 to
 \MAXTHINCHAR do
 (\SETSYNCODE A I (LOGXOR 1 (\SYNCODE A I]
     A])
 )
 (DECLARE%: DONTCOPY 
@@ -258,13 +260,15 @@ DONTCOPY
 (FILEPOS

   [LAMBDA (PATTERN FILE START END SKIP TAIL CASEARRAY)
 
+    (* ;; "Edited 24-Apr-2025 22:08 by rmk")

+
     (* ;; "Edited 10-Jul-2022 16:51 by rmk")

 
     (* ;; "Edited  1-Jul-2022 11:55 by rmk")

 
     (* ;; "Edited 25-Jun-2022 22:51 by rmk: The original version was a byte-level searcher, this upgrades to character searching as determined by the external format of the stream. (It is also a bit faster than the original).")

 
-    (* ;; "This provides accurate results if the stream's external format is stable, wherein each character code has a unique byte representation.  If the stream's format is unstable (i.e. XCCS runcoding), then the result is accurate if the stream's initial charset (or other contextual information) is correct for the START byte position.")

+    (* ;; "This provides accurate results if the stream's external format is stable, wherein each character code has a unique byte representation.  If the stream's format is unstable (i.e. MCCS runcoding), then the result is accurate if the stream's initial charset (or other contextual information) is correct for the START byte position.")

 
     (* ;; "Otherwise, there may be some bad matches and some missing matches.  The slow case will be accurate in those cases (and a NIL return for the format's \FORMATBYTESTRING function will kick it into the slow case (about 10 times slower).  This always defers to the slow case if SKIP or CASEARRAY are non-NIL.")

 
@@ -382,7 +386,7 @@ DONTCOPY
 
      (* ;; "Getting the character set for the start of the match is a little trickier.  We know the character set at the byte that starts the beginning of the match (= character set of PATTERN's first character.  If we set the stream to that charset, then back up one character, that should get it right.  ")

 
-     (* ;; "This should  only be necessary for an unstable format, maybe don't bother if it isn't XCCS. There is another special case here for XCCS:  if the charset is 255 at the start (=2 byte encoding), then we assume that it didn't change, and nothing to worry about.")

+     (* ;; "This should  only be necessary for an unstable format, maybe don't bother if it isn't XCCS. There is another special case here for MCCS:  if the charset is 255 at the start (=2 byte encoding), then we assume that it didn't change, and nothing to worry about.")

 
           (RETURN (IF
 TAIL
                       THEN
 (CL:UNLESS (EQ NSCHARSETSHIFT (ffetch
 (STREAM CHARSET) of
 STREAM))
@@ -412,6 +416,8 @@ DONTCOPY
 (FFILEPOS

   [LAMBDA (PATTERN FILE START END SKIP TAIL CASEARRAY)
 
+    (* ;; "Edited 24-Apr-2025 22:07 by rmk")

+
     (* ;; "Edited 10-Jul-2022 10:17 by rmk")

 
     (* ;; "Edited  1-Jul-2022 11:55 by rmk")

@@ -420,7 +426,7 @@ DONTCOPY
 
     (* ;; "Edited 10-Aug-2020 21:44 by rmk:")

 
-    (* ;; "RMK:  Added coercion from internal XCCS string to UTF8 if searching a UTF8 file")

+    (* ;; "RMK:  Added coercion from internal MCCS string to UTF8 if searching a UTF8 file")

                                                              (* Pavel "12-Oct-86 15:20")

     (PROG ((STREAM (\GETSTREAM FILE 'INPUT))
            BYTEPATTERN BPATBASE BPATOFFSET BPATLEN ORGFILEPTR STARTBYTEPOS ENDBYTEPOS BIGENDOFFSET 
@@ -587,6 +593,8 @@ DONTCOPY
 (\SETUP.FFILEPOS

   [LAMBDA (PATBASE PATOFFSET PATLEN PATCHAR DELTA1 DELTA2)
 
+    (* ;; "Edited 24-Aug-2025 11:45 by rmk")

+
     (* ;; "Edited 24-Jun-2022 16:32 by rmk: Removing CASE argument.  That forces the \SLOWFILEPOS, because the the alternative stream matches can't be anticipated.")

                                                              (* jop%: "25-Sep-86 11:44")

 
@@ -596,7 +604,7 @@ DONTCOPY
                                  PATLEN))
            (MAXPATINDEX (SUB1 PATLEN))
            CHAR)
-          (for
 I from
 0 to
 (FOLDLO \MAXCHAR BYTESPERWORD) do
 (PUTBASE DELTA1 I PATLEN,PATLEN))
+          (for
 I from
 0 to
 (FOLDLO \MAXTHINCHAR BYTESPERWORD) do
 (PUTBASE DELTA1 I PATLEN,PATLEN))
 
      (* ;; "DELTA1 initially all PATLEN, the default for chars not in the pattern.  I assume array is word-aligned")

 
@@ -780,7 +788,7 @@ DONTCOPY
 (DECLARE%: EVAL@COMPILE DONTCOPY 
 (DECLARE%: EVAL@COMPILE 
 
-[PUTDEF '\FFDELTA1 'RESOURCES '(NEW (ARRAY (ADD1 \MAXCHAR)
+[PUTDEF '\FFDELTA1 'RESOURCES '(NEW (ARRAY (ADD1 \MAXTHINCHAR)
                                            'BYTE]
 
 [PUTDEF '\FFDELTA2 'RESOURCES '(NEW (ARRAY \MAX.PATTERN.SIZE 'BYTE]
@@ -1567,18 +1575,16 @@ DONTCOPY
 
 (ADDTOVAR LAMA
 PACK* CONCAT)
 )
-(PUTPROPS IOCHAR COPYRIGHT ("Venue & Xerox Corporation" 1981 1982 1983 1984 1985 1986 1987 1988 1990 
-1991 2018 2020))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (3456 7250 (CHCON 3466 . 4316) (UNPACK 4318 . 5212) (DCHCON 5214 . 6481) (DUNPACK 6483
- . 7248)) (7251 18766 (UALPHORDER 7261 . 7357) (ALPHORDER 7359 . 9162) (CONCAT 9164 . 9809) (
-CONCATCODES 9811 . 9997) (PACKC 9999 . 12602) (PACK 12604 . 13183) (PACK* 13185 . 14907) (\PACK.ITEM 
-14909 . 15364) (STRPOS 15366 . 18764)) (18768 19057 (XCL:PACK 18768 . 19057)) (19059 19309 (XCL:PACK* 
-19059 . 19309)) (20016 22407 (STRPOSL 20026 . 21652) (MAKEBITTABLE 21654 . 22405)) (22569 23046 (
-CASEARRAY 22579 . 22769) (UPPERCASEARRAY 22771 . 23044)) (23368 56745 (FILEPOS 23378 . 32619) (
-FFILEPOS 32621 . 44842) (\SETUP.FFILEPOS 44844 . 48627) (\SLOWFILEPOS 48629 . 56743)) (57533 98780 (
-DATE 57543 . 57629) (DATEFORMAT 57631 . 57723) (GDATE 57725 . 57836) (IDATE 57838 . 69509) (
-\IDATESCANTOKEN 69511 . 70790) (\IDATE-PARSE-MONTH 70792 . 74488) (\OUTDATE 74490 . 87238) (
-\OUTDATE-STRING 87240 . 87855) (\RPLRIGHT 87857 . 88095) (\UNPACKDATE 88097 . 93888) (\PACKDATE 93890
- . 97210) (\DTSCAN 97212 . 97354) (\ISDST? 97356 . 97863) (\CHECKDSTCHANGE 97865 . 98778)))))
+  (FILEMAP (NIL (3501 7295 (CHCON 3511 . 4361) (UNPACK 4363 . 5257) (DCHCON 5259 . 6526) (DUNPACK 6528
+ . 7293)) (7296 18811 (UALPHORDER 7306 . 7402) (ALPHORDER 7404 . 9207) (CONCAT 9209 . 9854) (
+CONCATCODES 9856 . 10042) (PACKC 10044 . 12647) (PACK 12649 . 13228) (PACK* 13230 . 14952) (\PACK.ITEM
+ 14954 . 15409) (STRPOS 15411 . 18809)) (18813 19102 (XCL:PACK 18813 . 19102)) (19104 19354 (XCL:PACK*
+ 19104 . 19354)) (20061 22561 (STRPOSL 20071 . 21697) (MAKEBITTABLE 21699 . 22559)) (22723 23200 (
+CASEARRAY 22733 . 22923) (UPPERCASEARRAY 22925 . 23198)) (23522 57053 (FILEPOS 23532 . 32823) (
+FFILEPOS 32825 . 45096) (\SETUP.FFILEPOS 45098 . 48935) (\SLOWFILEPOS 48937 . 57051)) (57845 99092 (
+DATE 57855 . 57941) (DATEFORMAT 57943 . 58035) (GDATE 58037 . 58148) (IDATE 58150 . 69821) (
+\IDATESCANTOKEN 69823 . 71102) (\IDATE-PARSE-MONTH 71104 . 74800) (\OUTDATE 74802 . 87550) (
+\OUTDATE-STRING 87552 . 88167) (\RPLRIGHT 88169 . 88407) (\UNPACKDATE 88409 . 94200) (\PACKDATE 94202
+ . 97522) (\DTSCAN 97524 . 97666) (\ISDST? 97668 . 98175) (\CHECKDSTCHANGE 98177 . 99090)))))
 STOP

sources/COMPILE

@@ -1,16 +1,15 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "28-Apr-2022 08:52:36" {DSK}<Users>kaplan>Local>medley3.5>my-medley>sources>LLCHAR.;13
 104756 
+
(FILECREATED "24-Aug-2025 11:50:57" 
+{DSK}<Users>kaplan>Local>medley3.5>working-medley>sources>LLCHAR.;14
 104478 
 
-      :CHANGES-TO (I.S.OPRS inpname)
+      :EDIT-BY rmk
 
-      :PREVIOUS-DATE "23-Apr-2022 17:19:02" 
-{DSK}<Users>kaplan>Local>medley3.5>my-medley>sources>LLCHAR.;12)
+      :CHANGES-TO (VARS LLCHARCOMS)
 
+      :PREVIOUS-DATE "28-Apr-2022 08:52:36" 
+{DSK}<Users>kaplan>Local>medley3.5>working-medley>sources>LLCHAR.;13)
 
-(* ; "
-Copyright (c) 1982-1988, 1990, 1994, 2018, 2021 by Venue & Xerox Corporation.
-")
 
 (PRETTYCOMPRINT LLCHARCOMS)
 
@@ -44,7 +43,6 @@ Copyright (c) 1982-1988, 1990, 1994, 2018, 2021 by Venue & Xerox Corporation.
                                    (MACROS \PUTBASECHAR \GETBASECHAR)
                                    (MACROS \CHARSET \CHAR8CODE)
                                    (CONSTANTS (\CHARMASK 255)
-                                          (\MAXCHAR 255)
                                           (\MAXTHINCHAR 255)
                                           (\MAXFATCHAR 65535)
                                           (\MAXCHARSET 255)
@@ -1728,8 +1726,6 @@ Copyright (c) 1982-1988, 1990, 1994, 2018, 2021 by Venue & Xerox Corporation.
 
 (RPAQQ \CHARMASK
 255)
 
-(RPAQQ \MAXCHAR
 255)
-
 (RPAQQ \MAXTHINCHAR
 255)
 
 (RPAQQ \MAXFATCHAR
 65535)
@@ -1740,7 +1736,6 @@ Copyright (c) 1982-1988, 1990, 1994, 2018, 2021 by Venue & Xerox Corporation.
 
 
 (CONSTANTS (\CHARMASK 255)
-       (\MAXCHAR 255)
        (\MAXTHINCHAR 255)
        (\MAXFATCHAR 65535)
        (\MAXCHARSET 255)
@@ -1848,19 +1843,17 @@ Copyright (c) 1982-1988, 1990, 1994, 2018, 2021 by Venue & Xerox Corporation.
 
 
 (PUTPROPS LLCHAR
 FILETYPE
 :FAKE-COMPILE-FILE)
-(PUTPROPS LLCHAR COPYRIGHT ("Venue & Xerox Corporation" 1982 1983 1984 1985 1986 1987 1988 1990 1994 
-2018 2021))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (4224 74410 (ALLOCSTRING 4234 . 6257) (MKATOM 6259 . 6894) (SUBATOM 6896 . 8766) (
-CHARACTER 8768 . 9772) (\PARSE.NUMBER 9774 . 25494) (\INVALID.DOTTED.SYMBOL 25496 . 25991) (
-\INVALID.INTEGER 25993 . 27445) (\MKINTEGER 27447 . 30154) (MKSTRING 30156 . 32299) (
-\PRINDATUM.TO.STRING 32301 . 38479) (BKSYSBUF 38481 . 40015) (NCHARS 40017 . 41717) (NTHCHARCODE 41719
- . 43765) (RPLCHARCODE 43767 . 44828) (\RPLCHARCODE 44830 . 46365) (NTHCHAR 46367 . 46560) (RPLSTRING 
-46562 . 49773) (SUBSTRING 49775 . 52698) (GNC 52700 . 52873) (GNCCODE 52875 . 53643) (GLC 53645 . 
-53818) (GLCCODE 53820 . 54585) (STREQUAL 54587 . 56701) (STRING.EQUAL 56703 . 61041) (STRINGP 61043 . 
-61194) (CHCON1 61196 . 61983) (U-CASE 61985 . 65212) (L-CASE 65214 . 69074) (U-CASEP 69076 . 69650) (
-\SMASHABLESTRING 69652 . 70114) (\MAKEWRITABLESTRING 70116 . 70552) (\SMASHSTRING 70554 . 74260) (
-\FATTENSTRING 74262 . 74408)) (74595 79757 (\GETBASESTRING 74605 . 75259) (\PUTBASESTRING 75261 . 
-78000) (\PUTBASESTRINGFAT 78002 . 78748) (GetBcplString 78750 . 79415) (SetBcplString 79417 . 79755)) 
-(101142 103956 (%%COPY-ONED-ARRAY 101152 . 103002) (%%COPY-STRING-TO-ARRAY 103004 . 103954)))))
+  (FILEMAP (NIL (4108 74294 (ALLOCSTRING 4118 . 6141) (MKATOM 6143 . 6778) (SUBATOM 6780 . 8650) (
+CHARACTER 8652 . 9656) (\PARSE.NUMBER 9658 . 25378) (\INVALID.DOTTED.SYMBOL 25380 . 25875) (
+\INVALID.INTEGER 25877 . 27329) (\MKINTEGER 27331 . 30038) (MKSTRING 30040 . 32183) (
+\PRINDATUM.TO.STRING 32185 . 38363) (BKSYSBUF 38365 . 39899) (NCHARS 39901 . 41601) (NTHCHARCODE 41603
+ . 43649) (RPLCHARCODE 43651 . 44712) (\RPLCHARCODE 44714 . 46249) (NTHCHAR 46251 . 46444) (RPLSTRING 
+46446 . 49657) (SUBSTRING 49659 . 52582) (GNC 52584 . 52757) (GNCCODE 52759 . 53527) (GLC 53529 . 
+53702) (GLCCODE 53704 . 54469) (STREQUAL 54471 . 56585) (STRING.EQUAL 56587 . 60925) (STRINGP 60927 . 
+61078) (CHCON1 61080 . 61867) (U-CASE 61869 . 65096) (L-CASE 65098 . 68958) (U-CASEP 68960 . 69534) (
+\SMASHABLESTRING 69536 . 69998) (\MAKEWRITABLESTRING 70000 . 70436) (\SMASHSTRING 70438 . 74144) (
+\FATTENSTRING 74146 . 74292)) (74479 79641 (\GETBASESTRING 74489 . 75143) (\PUTBASESTRING 75145 . 
+77884) (\PUTBASESTRINGFAT 77886 . 78632) (GetBcplString 78634 . 79299) (SetBcplString 79301 . 79639)) 
+(100978 103792 (%%COPY-ONED-ARRAY 100988 . 102838) (%%COPY-STRING-TO-ARRAY 102840 . 103790)))))
 STOP