github.com/Interlisp.medley
1
0
Fork 0
mirror of synced 2026-02-05 00:05:16 +00:00
Code Issues Projects Releases Wiki Activity

Eliminate implicit calls to \FILEOUTCHARFN (#529)

Browse Source 
* Eliminate implicit calls to \FILEOUTCHARFN

Also, update DATE to modern readtable (don't know what it does), add LLETHER to EXPORTFILES in FILESETS (may also need the file that exports pup records).

* Further fixups for EXPORTFILES

also fixing/compiling PLAINTEXTSTREAM

* Remove garbage files DATE and PLAINTEXTSTREAM from checkin

Co-authored-by: Larry Masinter <LMM@acm.org>
This commit is contained in:
rmkaplan
2021-10-21 16:25:16 -07:00
committed by GitHub
parent 9b4976e33f
commit c3b5e23cd9
18 changed files with 53 additions and 873 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
sources/BSP.LCOM
View File

Binary file not shown.

BIN
sources/COREIO.LCOM
View File

Binary file not shown.

BIN
sources/COURIER.LCOM
View File

Binary file not shown.

11
sources/FILESETS
View File

@@ -1,12 +1,12 @@
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
(FILECREATED "17-Oct-2021 16:06:59" 
{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FILESETS.;17 6482
(FILECREATED "17-Oct-2021 13:52:47" 
{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FILESETS.;15 6457
changes to%: (VARS EXPORTFILES)
previous date%: "17-Oct-2021 13:52:47"
{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FILESETS.;16)
previous date%: "17-Oct-2021 12:43:39"
{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FILESETS.;14)
(* ; "
@@ -72,8 +72,7 @@ Copyright (c) 1981-1990, 1998, 2021 by Xerox Corporation.
(MODARITH LLPARAMS LLCODE AERROR AOFD APRINT ATERM LLARRAYELT LLDATATYPE LLNEW LLBASIC LLCHAR
LLSTK PMAP LLGC ATBL FILEIO EXTERNALFORMAT LLARITH LLFLOAT FONT LLKEY LLDISPLAY
ADISPLAY AINTERRUPT RENAMEMACROS HLDISPLAY WINDOW MACROAUX ADDARITH LLFAULT LLTIMER
IMAGEIO PROC XCCS PASSWORDS INTERPRESS HARDCOPY CMLARRAY LLSUBRS LLETHER PUP UFS
DTDECLARE))
IMAGEIO PROC XCCS PASSWORDS INTERPRESS HARDCOPY CMLARRAY LLSUBRS LLETHER PUP UFS))
(RPAQQ MAKEINITFILES (MAKEINIT MEM I-NEW))

1
sources/FILESETS.NOETHER
View File

File diff suppressed because one or more lines are too long

1
sources/FILESETS.ORIG
View File

File diff suppressed because one or more lines are too long

1
sources/FILESETS.PUP
View File

File diff suppressed because one or more lines are too long

102
sources/JAPANESE
View File

@@ -1,18 +1,19 @@
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10 FORMAT XCCS)
(FILECREATED " 8-Aug-2021 13:28:16" 
{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>JAPANESE.;17 62025
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
changes to%: (FNS \JISOUTCHARFN \SHIFTJISOUTCHARFN \EUCOUTCHARFN)
(FILECREATED "17-Oct-2021 13:54:52" 
{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>JAPANESE.;18 61702
previous date%: " 6-Aug-2021 17:07:29"
{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>JAPANESE.;16)
changes to%: (VARS JAPANESECOMS)
previous date%: " 8-Aug-2021 13:28:16"
{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>JAPANESE.;17)
(PRETTYCOMPRINT JAPANESECOMS)
(RPAQQ JAPANESECOMS
[ (* ; "XCCS to JIS converter")
[COMS (* ; "JIS to XCCS conversion table.")
[ (* ; "XCCS to JIS converter")
[COMS (* ; "JIS to XCCS conversion table.")
(VARS *JIS-TO-XCCS-CONV-NO-FONT-TABLE* *JIS-TO-XCCS-CODE-MAP*
*HANKAKU-TO-ZENKAKU-CODE-MAP*)
(GLOBALVARS *JIS-TO-XCCS-CONV-NO-FONT-TABLE* *JIS-TO-XCCS-CONV-TABLE-LIST*
@@ -22,29 +23,28 @@
*HANKAKU-TO-ZENKAKU-CONV-TABLE* *ZENKAKU-TO-HANKAKU-CONV-TABLE*)
(FNS \MAKE.JIS.TO.XCCS.CONV.TABLE)
(DECLARE%: DONTEVAL@LOAD DOCOPY (P (\MAKE.JIS.TO.XCCS.CONV.TABLE]
(DECLARE%: DOEVAL@COMPILE DONTCOPY (EXPORT (MACROS \CONV.JIS.TO.XCCS \DO.CONV.JIS.TO.XCCS)))
(DECLARE%: DOEVAL@COMPILE DONTCOPY (MACROS \CONV.JIS.TO.XCCS \DO.CONV.JIS.TO.XCCS))
(FNS \JISIN \JISPEEK \BACKJISCCODE \SHIFTJISIN \SHIFTJISPEEK \BACKSHIFTJISCCODE \EUCIN
\EUCPEEK \BACKEUCCODE)
(FNS \JISOUTCHARFN \SHIFTJISOUTCHARFN \EUCOUTCHARFN)
[COMS (FNS CONVHANKAKU)
(DECLARE%: DOEVAL@COMPILE DONTCOPY (EXPORT (MACROS \CONV.XCCS.TO.JIS
\DO.CONV.XCCS.TO.JIS \ASCIIP
\NOT.EQUIVALENT.TO.JIS
\CONV.HANKAKU.TO.ZENKAKUP
\CONV.ZENKAKU.KANA]
(COMS (FNS CONVHANKAKU)
(DECLARE%: DOEVAL@COMPILE DONTCOPY (MACROS \CONV.XCCS.TO.JIS \DO.CONV.XCCS.TO.JIS
\ASCIIP \NOT.EQUIVALENT.TO.JIS
\CONV.HANKAKU.TO.ZENKAKUP \CONV.ZENKAKU.KANA)
))
(DECLARE%: DOEVAL@COMPILE DONTCOPY
(* ;; "JIS specific macro")
(* ;; "JIS specific macro")
(MACROS \EXTRACT.NO.FONT.CODE \EXTARACT.CONV.TABLE \NOT.EQUIVALENT.TO.XCCS
\EXTRACT.SET \EXTRACT.CODE \CHNAGE.KI.MODE \KIMODEP \HANKAKUP \KANJIP
\NOTGAIJIP \INVALID.TENP \CONV.HANKAKU.KANA \OUTKI \OUTKO)
(* ;; "Shift-JIS specific macro")
(* ;; "Shift-JIS specific macro")
(MACROS \CONV.SJIS.TO.JIS \CONV.JIS.TO.SJIS \SJIS.KANJI.FIRST.BYTEP)
(* ;; "EUC specific macro")
(* ;; "EUC specific macro")
(MACROS \EUC.KANJI.FIRST.BYTEP \GAIJIP \EUC.HANKAKUP))
(FNS \CREATE.JIS.EXTERNALFORMAT \CREATE.SHIFTJIS.EXTERNALFORMAT \CREATE.EUC.EXTERNALFORMAT)
@@ -449,11 +449,11 @@
(\MAKE.JIS.TO.XCCS.CONV.TABLE)
)
(DECLARE%: DOEVAL@COMPILE DONTCOPY
(* "FOLLOWING DEFINITIONS EXPORTED")(DECLARE%: EVAL@COMPILE
(DECLARE%: EVAL@COMPILE
(PUTPROPS \CONV.JIS.TO.XCCS MACRO [OPENLAMBDA (KU TEN)
(* ;;; "Some character code is not equivalent between JIS and XCCS. In such case, we have to convert the character to corresponding XCCS.")
(* ;;; "Some character code is not equivalent between JIS and XCCS. In such case, we have to convert the character to corresponding XCCS.")
(COND
((\NOT.EQUIVALENT.TO.XCCS KU)
@@ -464,13 +464,13 @@
(PUTPROPS \DO.CONV.JIS.TO.XCCS MACRO
[(KU TEN)
(* ;;; " Convert a JIS code divided into KU (high 8 bit) and TEN (low 8 bit) to an corresponding XCCS code.")
(* ;;; " Convert a JIS code divided into KU (high 8 bit) and TEN (low 8 bit) to an corresponding XCCS code.")
(COND
((\INVALID.TENP TEN)
*DEFAULT-NOT-CONVERTED-FAT-CODE*)
(T (SELECTQ KU
((33 34 38) (* ; "1, 2 and 6 KU")
((33 34 38) (* ; "1, 2 and 6 KU")
[LET* ((CONVTABLE (\EXTARACT.CONV.TABLE KU))
(SET (\EXTRACT.SET TEN CONVTABLE))
(CODE (\EXTRACT.CODE TEN CONVTABLE)))
@@ -479,41 +479,38 @@
(LOGOR (UNFOLD SET 256)
CODE))
(T (COND
((EQ CODE 255) (* ; "Not defined in JIS.")
((EQ CODE 255) (* ; "Not defined in JIS.")
*DEFAULT-NOT-CONVERTED-FAT-CODE*)
(T (* ;
 "Defined in JIS but the displayable font is not assigned in the corresponding code in XCCS.")
(T (* ;
 "Defined in JIS but the displayable font is not assigned in the corresponding code in XCCS.")
(COND
(*REPLACE-NO-FONT-CODE*
*DEFAULT-NOT-CONVERTED-FAT-CODE*)
(T (\EXTRACT.NO.FONT.CODE (LOGOR (UNFOLD KU 256)
TEN])
(35 (* ; "3 KU")
(* ;
 "Alpha numeric codes are all defined as single byte codes in XCCS.")
(35 (* ; "3 KU")
(* ;
 "Alpha numeric codes are all defined as single byte codes in XCCS.")
TEN)
(40 (* ; "8 KU")
(40 (* ; "8 KU")
(COND
[(< 0 TEN 33)
(COND
(*REPLACE-NO-FONT-CODE* *DEFAULT-NOT-CONVERTED-FAT-CODE*)
(T (\EXTRACT.NO.FONT.CODE (LOGOR KU TEN]
(T *DEFAULT-NOT-CONVERTED-FAT-CODE*)))
(116 (* ; "84 KU")
(116 (* ; "84 KU")
(COND
((< 0 TEN 5)
(LOGOR 29952 TEN))
(T *DEFAULT-NOT-CONVERTED-FAT-CODE*)))
(117 (* ; "85 KU")
(117 (* ; "85 KU")
(COND
((< 0 TEN 28)
(LOGOR 29696 TEN))
(T *DEFAULT-NOT-CONVERTED-FAT-CODE*)))
*DEFAULT-NOT-CONVERTED-FAT-CODE*])
)
(* "END EXPORTED DEFINITIONS")
)
(DEFINEQ
@@ -1055,11 +1052,11 @@
(ARG ARGS 2))))])
)
(DECLARE%: DOEVAL@COMPILE DONTCOPY
(* "FOLLOWING DEFINITIONS EXPORTED")(DECLARE%: EVAL@COMPILE
(DECLARE%: EVAL@COMPILE
(PUTPROPS \CONV.XCCS.TO.JIS MACRO (OPENLAMBDA (OUTSTREAM CC)
(* ;;; "Returns JIS code corresponding to XCCS charcode. Handle HANKAKU as well as ZENKAKU. If OUTSTREAM wants to convert ZENKAKUKANA to HANKAKUKANA, do so. Never returns two byte charcode for alpha-numeric character, they are all treated as single byte characode.")
(* ;;; "Returns JIS code corresponding to XCCS charcode. Handle HANKAKU as well as ZENKAKU. If OUTSTREAM wants to convert ZENKAKUKANA to HANKAKUKANA, do so. Never returns two byte charcode for alpha-numeric character, they are all treated as single byte characode.")
(OR (COND
((\ASCIIP CC)
@@ -1067,8 +1064,8 @@
((\NOT.EQUIVALENT.TO.JIS CC)
(\DO.CONV.XCCS.TO.JIS CC))
((\CONV.HANKAKU.TO.ZENKAKUP OUTSTREAM)
(* ;
 "ZENKAKUKANA comes here, because their charcodes are equiavalent to JIS.")
(* ;
 "ZENKAKUKANA comes here, because their charcodes are equiavalent to JIS.")
(\CONV.ZENKAKU.KANA CC))
(T CC))
CC)))
@@ -1104,9 +1101,6 @@
(PUTPROPS \CONV.ZENKAKU.KANA MACRO ((CHAR)
(GETHASH CHAR *ZENKAKU-TO-HANKAKU-CONV-TABLE*)))
)
(* "END EXPORTED DEFINITIONS")
)
(DECLARE%: DOEVAL@COMPILE DONTCOPY
(DECLARE%: EVAL@COMPILE
@@ -1120,7 +1114,7 @@
(PUTPROPS \NOT.EQUIVALENT.TO.XCCS MACRO ((KU)
(* ;;; " The JIS codes which are not equiavelent to XCCS reside in 1, 2, 3, 6, 8 and 84 KU. Although from 84-5 to 94-94 inclusive are not defined in JIS, that is they are GAIJI, they are also handled here.")
(* ;;; " The JIS codes which are not equiavelent to XCCS reside in 1, 2, 3, 6, 8 and 84 KU. Although from 84-5 to 94-94 inclusive are not defined in JIS, that is they are GAIJI, they are also handled here.")
(OR (EQ KU 33)
(EQ KU 34)
@@ -1141,8 +1135,8 @@
(PUTPROPS \CHNAGE.KI.MODE MACRO [OPENLAMBDA (ST INPUTFLG ENTERP)
(* ;;;
"INPUTFLG is true if \CHNAGE.KI.MODE is called in the context in which ST is an input stream.")
(* ;;;
"INPUTFLG is true if \CHNAGE.KI.MODE is called in the context in which ST is an input stream.")
(COND
[INPUTFLG (COND
@@ -1161,7 +1155,7 @@
(PUTPROPS \KIMODEP MACRO [OPENLAMBDA (ST INPUTFLG)
(* ;;; "INPUTFLG is true if \KIMODEP is called in the context in which ST is an input stream.")
(* ;;; "INPUTFLG is true if \KIMODEP is called in the context in which ST is an input stream.")
(COND
[INPUTFLG (ffetch (STREAM IN.KANJIIN)
@@ -1201,7 +1195,7 @@
(PUTPROPS \CONV.SJIS.TO.JIS MACRO [OPENLAMBDA (HI LO)
(* ;;; "Convert Shift-JIS to JIS. The variable named CH1 and CH2 are set to the converted hight 8 bit and low 8bit of JIS code respectively.")
(* ;;; "Convert Shift-JIS to JIS. The variable named CH1 and CH2 are set to the converted hight 8 bit and low 8bit of JIS code respectively.")
[SETQ CH1 (IDIFFERENCE HI (COND
((> HI 159)
@@ -1220,7 +1214,7 @@
(PUTPROPS \CONV.JIS.TO.SJIS MACRO [OPENLAMBDA (HI LO)
(* ;;; "Convert JIS to Shift-JIS. The variable named CH1 and CH2 are set to the converted hight 8 bit and low 8bit of Shift-JIS code respectively.")
(* ;;; "Convert JIS to Shift-JIS. The variable named CH1 and CH2 are set to the converted hight 8 bit and low 8bit of Shift-JIS code respectively.")
[SETQ CH2 (COND
((ODDP HI)
@@ -1313,11 +1307,11 @@
(ADDTOVAR LAMA CONVHANKAKU)
)
(DECLARE%: DONTCOPY
(FILEMAP (NIL (10976 16192 (\MAKE.JIS.TO.XCCS.CONV.TABLE 10986 . 16190)) (19836 45193 (\JISIN 19846 .
26482) (\JISPEEK 26484 . 33110) (\BACKJISCCODE 33112 . 33652) (\SHIFTJISIN 33654 . 35046) (
\SHIFTJISPEEK 35048 . 37154) (\BACKSHIFTJISCCODE 37156 . 37742) (\EUCIN 37744 . 39447) (\EUCPEEK 39449
. 43028) (\BACKEUCCODE 43030 . 45191)) (45194 49042 (\JISOUTCHARFN 45204 . 46614) (\SHIFTJISOUTCHARFN
46616 . 47716) (\EUCOUTCHARFN 47718 . 49040)) (49043 49362 (CONVHANKAKU 49053 . 49360)) (60086 61580
(\CREATE.JIS.EXTERNALFORMAT 60096 . 60484) (\CREATE.SHIFTJIS.EXTERNALFORMAT 60486 . 61189) (
\CREATE.EUC.EXTERNALFORMAT 61191 . 61578)))))
(FILEMAP (NIL (10791 16007 (\MAKE.JIS.TO.XCCS.CONV.TABLE 10801 . 16005)) (19582 44939 (\JISIN 19592 .
26228) (\JISPEEK 26230 . 32856) (\BACKJISCCODE 32858 . 33398) (\SHIFTJISIN 33400 . 34792) (
\SHIFTJISPEEK 34794 . 36900) (\BACKSHIFTJISCCODE 36902 . 37488) (\EUCIN 37490 . 39193) (\EUCPEEK 39195
. 42774) (\BACKEUCCODE 42776 . 44937)) (44940 48788 (\JISOUTCHARFN 44950 . 46360) (\SHIFTJISOUTCHARFN
46362 . 47462) (\EUCOUTCHARFN 47464 . 48786)) (48789 49108 (CONVHANKAKU 48799 . 49106)) (59763 61257
(\CREATE.JIS.EXTERNALFORMAT 59773 . 60161) (\CREATE.SHIFTJIS.EXTERNALFORMAT 60163 . 60866) (
\CREATE.EUC.EXTERNALFORMAT 60868 . 61255)))))
STOP

BIN
sources/JAPANESE.LCOM
View File

Binary file not shown.

BIN
sources/LEAF.LCOM
View File

Binary file not shown.

BIN
sources/LOCALFILE.LCOM
View File

Binary file not shown.

BIN
sources/MOD44IO.LCOM
View File

Binary file not shown.

BIN
sources/NSFILING.LCOM
View File

Binary file not shown.

BIN
sources/SPP.LCOM
View File

Binary file not shown.