FILEIO UNICODE: Fix THROUGHIN, cleanup UTF8-16 back

sources/FILEIO

@@ -1,11 +1,11 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10 FORMAT XCCS)
-
(FILECREATED " 5-Aug-2021 20:39:21" 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FILEIO.;73
 181010 
+
(FILECREATED " 6-Aug-2021 10:31:59" 
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FILEIO.;75
 181074 
 
-      changes to%:  (FNS \EXTERNALFORMAT)
+      changes to%:  (FNS \THROUGHIN)
 
-      previous date%: " 5-Aug-2021 14:42:41" 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FILEIO.;72)
+      previous date%: " 5-Aug-2021 22:31:41" 
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FILEIO.;74)
 
 
 (* ; "
@@ -1415,13 +1415,14 @@ Copyright (c) 1981-1993, 1999, 2020-2021 by Venue & Xerox Corporation.
                                         EOL _ CR.EOLC])
 
 (\THROUGHIN

-  [LAMBDA (STREAM BYTECOUNTVAR BYTECOUNTVAL)
            (* ; "Edited 15-Jun-2021 13:49 by rmk:")

+  [LAMBDA (STREAM BYTECOUNTVAR BYTECOUNTVAL)
            (* ; "Edited  6-Aug-2021 10:31 by rmk:")

 
 (* ;;; "Read in a single byte from STREAM and returns it without any character conversion, just through as if.")

 
 (* ;;; "If COUNP is non-NIL, always -1 is returned as the second value.")

 
-    [CL:WHEN (BYTECOUNTVAR (SET BYTECOUNTVAR (SUB1 BYTECOUNTVAL]
+    (CL:WHEN BYTECOUNTVAR
+        (SET BYTECOUNTVAR (SUB1 BYTECOUNTVAL)))
     (\BIN
 STREAM])
 
 (\THROUGHBACKCCODE

@@ -3081,10 +3082,11 @@ update the map")

 (DEFINEQ
 
 (\BOUTEOL

-  [LAMBDA (STREAM)
                                      (* ; "Edited  1-Aug-2021 10:08 by rmk:")

+  [LAMBDA (STREAM)
                                      (* ; "Edited  5-Aug-2021 22:31 by rmk:")

 
-    (* ;; "Convenient closed function to put out EOL characters without depending on EXPORTS.ALL for constants.  This could also set the position back to 0.")

+    (* ;; "Convenient closed function to put out EOL characters without depending on EXPORTS.ALL for constants.  This also sets the position back to 0.")

 
+    (REPLACE
 (STREAM CHARPOSITION) OF
 STREAM WITH
 0)
     (SELECTC (FETCH
 (STREAM EOLCONVENTION) OF
 STREAM)
         (LF.EOLC (\BOUT
 STREAM (CHARCODE LF)))
         (CR.EOLC (\BOUT
 STREAM (CHARCODE CR)))
@@ -3418,44 +3420,44 @@ update the map")

 (PUTPROPS FILEIO COPYRIGHT ("Venue & Xerox Corporation" 1981 1982 1983 1984 1985 1986 1987 1988 1989 
 1990 1991 1992 1993 1999 2020 2021))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (28417 31907 (STREAMPROP 28427 . 28861) (GETSTREAMPROP 28863 . 29336) (PUTSTREAMPROP 
-29338 . 31755) (STREAMP 31757 . 31905)) (31950 34469 (\DEFPRINT.BY.NAME 31960 . 33112) (
-\STREAM.DEFPRINT 33114 . 34162) (\FDEV.DEFPRINT 34164 . 34467)) (34727 39768 (\GETACCESS 34737 . 35191
-) (\SETACCESS 35193 . 39766)) (62772 64025 (MAKE-EXTERNALFORMAT 62782 . 64023)) (65211 72782 (
-\INSTALL.EXTERNALFORMAT 65221 . 66670) (\REMOVE.EXTERNALFORMAT 66672 . 67503) (FIND-FORMAT 67505 . 
-68056) (\EXTERNALFORMAT 68058 . 72780)) (73105 74924 (\CREATE.THROUGH.EXTERNALFORMAT 73115 . 73917) (
-\THROUGHIN 73919 . 74325) (\THROUGHBACKCCODE 74327 . 74572) (\THROUGHOUTCHARFN 74574 . 74922)) (75032 
-81001 (\DEFINEDEVICE 75042 . 77358) (\GETDEVICEFROMNAME 77360 . 77833) (\GETDEVICEFROMHOSTNAME 77835
- . 78879) (\REMOVEDEVICE 78881 . 80004) (\REMOVEDEVICE.NAMES 80006 . 80999)) (81041 105701 (\CLOSEFILE
- 81051 . 81876) (\DELETEFILE 81878 . 82172) (\DEVICEEVENT 82174 . 83944) (\GENERATEFILES 83946 . 84424
-) (\GENERATENEXTFILE 84426 . 85077) (\GENERATEFILEINFO 85079 . 85540) (\GETFILENAME 85542 . 85931) (
-\GENERIC.OUTFILEP 85933 . 86403) (\OPENFILE 86405 . 88983) (\DO.PARAMS.AT.OPEN 88985 . 91538) (
-\RENAMEFILE 91540 . 91964) (\REVALIDATEFILE 91966 . 94568) (\PAGED.REVALIDATEFILELST 94570 . 96128) (
-\PAGED.REVALIDATEFILES 96130 . 97849) (\PAGED.REVALIDATEFILE 97851 . 100134) (\BUFFERED.REVALIDATEFILE
- 100136 . 102422) (\BUFFERED.REVALIDATEFILELST 102424 . 103608) (\PRINT-REVALIDATION-RESULT 103610 . 
-104025) (\TRUNCATEFILE 104027 . 104418) (\FILE-CONFLICT 104420 . 105699)) (105737 110400 (
-\GENERATENOFILES 105747 . 107843) (\NULLFILEGENERATOR 107845 . 108089) (\NOFILESNEXTFILEFN 108091 . 
-110082) (\NOFILESINFOFN 110084 . 110398)) (110519 112427 (\FILE.NOT.OPEN 110529 . 111042) (
-\FILE.WONT.OPEN 111044 . 111372) (\ILLEGAL.DEVICEOP 111374 . 111656) (\IS.NOT.RANDACCESSP 111658 . 
-112104) (\STREAM.NOT.OPEN 112106 . 112425)) (112562 114860 (\FDEVINSTANCE 112572 . 114858)) (116410 
-123784 (CNDIR 116420 . 117725) (DIRECTORYNAME 117727 . 121910) (DIRECTORYNAMEP 121912 . 122528) (
-HOSTNAMEP 122530 . 123337) (\ADD.CONNECTED.DIR 123339 . 123782)) (123829 154472 (\BACKFILEPTR 123839
- . 124027) (\BACKPEEKBIN 124029 . 124390) (\BACKBIN 124392 . 124743) (BIN 124745 . 124962) (\BIN 
-124964 . 125241) (\BINS 125243 . 125529) (BOUT 125531 . 125893) (\BOUT 125895 . 126210) (\BOUTS 126212
- . 126523) (COPYBYTES 126525 . 129857) (COPYCHARS 129859 . 136781) (COPYFILE 136783 . 137580) (
-\COPYOPENFILE 137582 . 140655) (\INFER.FILE.TYPE 140657 . 141611) (EOFP 141613 . 141910) (FORCEOUTPUT 
-141912 . 142159) (\FLUSH.OPEN.STREAMS 142161 . 142517) (CHARSET 142519 . 144183) (ACCESS-CHARSET 
-144185 . 144402) (GETEOFPTR 144404 . 144654) (GETFILEINFO 144656 . 147849) (\TYPE.FROM.FILETYPE 147851
- . 148321) (\FILETYPE.FROM.TYPE 148323 . 148502) (GETFILEPTR 148504 . 148756) (SETFILEINFO 148758 . 
-152371) (SETFILEPTR 152373 . 154092) (BOUT16 154094 . 154279) (BIN16 154281 . 154470)) (154575 159780 
-(\GENERIC.BINS 154585 . 154865) (\GENERIC.BOUTS 154867 . 155132) (\GENERIC.RENAMEFILE 155134 . 156965)
- (\GENERIC.OPENP 156967 . 158282) (\GENERIC.READP 158284 . 159325) (\GENERIC.CHARSET 159327 . 159778))
- (159781 160120 (\MAP-OPEN-STREAMS 159791 . 160118)) (161990 164070 (\EOF.ACTION 162000 . 162251) (
-\EOSERROR 162253 . 162446) (\GETEOFPTR 162448 . 162630) (\INCFILEPTR 162632 . 162982) (\PEEKBIN 162984
- . 163175) (\SETCLOSEDFILELENGTH 163177 . 163511) (\SETEOFPTR 163513 . 163701) (\SETFILEPTR 163703 . 
-164068)) (164071 164613 (\FIXPOUT 164081 . 164381) (\FIXPIN 164383 . 164611)) (164614 165222 (\BOUTEOL
- 164624 . 165220)) (168314 178178 (\BUFFERED.BIN 168324 . 169176) (\BUFFERED.PEEKBIN 169178 . 169960) 
-(\BUFFERED.BOUT 169962 . 170822) (\BUFFERED.BINS 170824 . 174509) (\BUFFERED.BOUTS 174511 . 176312) (
-\BUFFERED.COPYBYTES 176314 . 178176)) (178207 180559 (\NULLDEVICE 178217 . 180235) (\NULL.OPENFILE 
-180237 . 180557)))))
+  (FILEMAP (NIL (28412 31902 (STREAMPROP 28422 . 28856) (GETSTREAMPROP 28858 . 29331) (PUTSTREAMPROP 
+29333 . 31750) (STREAMP 31752 . 31900)) (31945 34464 (\DEFPRINT.BY.NAME 31955 . 33107) (
+\STREAM.DEFPRINT 33109 . 34157) (\FDEV.DEFPRINT 34159 . 34462)) (34722 39763 (\GETACCESS 34732 . 35186
+) (\SETACCESS 35188 . 39761)) (62767 64020 (MAKE-EXTERNALFORMAT 62777 . 64018)) (65206 72777 (
+\INSTALL.EXTERNALFORMAT 65216 . 66665) (\REMOVE.EXTERNALFORMAT 66667 . 67498) (FIND-FORMAT 67500 . 
+68051) (\EXTERNALFORMAT 68053 . 72775)) (73100 74928 (\CREATE.THROUGH.EXTERNALFORMAT 73110 . 73912) (
+\THROUGHIN 73914 . 74329) (\THROUGHBACKCCODE 74331 . 74576) (\THROUGHOUTCHARFN 74578 . 74926)) (75036 
+81005 (\DEFINEDEVICE 75046 . 77362) (\GETDEVICEFROMNAME 77364 . 77837) (\GETDEVICEFROMHOSTNAME 77839
+ . 78883) (\REMOVEDEVICE 78885 . 80008) (\REMOVEDEVICE.NAMES 80010 . 81003)) (81045 105705 (\CLOSEFILE
+ 81055 . 81880) (\DELETEFILE 81882 . 82176) (\DEVICEEVENT 82178 . 83948) (\GENERATEFILES 83950 . 84428
+) (\GENERATENEXTFILE 84430 . 85081) (\GENERATEFILEINFO 85083 . 85544) (\GETFILENAME 85546 . 85935) (
+\GENERIC.OUTFILEP 85937 . 86407) (\OPENFILE 86409 . 88987) (\DO.PARAMS.AT.OPEN 88989 . 91542) (
+\RENAMEFILE 91544 . 91968) (\REVALIDATEFILE 91970 . 94572) (\PAGED.REVALIDATEFILELST 94574 . 96132) (
+\PAGED.REVALIDATEFILES 96134 . 97853) (\PAGED.REVALIDATEFILE 97855 . 100138) (\BUFFERED.REVALIDATEFILE
+ 100140 . 102426) (\BUFFERED.REVALIDATEFILELST 102428 . 103612) (\PRINT-REVALIDATION-RESULT 103614 . 
+104029) (\TRUNCATEFILE 104031 . 104422) (\FILE-CONFLICT 104424 . 105703)) (105741 110404 (
+\GENERATENOFILES 105751 . 107847) (\NULLFILEGENERATOR 107849 . 108093) (\NOFILESNEXTFILEFN 108095 . 
+110086) (\NOFILESINFOFN 110088 . 110402)) (110523 112431 (\FILE.NOT.OPEN 110533 . 111046) (
+\FILE.WONT.OPEN 111048 . 111376) (\ILLEGAL.DEVICEOP 111378 . 111660) (\IS.NOT.RANDACCESSP 111662 . 
+112108) (\STREAM.NOT.OPEN 112110 . 112429)) (112566 114864 (\FDEVINSTANCE 112576 . 114862)) (116414 
+123788 (CNDIR 116424 . 117729) (DIRECTORYNAME 117731 . 121914) (DIRECTORYNAMEP 121916 . 122532) (
+HOSTNAMEP 122534 . 123341) (\ADD.CONNECTED.DIR 123343 . 123786)) (123833 154476 (\BACKFILEPTR 123843
+ . 124031) (\BACKPEEKBIN 124033 . 124394) (\BACKBIN 124396 . 124747) (BIN 124749 . 124966) (\BIN 
+124968 . 125245) (\BINS 125247 . 125533) (BOUT 125535 . 125897) (\BOUT 125899 . 126214) (\BOUTS 126216
+ . 126527) (COPYBYTES 126529 . 129861) (COPYCHARS 129863 . 136785) (COPYFILE 136787 . 137584) (
+\COPYOPENFILE 137586 . 140659) (\INFER.FILE.TYPE 140661 . 141615) (EOFP 141617 . 141914) (FORCEOUTPUT 
+141916 . 142163) (\FLUSH.OPEN.STREAMS 142165 . 142521) (CHARSET 142523 . 144187) (ACCESS-CHARSET 
+144189 . 144406) (GETEOFPTR 144408 . 144658) (GETFILEINFO 144660 . 147853) (\TYPE.FROM.FILETYPE 147855
+ . 148325) (\FILETYPE.FROM.TYPE 148327 . 148506) (GETFILEPTR 148508 . 148760) (SETFILEINFO 148762 . 
+152375) (SETFILEPTR 152377 . 154096) (BOUT16 154098 . 154283) (BIN16 154285 . 154474)) (154579 159784 
+(\GENERIC.BINS 154589 . 154869) (\GENERIC.BOUTS 154871 . 155136) (\GENERIC.RENAMEFILE 155138 . 156969)
+ (\GENERIC.OPENP 156971 . 158286) (\GENERIC.READP 158288 . 159329) (\GENERIC.CHARSET 159331 . 159782))
+ (159785 160124 (\MAP-OPEN-STREAMS 159795 . 160122)) (161994 164074 (\EOF.ACTION 162004 . 162255) (
+\EOSERROR 162257 . 162450) (\GETEOFPTR 162452 . 162634) (\INCFILEPTR 162636 . 162986) (\PEEKBIN 162988
+ . 163179) (\SETCLOSEDFILELENGTH 163181 . 163515) (\SETEOFPTR 163517 . 163705) (\SETFILEPTR 163707 . 
+164072)) (164075 164617 (\FIXPOUT 164085 . 164385) (\FIXPIN 164387 . 164615)) (164618 165286 (\BOUTEOL
+ 164628 . 165284)) (168378 178242 (\BUFFERED.BIN 168388 . 169240) (\BUFFERED.PEEKBIN 169242 . 170024) 
+(\BUFFERED.BOUT 170026 . 170886) (\BUFFERED.BINS 170888 . 174573) (\BUFFERED.BOUTS 174575 . 176376) (
+\BUFFERED.COPYBYTES 176378 . 178240)) (178271 180623 (\NULLDEVICE 178281 . 180299) (\NULL.OPENFILE 
+180301 . 180621)))))
 STOP