From 6e845d747f8c61541c844f36d8a2a90b3879325f Mon Sep 17 00:00:00 2001 From: rmkaplan <69548581+rmkaplan@users.noreply.github.com> Date: Tue, 14 Nov 2023 07:11:58 -0800 Subject: [PATCH] ADIR fix UNPACKFILENAME.STRING address #1416 (#1421) The early . was seen as starting an extension, the ! then was seen as starting a version. When the other marks caused those hypotheses to be revised, the extension's end wasn't being revised --- sources/ADIR | 32 +++++++++++++++++--------------- sources/ADIR.LCOM | Bin 19540 -> 19572 bytes 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/sources/ADIR b/sources/ADIR index 444d2d8d..a754f300 100644 --- a/sources/ADIR +++ b/sources/ADIR @@ -1,12 +1,12 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "14-Sep-2023 23:20:17" {WMEDLEY}ADIR.;30 67297 +(FILECREATED "13-Nov-2023 20:28:57" {WMEDLEY}ADIR.;31 67473 :EDIT-BY rmk - :CHANGES-TO (FNS \COPYSYS) + :CHANGES-TO (FNS UNPACKFILENAME.STRING) - :PREVIOUS-DATE "14-Sep-2023 22:56:19" {WMEDLEY}ADIR.;29) + :PREVIOUS-DATE "14-Sep-2023 23:20:17" {WMEDLEY}ADIR.;30) (PRETTYCOMPRINT ADIRCOMS) @@ -317,7 +317,8 @@ (DEFINEQ (UNPACKFILENAME.STRING - [LAMBDA (FILE ONEFIELDFLG DIRFLG OSTYPE PACKFLG CLFLG) (* ; "Edited 28-Apr-2022 11:40 by rmk") + [LAMBDA (FILE ONEFIELDFLG DIRFLG OSTYPE PACKFLG CLFLG) (* ; "Edited 13-Nov-2023 20:28 by rmk") + (* ; "Edited 28-Apr-2022 11:40 by rmk") (* ; "Edited 24-Apr-2022 14:11 by rmk") (* ;; "") @@ -514,7 +515,8 @@ (CL:UNLESS (EQ NAMESTART $$OFFSET) (* ;  "Allow . in first NAME position : .git") (SETQ NAMEEND (SUB1 $$OFFSET)) - (SETQ EXTENSIONSTART $$OFFSET))) + (SETQ EXTENSIONSTART $$OFFSET) + (SETQ EXTENSIONEND NIL))) (; (CL:WHEN VERSIONSTART (* ; "What about x;1;2") (* ;; "This gives old behavior is NAME=x, VERSION=1;2") @@ -1250,14 +1252,14 @@ (ADDTOVAR LAMA PACKFILENAME.STRING PACKFILENAME) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (3106 15763 (DELFILE 3116 . 3277) (FULLNAME 3279 . 3646) (INFILE 3648 . 3907) (INFILEP -3909 . 4044) (IOFILE 4046 . 4297) (OPENFILE 4299 . 4602) (OPENSTREAM 4604 . 8944) (OUTFILE 8946 . 9208 -) (OUTFILEP 9210 . 9346) (RENAMEFILE 9348 . 9654) (SIMPLE.FINDFILE 9656 . 10066) (VMEMSIZE 10068 . -10235) (\COPYSYS 10237 . 14482) (\FLUSHVM 14484 . 15556) (\LOGOUT0 15558 . 15761)) (16221 38126 ( -UNPACKFILENAME.STRING 16231 . 35505) (\UPF.DIRECTORY 35507 . 38124)) (39654 42326 (UNPACKFILENAME -39664 . 39850) (LASTCHPOS 39852 . 40546) (FILENAMEFIELD 40548 . 41033) (FILENAMEFIELD.STRING 41035 . -41614) (PACKFILENAME 41616 . 41959) (PACKFILENAME.STRING 41961 . 42324)) (56796 57709 ( -FILEDIRCASEARRAY 56806 . 57707)) (57876 65056 (LOGOUT 57886 . 58803) (MAKESYS 58805 . 60434) (SYSOUT -60436 . 61988) (SAVEVM 61990 . 62790) (HERALD 62792 . 62952) (INTERPRET.REM.CM 62954 . 64679) ( -\USEREVENT 64681 . 65054)) (65238 66965 (USERNAME 65248 . 66204) (SETUSERNAME 66206 . 66963))))) + (FILEMAP (NIL (3119 15776 (DELFILE 3129 . 3290) (FULLNAME 3292 . 3659) (INFILE 3661 . 3920) (INFILEP +3922 . 4057) (IOFILE 4059 . 4310) (OPENFILE 4312 . 4615) (OPENSTREAM 4617 . 8957) (OUTFILE 8959 . 9221 +) (OUTFILEP 9223 . 9359) (RENAMEFILE 9361 . 9667) (SIMPLE.FINDFILE 9669 . 10079) (VMEMSIZE 10081 . +10248) (\COPYSYS 10250 . 14495) (\FLUSHVM 14497 . 15569) (\LOGOUT0 15571 . 15774)) (16234 38302 ( +UNPACKFILENAME.STRING 16244 . 35681) (\UPF.DIRECTORY 35683 . 38300)) (39830 42502 (UNPACKFILENAME +39840 . 40026) (LASTCHPOS 40028 . 40722) (FILENAMEFIELD 40724 . 41209) (FILENAMEFIELD.STRING 41211 . +41790) (PACKFILENAME 41792 . 42135) (PACKFILENAME.STRING 42137 . 42500)) (56972 57885 ( +FILEDIRCASEARRAY 56982 . 57883)) (58052 65232 (LOGOUT 58062 . 58979) (MAKESYS 58981 . 60610) (SYSOUT +60612 . 62164) (SAVEVM 62166 . 62966) (HERALD 62968 . 63128) (INTERPRET.REM.CM 63130 . 64855) ( +\USEREVENT 64857 . 65230)) (65414 67141 (USERNAME 65424 . 66380) (SETUSERNAME 66382 . 67139))))) STOP diff --git a/sources/ADIR.LCOM b/sources/ADIR.LCOM index f77f1d8a7428ac1dcb3ca8d50b29e87e811287b0..b183630851a9fc39a1cbd9ab5284f689e252d6b5 100644 GIT binary patch delta 929 zcmZva-%Aux6vubK3^rIq*Gw1WG^Dwr+uS>Mek~D=yR*&c?#wnnWRqYrSMpaH6}|Xi zVb7sXly9L=Jrp!85(Ki)Q}pCRk^L7M_1;wrW|v;>IrnqU_j?bV`*oA~waKhi+WBE~ z>CrIeFb|l^VmT|U&kb=X4J?Y35Xo{l%M&&Zx9?9+E#190yD(jashP>eJJS#PvcY7b zYhrd0*n(FqLR6W_WLT(9KBV3MbClV1e4tpsZQQUtXE;y2f_4UUP-jGMH_1m|ShQ?J0BXZE1eL@>us1b=?{~+z6T9*3b)UK;QcuTczRC$A$BwNBH|_ zb>Yh4cF4RAnJ+ZIeDHpvZn3noYxUFfgO%Lrv=V;OKUbge`+e32zc*xF1zYV^CL6SN ztX>?jdUq1m+2>Zz{QeW#+N&RIgt0As{)Z2B-Dj!pLKs^M-gGQ76G1B3$HZ%Da;{~C zKxs^MtrA_6Ou)?Ps_oF6$8fXkxg)Bh6^u%m5{w!Nk|nX3h(Z&Q5NReHA0^kzfCPma zdF4VTZ`fMSwd@;!h(v`=jK^|RN|ij48i|7CV7dEep1`=l3-f0a{n|utE9?V` zuP=?QiDMvOI^otE6GS8u5Gf_%lq3l~aDTP_U}dQ>zgVw9{b^(M@kk10Gj^%!R$Z81 z1|e6@=OHXkCX)ix=ALlD|4emZtmkUZ${QKSNP9+>FYy?Y-JqyMS6LOoxl@1k23|`X;JyqKdx)^)i>!O>@gWgxD?^9u6zw+Glqb<`OKiUY; z5nJgS(0<;kE#5fV4$#K{edGQ0!=1Y=Tj2L!>`{I;?bvSIj`}hGV(Xzl>I**j!vWf2 zU;AoEVM71Q%UA5--KahA&Q2`szu>FG=HW&Vd2cQp_|P(aA&6|S@BPc@9=jGBLDA-1 z>`~X62!-2e&n^HFH4%y#Gwry%CmPI_%HDL^HF8#^#0gg03D#87Nfg{cR4jH7Mc2dR zP6@EAbE9%8m&{s@k@0M&%704b!VV@88kTaUgr#<(6Uw#*e`iIQF&x*ji-1)g%BXlo z@nlp)3dMB6;LoZUa+ZbTsEl-Eumu13!B;pq&9YU098mF--s&?*EDxaEBNo~_e zq{EvMwwH)Il!p&_O9~B-1j~>$W~>ZPN<;}v+w}m8ItIt^%1#k