From e8acbf6fc0d50c479a87356cfd2258b9199fcefe Mon Sep 17 00:00:00 2001 From: rmkaplan Date: Wed, 29 Nov 2023 11:06:38 -0800 Subject: [PATCH 1/3] EXTERNALFORMAT: \CHECKECOLC macro confusedf ANY vs CR EOL convention --- sources/EXTERNALFORMAT | 48 ++++++++++++++++++------------------ sources/EXTERNALFORMAT.LCOM | Bin 11055 -> 10895 bytes 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/sources/EXTERNALFORMAT b/sources/EXTERNALFORMAT index 6a9fea117..fa7f51998 100644 --- a/sources/EXTERNALFORMAT +++ b/sources/EXTERNALFORMAT @@ -1,12 +1,12 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "10-Oct-2022 18:10:56"  -{DSK}c>Users>Larry>home>MEDLEY>SOURCES>EXTERNALFORMAT.;76 37395 +(FILECREATED "23-Oct-2023 17:07:12" {WMEDLEY}EXTERNALFORMAT.;79 37416 - :CHANGES-TO (FNS SYSTEM-EXTERNALFORMAT) + :EDIT-BY rmk - :PREVIOUS-DATE "24-Jul-2022 14:56:07" -{DSK}c>Users>Larry>home>MEDLEY>SOURCES>EXTERNALFORMAT.;75) + :CHANGES-TO (MACROS \CHECKEOLC) + + :PREVIOUS-DATE "17-Oct-2023 15:55:24" {WMEDLEY}EXTERNALFORMAT.;78) (PRETTYCOMPRINT EXTERNALFORMATCOMS) @@ -519,9 +519,10 @@ FSTRING]) (\CHECKEOLC.CRLF - [LAMBDA (STREAM PEEKBINFLG COUNTP) (* ; "Edited 6-Aug-2021 23:30 by rmk:") + [LAMBDA (STREAM PEEKBINFLG COUNTP) (* ; "Edited 17-Oct-2023 11:56 by rmk") + (* ; "Edited 6-Aug-2021 23:30 by rmk:") - (* ;; "This is called only when a CR has been read and EOLC is either any or CRLF. This returns EOL if the next code is an LF") + (* ;; "This is called only when a CR has been read and EOLC is either ANY or CRLF. This returns EOL if the next code is an LF") (* ;; "If COUNTP, that sets *BYTECOUNTER* freely with the number of LF bytes.") @@ -530,8 +531,7 @@ [SETQ CH (COND [PEEKBINFLG - (* ;; - "T from PEEKC. In this case, must leave the fileptr where it was.") + (* ;; "T from PEEKC. In this case, must leave the fileptr where it was.") (* ;; "The CR itself hasn't been read, just peeked. So here we have to read it, then peek at the next character to see if it is an LF, and then back out the CR") @@ -545,10 +545,10 @@ (PROG1 (\PEEKCCODE STREAM T 'NOEOLC) (* ;; - "This has to be a call to \PEEKCODE that doesn't itself to the checkeolc") + "This has to be a call to \PEEKCODE that doesn't itself to the checkeolc") (* ;; - "LF must be the next char after the CR. We back up over the CR that \INCCODE just read.") + "LF must be the next char after the CR. We back up over the CR that \INCCODE just read.") (\BACKCCODE STREAM)))] @@ -563,9 +563,9 @@ (IF COUNTP THEN (LET (NUMLFBYTES) - (DECLARE (SPECVARS NUMLFBYTES)) - (\INCCODE STREAM 'NUMLFBYTES 0) - (ADD *BYTECOUNTER* NUMLFBYTES)) + (DECLARE (SPECVARS NUMLFBYTES)) + (\INCCODE STREAM 'NUMLFBYTES 0) + (ADD *BYTECOUNTER* NUMLFBYTES)) ELSE (\INCCODE STREAM)) (CHARCODE EOL)) (T (CHARCODE CR] @@ -581,7 +581,7 @@ (CHARCODE EOL)) (CHARCODE LF))) (CR (SELECTC (OR EOLC (FFETCH (STREAM EOLCONVENTION) OF STRM)) - ((LIST CR.EOLC 'ANY) + ((LIST CR.EOLC 'CR) (CHARCODE EOL)) ((LIST ANY.EOLC CRLF.EOLC 'CRLF 'ANY) (\CHECKEOLC.CRLF STRM PEEKBINFLG COUNTP)) @@ -712,13 +712,13 @@ (\CREATE.THROUGH.EXTERNALFORMAT) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (6559 13194 (\EXTERNALFORMAT 6569 . 10347) (MAKE-EXTERNALFORMAT 10349 . 12721) ( -\EXTERNALFORMAT.DEFPRINT 12723 . 13192)) (13195 16236 (\INSTALL.EXTERNALFORMAT 13205 . 14654) ( -\REMOVE.EXTERNALFORMAT 14656 . 15487) (FIND-FORMAT 15489 . 16234)) (16237 16649 (SYSTEM-EXTERNALFORMAT - 16247 . 16647)) (16998 31818 (\OUTCHAR 17008 . 18225) (\INCCODE 18227 . 19380) (\BACKCCODE 19382 . -20951) (\BACKCCODE.EOLC 20953 . 23143) (\PEEKCCODE 23145 . 23470) (\PEEKCCODE.EOLC 23472 . 23851) ( -\INCCODE.EOLC 23853 . 25652) (\FORMATBYTESTREAM 25654 . 27789) (\FORMATBYTESTRING 27791 . 29250) ( -\CHECKEOLC.CRLF 29252 . 31816)) (33096 35332 (\NULLDEVICE 33106 . 35008) (\NULL.OPENFILE 35010 . 35330 -)) (35472 37299 (\CREATE.THROUGH.EXTERNALFORMAT 35482 . 36268) (\THROUGHIN 36270 . 36690) ( -\THROUGHBACKCCODE 36692 . 36959) (\THROUGHOUTCHARFN 36961 . 37297))))) + (FILEMAP (NIL (6507 13142 (\EXTERNALFORMAT 6517 . 10295) (MAKE-EXTERNALFORMAT 10297 . 12669) ( +\EXTERNALFORMAT.DEFPRINT 12671 . 13140)) (13143 16184 (\INSTALL.EXTERNALFORMAT 13153 . 14602) ( +\REMOVE.EXTERNALFORMAT 14604 . 15435) (FIND-FORMAT 15437 . 16182)) (16185 16597 (SYSTEM-EXTERNALFORMAT + 16195 . 16595)) (16946 31840 (\OUTCHAR 16956 . 18173) (\INCCODE 18175 . 19328) (\BACKCCODE 19330 . +20899) (\BACKCCODE.EOLC 20901 . 23091) (\PEEKCCODE 23093 . 23418) (\PEEKCCODE.EOLC 23420 . 23799) ( +\INCCODE.EOLC 23801 . 25600) (\FORMATBYTESTREAM 25602 . 27737) (\FORMATBYTESTRING 27739 . 29198) ( +\CHECKEOLC.CRLF 29200 . 31838)) (33117 35353 (\NULLDEVICE 33127 . 35029) (\NULL.OPENFILE 35031 . 35351 +)) (35493 37320 (\CREATE.THROUGH.EXTERNALFORMAT 35503 . 36289) (\THROUGHIN 36291 . 36711) ( +\THROUGHBACKCCODE 36713 . 36980) (\THROUGHOUTCHARFN 36982 . 37318))))) STOP diff --git a/sources/EXTERNALFORMAT.LCOM b/sources/EXTERNALFORMAT.LCOM index 6c05875e311431ea9ccecf6c21eb7665cf575c47..eb91cc889443e14ba4e0ca9bff83f087bcf8f9ac 100644 GIT binary patch delta 742 zcma)(&ubGw6vsCk^{};NH{uTvASmKhq-X89-u*NDADpy7Qd-ctJoxhF&FAyxYwJz(?bZ|%E$B`(tYZSm zb`W-SLxr^39qsH6hW#Fl9)Swax2mk@v-XSiz0s3#x4&0lcOw?os9y@gDvh#hc0L1= zit)*5wxbgj#{Iw3`cHRKhKC}5B^r@W(VjIW;hZQT4w$X<1&NfJnSEjYwtf55#q^r~m zg9dcGGV?ZB;CmTx>LF`Yf@VW2asW_~y&!Kors-h5O6i}wyRc^GGEyi0uyk$zvG{8_ zNh};!WcBh(Q4o^up`#=Omk!19N=iv2;#V?B6yhK9`mKsAq!G3jpt4@*m-t=~GJw|F zfOHFH5#&r>!8}e43;a^-DmRviWk4MWP@PyL-d3Vj?YtnIqhH*g7nKL%!N#X=!be3H z-NT%cNVICo5l?Kw9#kH9gW=lqkn4I*!QG+tPX0{^v`tul@nie!d_8 delta 894 zcmb`EO>YuW6o!XsO%1hm29q{vjGl}!p$o{|J6|w1Bh%qxp;Lx3KyAW?!lWgc7Q=@L zX$(K03);-moeMWEjA7@-HKu$2h6{gymx4w~SH`3a=moq+)1^R&DBW~<&mZnT@PJ)>@vJ6^kE*tK@MZ=AGF zJ!6lgZE|S1PPu3i*B~!Tq?kADj8oh*OYvu#x=H6~e=U<`eFIB$`cd2ay{~>!J3IC| zPxW9ZtPP+^*B^L3Eql;yL8j;XUK=|7POI02Kj+2caRC~&E|nafU!=&oln^$<(M;AR zR*{$`k_O=xbaf83@QF2 z=E+^1rWF-v4kO4rldfRQJzBvEh5|@nidaFx53Uq{eurTe&G)IV_xL0B%l5lZ%m-d% zQ{x05T1Yj0c6T-M*_^5xo#z6de;b}%uX0?l6p`3#GuY>(pcT10V4@P$GN%-fmIRlS zXv9z@71ORDK#DT|juJ`YR60)1h_E(A!t$&@jhH}*zo-DsDie#I+_-=czOg||OoKS- Opw+1jqs0do>puY-_wMNc From 157716be90a8467d13e2ad12548ea948bdcb663d Mon Sep 17 00:00:00 2001 From: rmkaplan Date: Wed, 29 Nov 2023 11:06:59 -0800 Subject: [PATCH 2/3] Recompile callers of \CHECKEOLC macro --- sources/FASLOAD.LCOM | Bin 33778 -> 33846 bytes sources/IOCHAR.LCOM | Bin 23374 -> 24080 bytes sources/LLREAD.LCOM | Bin 22496 -> 22557 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/sources/FASLOAD.LCOM b/sources/FASLOAD.LCOM index 6e4d14bee9c2ffe178fc4b9b3a261b11070e78ee..9127bffe5f34090daea047cf4906426aef525f4d 100644 GIT binary patch delta 408 zcmey=&a|zAX+lt(e{zYgk%5u1f}y#UfrXWkrILb%QgVK7L1s>Bib8&#f|7!#k5x@| zxUZ{=k85PDO>ur{QF3arottB@kH4dfp0#O>rUI9ek&!O4Q6STdl@umkQ8a`L>*?u1 z3`#qmNpqsD#%5o}ZhyudlWzuS*5~~HFwsN6GbM-X!zS(h4ySkoQ?fs7 z7Ej4x{;)nJodF0wEQiul_UG_!@ZO)pwZSci_roR!u;MIKX&sP8kai{v?KAf~WTbF| zOl$!f)ZiI)DTnWa{uZ_zcCU*bTp;oN4hoSQ{}(c77@C_Zgtm|MW)%?&^-pycL7fdNJU D8y0@t delta 255 zcmdni!Stz}X+qFsaYkW24W;D#+=9%U)D(sMJcY>`jP6pJ3Q9&sx_@h6+YT zR)&^VMn*~sToX4a>cPeJ^z@VzJbkQcQW8s2Q);kkGT+3w)t|9-^0olY`jnjiA0~PT zII5NqIk5F6+Z)F_7GnlpLlHGxs}W zq;N9;LDT*m-l$7Cd>^*3<*<8Q^xy&s?srg#+_0EI!_df7A9zhf141 z+M}7W8w77@Sz)~VhPIi3zw0yZQ*OGuwZL36UTR4VZ6NYx=2$LBclR5dvt@IeX}jNW z6}R1Ue(G_$CULt_ZfQ@qR~8|D_2~%i!X2?6M{)b%m3QwkFVW4Cr_qahvlvy1%_Z!c z$KALWlrNHX$(!*~C+vP@3b$hyar-Xa8OL^^o|f`kxCMJFiyOa2GIHbg*$0{S5*)=0 z@-ly;t#yDGRdoE2o(^g$JsdrjK)fKLzCJCP)TW1VIGobci02gJ{nqaURT0JXR4Rc4 zQAGMvN3<9cH~~>x5VE|zoLZo3JZXE~?mNMfTo|VFb=sV97(^PAq3JPXmkdn8h*;4C|7&T=*sK$Gs43 z#pCS8BUpWOV}ZF6vU9u{#UmsVED*?tC$e~)1`5vOF+4#7!3r6=%f%7wuFGJQW{}6D z;Mk92SsbB`lk+%?W7H8=$l%t@?G`)&Z!=QDqp*wuM80*(duyTU(OyP?efg z5o=p<)j+5rN#Fpf>7*7lh%SU9T8mHPsTg_*9I1!0J;eNf%q1BgSoltlQfLk>&q7lJItN&&4GixPt8?x zo(4xW@~9XNMzeF(N@1sM_-fQLd~aZ{_S+z&!N~!19GWkzrBl=K5T4KxCj=05YD7y# zkorGbu&34LkZ6nzb{yuQa(1rZ%hx}NGJ3wzS<|Mc6Z-Dwks#DL043M-#nXf58XP0W z--p_^n8j?Oi}BgeHOCK)AMAZUKO4EE$NhZ$^|h}@3$P! zbd@5rxXTrLxL(ms6y2^4_j&~)3gmJ}afO-Q5WBg{HoCkE$nnh!JBArB%B%|X& zEp#|U>n8!MtP)AA2w;te!j`27SdFJ6ePJK#WB^^TUQ|3o=)!CKR zXr|)K+{N{xWWC7a^kQU!iNQX5(`(}K`}@252THk2OU7HeotiOw`t}`r^NO`usJ>8q zXa8o0BW3)R-L*E?&)Dv+2JBjR{CUIza%t_`?cw$QIS~_Xo@7*U{!d|1fc@dOA#tV?iRWwmNoJRIvbG~;EjVqrxW0A>=L>fRD~{z z3ev6yIY6xZNB|bIrxR}VdSPqV3m;%na5@dlu5!d>E0hP0rxKZ-u!V=7F$DrSqqC2* zyMu75l^1X=O_jGZE&faRg~Op3Hzcn2V+3t8k$ssCG8*ut=Ra-_+Z?{LcRWkx$Xg2z zkMXh8?a+)3a_>nC)0vi%HOX|5k+BO##!OpjoCbN8ne`+)@L=|SgF9D#oysoVb7t7m zI@vOl;Y*l3U0uP0*2J`u@q?A|9BSziL52O5;voz(36EJi5x}~X*;g9JL&gW{jt=ue z!|dz|i9Q6w!BFY;+szA)|7m<8pC9YQgCBip{?XIVREHR0^VtE*6-}qa0kdW7}dNh)Kc5PH(}fE3R8JwQcm!I!j#CseV8AoE4gETfg^(hGB%$lpWh(Q) zVxfp0I!v_wP%;*VrUcqpH4zl@h4G94>|t|(^+6$s>xV~(X4_D{5I7!99ft0T#>pf} z+X}Yud7=bRG7+oY)I7(+Au0zHw1$#6WtEf6+Zg)TKEg@^MkM3)kzM(KDx2*afZ$d~ z2MA-4yEPz*HJRP!fm)xV04JMt6<{qcQv<79rt&DBAncJsGF;YLd>Y9t3~HoW5_}nj h$dJ;_g>nGOjf9*3EIxQkI z>|~M%qCocVS5hfu{t!eWX*ELxUe?y^-x~5tB(A2@Ng@goQC~c+#EIY+3FAdUpTF`( zUw?OZ$LAvk!*+~f<=uV9j63%{_obgkFjV>4dlAhz)Ne0z_0ZTv)(n)qRKwq!5ltO> zVZ;i3`Pwhfvs=bfg?`>F1CGT^SOyPBEM~Z_T5IKZF^Dcywr=Sh1V4Dc zxLq>57H-*bCkB41sE8|S8iG&`jxtS?%P;{UrU_S!zPVNjg1OCtpl(4B<@Uo&4kAo0 zx(rh=!{l&93+^ti*uam@_^S}aC5Q=o^^EmysbNvy1ZQ;p8aU@%8)k!B5;>x#Qjj7d zre;$XMM>5^a(%j6Twvbd7d zIc7>DKzTk-q_mJw`TB%W##_1{Poz(YOVacM0~><-A(gV zMSFyR_Un;rMqc9%kPbhm@dx&4-#c)2@Mq6qSA~90*~*SkzR=jgBtmOf%eIg<BIQyc8g(upA>wCOw}B!<0&RK0vT`qe?nT ze9zp<0TPaeA;A+-tGOL^(Mv9Ob%vu#Dx-wrYGyvEzHqs6{NTloJ=^UD!#0I=3G>iW zf8IhY(X}4!?_;-&IqmZJpHI$3A9md=G-~ffC(kw**JmGh-K?ris#Ye*y_U!hRHI8U zV2W?(M<+cxO%AhuB=ks3=4d{?!Bo&s{OORl$jiEKvACMdq=?L6SB8}EY?%2e1>}}1 z63uih5soxD#ek0_GEwRkV->w9*>*1k@JyrDtrI4shcRFYD7i6p2QX+ovjKIui@;<0p6FI7obtwMx4%5&^Ps6$oe zus9{oPePE1YHu8#AMB{_eI_kamHtS@PQ%vC9q+&;&wb^^FGmwBn$@q;!n%K@&{$f3 znoOOTEnMA73b&IiomL=g25{m3ur|&+_m5QbSzFdxT}dtKCBE`uYx7QP^WDk?zT0Sw zX|D=H)S6!iPU}uEl^WZk%_6B%TmL2q#Rmqrj}F_m$oNDI>(ey*1Yax7UYfSHGYi zVCgXqUNg!AmEGREMx$5zz{d}l_hB7Q<=*V3<)z>lu>8YpA=b$KvB_LcoJ71gc4^Q1 zokmIX_=oXvkhN7As^Pl;0e6zgy=+*rr1ro_?qP>HU;8yP|&?9|QXH z0M}K027_m5om${VpmA4M-tR3v{_D#2Q!5`v{n~#5oYAd~29@FfI+F)!BWp%= zU}o~BXst2^wz3n(H`zPRfYAoytJ(2uFb*b+_2b7h1?YJmn=>&-zj?14xI#~Tv1aLY zwm|zj1o8QHh7E>ydV7@^PU}T;{7!L3hj3h0vlCTik&Okg?xe}3ah^b1CjJjwCTbPC z0#<$UC?KGI4ByK-c9$AgdVAITLkc*MuHZw!y3RP2BEt!1RiVIOZlcGq!l;B&i3!Z> z$gY!Il;lDL(T~IQIBY^Z^!qlqxF2V6`-t%Q^btZ~!J|SvjB^<&$-}DJgcUDEop4kQ z&(dp8I2Df&$%k_w`GiH31N51AT9lq?R}uSV6G(`tZc_sbfdHAC#n~Q9OcNo%paQq} zRK#XXCF4&(ix2qdSBg9Z@%G0kj~Kp5B`-cDG+(Fm5r8NkRx$)(vTXvjhAF~|KOpLp v!{-fFuctksW&{6s1h(P`a)W6GH diff --git a/sources/LLREAD.LCOM b/sources/LLREAD.LCOM index d2947fa369c44cd43efcb9af7940d5d008d39de5..92f01213a5c31ef6b75461333d2af41f6309b75e 100644 GIT binary patch delta 565 zcmaE`o^kF5#tGpfM#j4S$tAi*21dpThUQj=hCnni+r-TXRoL9hz*tG4C^b1hw;(eo zHANw{q97+TIkP0EQq@W!CMY;0$kWf=NFg&%LCG!D$49{kY{0|^BElFZ85(S6XS9}O z^qTA}m&&+v@=7`FdW9Uf4~sT3tPGc6V*r9vOafUSCT(Qoa^M7Uqf>IYfLw-uAbOL| zevhqe4ySkoQ?fs7PDsgN{;)YJB^{*h!{$I3!()FA*9Nzg9NrI`9N_A+K5RCCDNqM% z6i>-v`mjDl2BLjARC4Bihl~_%kcmzEb9g5Q%f~WKoxD+Ajw!lh@rc>rJ+KMvxlp* zx2wO8vz~L1kK5#L3ei5MMg|IQF0Nq;riR7}K#N=*eHDyNf#!I71}GRC7(p0D76uBA jevt}B=0*x2tqMk_AclgGA<&5+aYF+IAGghoit%OuC1R#* delta 527 zcmbQcf$_n5#tGq*Wf{dL<{D*K>Ux#t=o%Rq87mkWTA7$z8CxhRBo(D5=jRq==A@=5 zq*fFZ6{}h)!~};r1-Ux9C}id-D7l6D_$U}5>DANIQ&LDtECFiZQbLx17;0j+nTOF@ zmQioAhg>S-+{x?YwCh=N+&(PY$j}=u!NvdtrBG$Z4jC!jAj4XKS{l43m&nH|ZuA$*{IE&Q(<}St1@E&A`?EHPdjpNxBA6L3v_D5- zcjx3!@}aWU4qz9a Date: Thu, 7 Dec 2023 00:04:13 -0800 Subject: [PATCH 3/3] If ANY and no CR after LF, return EOL instead of CR --- sources/EXTERNALFORMAT | 38 ++++++++++++++++++++++-------------- sources/EXTERNALFORMAT.LCOM | Bin 10895 -> 10951 bytes sources/FASLOAD.LCOM | Bin 33846 -> 33847 bytes sources/IOCHAR.LCOM | Bin 24080 -> 24082 bytes sources/LLREAD.LCOM | Bin 22557 -> 22558 bytes 5 files changed, 23 insertions(+), 15 deletions(-) diff --git a/sources/EXTERNALFORMAT b/sources/EXTERNALFORMAT index fa7f51998..4815f6cc5 100644 --- a/sources/EXTERNALFORMAT +++ b/sources/EXTERNALFORMAT @@ -1,12 +1,13 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "23-Oct-2023 17:07:12" {WMEDLEY}EXTERNALFORMAT.;79 37416 +(FILECREATED " 6-Dec-2023 23:57:52" {WMEDLEY}EXTERNALFORMAT.;82 37884 :EDIT-BY rmk :CHANGES-TO (MACROS \CHECKEOLC) + (FNS \CHECKEOLC.CRLF) - :PREVIOUS-DATE "17-Oct-2023 15:55:24" {WMEDLEY}EXTERNALFORMAT.;78) + :PREVIOUS-DATE "23-Oct-2023 17:07:12" {WMEDLEY}EXTERNALFORMAT.;79) (PRETTYCOMPRINT EXTERNALFORMATCOMS) @@ -519,7 +520,8 @@ FSTRING]) (\CHECKEOLC.CRLF - [LAMBDA (STREAM PEEKBINFLG COUNTP) (* ; "Edited 17-Oct-2023 11:56 by rmk") + [LAMBDA (STREAM PEEKBINFLG COUNTP EOLC) (* ; "Edited 6-Dec-2023 23:39 by rmk") + (* ; "Edited 17-Oct-2023 11:56 by rmk") (* ; "Edited 6-Aug-2021 23:30 by rmk:") (* ;; "This is called only when a CR has been read and EOLC is either ANY or CRLF. This returns EOL if the next code is an LF") @@ -555,7 +557,10 @@ (* ;; "Got the CRLF, it's an EOL") (CHARCODE EOL)) - (T (CHARCODE CR] + (T (SELECTC EOLC + ((LIST ANY.EOLC 'ANY) + (CHARCODE EOL)) + (CHARCODE CR] ((EQ (CHARCODE LF) (\PEEKCCODE STREAM T 'NOEOLC)) @@ -568,7 +573,10 @@ (ADD *BYTECOUNTER* NUMLFBYTES)) ELSE (\INCCODE STREAM)) (CHARCODE EOL)) - (T (CHARCODE CR] + (T (SELECTC EOLC + ((LIST ANY.EOLC 'ANY) + (CHARCODE EOL)) + (CHARCODE CR] CH]) ) (DECLARE%: DOEVAL@COMPILE DONTCOPY @@ -584,7 +592,7 @@ ((LIST CR.EOLC 'CR) (CHARCODE EOL)) ((LIST ANY.EOLC CRLF.EOLC 'CRLF 'ANY) - (\CHECKEOLC.CRLF STRM PEEKBINFLG COUNTP)) + (\CHECKEOLC.CRLF STRM PEEKBINFLG COUNTP EOLC)) (CHARCODE CR))) CH))) ) @@ -712,13 +720,13 @@ (\CREATE.THROUGH.EXTERNALFORMAT) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (6507 13142 (\EXTERNALFORMAT 6517 . 10295) (MAKE-EXTERNALFORMAT 10297 . 12669) ( -\EXTERNALFORMAT.DEFPRINT 12671 . 13140)) (13143 16184 (\INSTALL.EXTERNALFORMAT 13153 . 14602) ( -\REMOVE.EXTERNALFORMAT 14604 . 15435) (FIND-FORMAT 15437 . 16182)) (16185 16597 (SYSTEM-EXTERNALFORMAT - 16195 . 16595)) (16946 31840 (\OUTCHAR 16956 . 18173) (\INCCODE 18175 . 19328) (\BACKCCODE 19330 . -20899) (\BACKCCODE.EOLC 20901 . 23091) (\PEEKCCODE 23093 . 23418) (\PEEKCCODE.EOLC 23420 . 23799) ( -\INCCODE.EOLC 23801 . 25600) (\FORMATBYTESTREAM 25602 . 27737) (\FORMATBYTESTRING 27739 . 29198) ( -\CHECKEOLC.CRLF 29200 . 31838)) (33117 35353 (\NULLDEVICE 33127 . 35029) (\NULL.OPENFILE 35031 . 35351 -)) (35493 37320 (\CREATE.THROUGH.EXTERNALFORMAT 35503 . 36289) (\THROUGHIN 36291 . 36711) ( -\THROUGHBACKCCODE 36713 . 36980) (\THROUGHOUTCHARFN 36982 . 37318))))) + (FILEMAP (NIL (6547 13182 (\EXTERNALFORMAT 6557 . 10335) (MAKE-EXTERNALFORMAT 10337 . 12709) ( +\EXTERNALFORMAT.DEFPRINT 12711 . 13180)) (13183 16224 (\INSTALL.EXTERNALFORMAT 13193 . 14642) ( +\REMOVE.EXTERNALFORMAT 14644 . 15475) (FIND-FORMAT 15477 . 16222)) (16225 16637 (SYSTEM-EXTERNALFORMAT + 16235 . 16635)) (16986 32303 (\OUTCHAR 16996 . 18213) (\INCCODE 18215 . 19368) (\BACKCCODE 19370 . +20939) (\BACKCCODE.EOLC 20941 . 23131) (\PEEKCCODE 23133 . 23458) (\PEEKCCODE.EOLC 23460 . 23839) ( +\INCCODE.EOLC 23841 . 25640) (\FORMATBYTESTREAM 25642 . 27777) (\FORMATBYTESTRING 27779 . 29238) ( +\CHECKEOLC.CRLF 29240 . 32301)) (33585 35821 (\NULLDEVICE 33595 . 35497) (\NULL.OPENFILE 35499 . 35819 +)) (35961 37788 (\CREATE.THROUGH.EXTERNALFORMAT 35971 . 36757) (\THROUGHIN 36759 . 37179) ( +\THROUGHBACKCCODE 37181 . 37448) (\THROUGHOUTCHARFN 37450 . 37786))))) STOP diff --git a/sources/EXTERNALFORMAT.LCOM b/sources/EXTERNALFORMAT.LCOM index eb91cc889443e14ba4e0ca9bff83f087bcf8f9ac..8d78d3c8dea8f7953ea916e0a3e15de9c9f6c250 100644 GIT binary patch delta 684 zcmZutJ#W)c6t$B!ElvV9MJQxImjF^SB(>jr{)kc4IF18JjhzoCs3H<7Nkv;cc0gia zVK3EVV(d@`mXL@6F=Rx75hMmSc2EX>0Cs{z74fF4bI!Zx+;i0V*m-g95-9n~Zaek#&J6{QQ zK?dQx+drJgm((Dg9{2%A9ri{v$MtA)@?Me<6&irS5D8J}Z{Ay5UuKvkEAf_hbB!QIokzwQTFil$F_k zcPmNL(M&CgWh?yrF=%D=VlgN5 zSX0al&!>J$X-p8?J*o1~*jf21zr-HOL=w5=$u*f<&=FxDWnaR?fF@wDHB2xQ6@Ml_ z$#E0*`_lIl%KcPSe)pMs%N{FN94`umel3*Zfn$G}8ri{C{2^E$t&Cqqq13+=gz0!V z8-%I&)1JQXzm7^9nGyN3(;k0w25)6KjY5H+X5mLeD>#XZE(-w{jkZ=;S`Tx zO4f(vDd`MA@L|gS9NrDOll23o*k|o`$Vf@ynd~2^C|kgwVQ6lq5a#L};vb|N5E|^E U>lzW_>gS?hXllHlzW_ Q>gS?hXlk^%FL0$107x`DQ~&?~ diff --git a/sources/IOCHAR.LCOM b/sources/IOCHAR.LCOM index eb2a6144bba1961dd6a8ae558a44b1a8faf81c6c..15b9981d722ebcd64b35c4cd0372c45dbb56c247 100644 GIT binary patch delta 358 zcmbQRhjG###tGpf3TC=4smZ!V21dpTM#fgAmR6?b6SIv(6ikuC4XjKotPIR2Zj{zR z7T43$Q&LDtEJ;mKP(l_r0;@MP+W6zM8RN^%Z_H0JGU`v>W~s@@I{AU6txC}T9Ig$% zIlLb>x%q2tWpg~mBbbu)VR=eA0}yKWo_@}5o<6PtAwdcjCgv!7b4x=o-`U^ARnOJm$63ML6etql>gw$b z5>qfUHrOm7mqgNqrPK*fyA;bMjs3QqnZ Y9txHQMi5C0OH-JnxrNE*dfSN#0Ggp?z5oCK delta 356 zcmbQVhj9WBg^L&&>-r~`=o%Rq87ml?TNxT#8JbSaHWD#1LKQc+GBBRFQCbICTu)C= zNg*Y%BsE1r30WLu4iFh^{PEe0@%iRA<|i2$btiAL)MR9y{J_#yC18IJ*9Pw#-Vd8x z{I#~SIiBJXOv(DNJSCk02tG{NpToOBce10E6x+=Gjv1NUlasBy8UIaQZ#A1SX|lKV zL??5F7*9WEH%}kefRG>s3lmcmzPW`ZnD6ZG;;QHB@8hgsZUPhuaCP-|28k({8Ch(W zv*BcnGE;DKaSc%(8(LhI?c>ouoP9{1q zIw;V%xOA4$C+QQY1w`TICg*(L{e9=$#{uy)AnvMuNJcZwizrRe3{X_sz6{rGGk)Oy zeVR(MsWg@Bj-t^;KNgEc05`6i7(9{1hgl#_8(v~RNECF5Y!dJK3%Sz?Ygwy5bUatL z+z$JUof|EyHzd~h)rqWO&0|Z)_oR+?P3g_ekG-3?Z5a)$xh$iGFDIO3l;=&})I5V6 z*4C|&@W;0-BR&VVr@;W$oYpJWPeZCXu$hO^T9(mkvWHwM9$>9QW8UBIjO*;EMwz4^#;t@>A{;)YAC5QRL=BSi(kh%|>17Qr0 z{W)A4+){FQKWuV$*Bq^_2!le&i;PRjv+pt!66E!X66bp!M={c9>F0&o__8Mrlyt(jy^vA z&QQJykdLCk#MBT~fsvU)u!n!BkBeW3g0TtEI44JEZ)azJ7gq%%OGAYiXAf6rZ&!aG xXFca2AGgU8im`GA3T`g0VG5>(#tJ}dTpfKCj7@>2czXsY7#kREo~+ny1_1U-gpU9K