From 68f1e7efe1f276733449722065e6abaa29425392 Mon Sep 17 00:00:00 2001 From: rmkaplan <69548581+rmkaplan@users.noreply.github.com> Date: Sat, 4 Dec 2021 10:11:05 -0800 Subject: [PATCH] EDITINTERFACE: Oops, didn't trim all the white space (#602) So it was misparsing some of the old dates --- sources/EDITINTERFACE | 40 ++++++++++++++++++------------------- sources/EDITINTERFACE.LCOM | Bin 16100 -> 16099 bytes 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/sources/EDITINTERFACE b/sources/EDITINTERFACE index 0245d52c..251561fa 100644 --- a/sources/EDITINTERFACE +++ b/sources/EDITINTERFACE @@ -1,13 +1,12 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED " 3-Dec-2021 15:45:20"  -{DSK}kaplan>Local>medley3.5>my-medley>sources>EDITINTERFACE.;19 45997 +(FILECREATED " 4-Dec-2021 09:08:18"  +{DSK}kaplan>Local>medley3.5>my-medley>sources>EDITINTERFACE.;20 46022 - changes to%: (VARS EDITINTERFACECOMS) - (FNS FIXEDITDATE EDITDATE? EDITDATE) + changes to%: (FNS EDITDATE?) - previous date%: " 2-Dec-2021 23:20:07" -{DSK}kaplan>Local>medley3.5>my-medley>sources>EDITINTERFACE.;7) + previous date%: " 3-Dec-2021 15:45:20" +{DSK}kaplan>Local>medley3.5>my-medley>sources>EDITINTERFACE.;19) (* ; " @@ -759,7 +758,7 @@ Copyright (c) 1986-1988, 1990-1991 by Venue & Xerox Corporation. (RETURN EXPR)))]) (EDITDATE? - [LAMBDA (COMMENT RESTOK) (* ; "Edited 3-Dec-2021 14:35 by rmk") + [LAMBDA (COMMENT RESTOK) (* ; "Edited 4-Dec-2021 09:07 by rmk") (* ;;; "This determines whether this is a dated or initialed comment that is potentially reusable in the current context. Unless RESTOK, this only recognizes modern-format configurations of the form %"Edited by %", and returns a parsed pair (DATE INITIALS).") @@ -773,18 +772,19 @@ Copyright (c) 1986-1988, 1990-1991 by Venue & Xerox Corporation. (* ;;; "There is no harm in not recognizing prehistoric formats, new dates will always be added on.") (LET ((TAIL COMMENT) - STRING POS DATE I RESTPOS) + STRING BYPOS DATE I RESTPOS) (CL:WHEN [AND (EQ COMMENTFLG (CAR (LISTP TAIL))) (MEMB [CAR (LISTP (SETQ TAIL (CDR TAIL] '(; ;; ;;;)) (STRINGP (SETQ STRING (CAR (SETQ TAIL (CDR TAIL] (SETQ STRING (CL:STRING-TRIM `(#\Space) STRING)) - (CL:UNLESS [AND [STREQUAL "Edited " (SUBSTRING STRING 1 8 (CONSTANT (CONCAT] - (SETQ POS (STRPOS " by " STRING 9)) - [IDATE (SETQ DATE (SUBSTRING STRING 9 (SUB1 POS] - (SETQ I (SUBSTRING STRING (IPLUS POS 4) - (OR (SETQ RESTPOS (STRPOS " " STRING (IPLUS POS 4))) + (CL:UNLESS [AND [STREQUAL "Edited " (SUBSTRING STRING 1 7 (CONSTANT (CONCAT] + (SETQ BYPOS (STRPOS " by " STRING 8)) + [IDATE (SETQ DATE (CL:STRING-TRIM `(#\Space) + (SUBSTRING STRING 8 (SUB1 BYPOS] + (SETQ I (SUBSTRING STRING (IPLUS BYPOS 4) + (OR (SETQ RESTPOS (STRPOS " " STRING (IPLUS BYPOS 4))) -1] (* ;; "Could be %": abc%" to be upgraded with a date") @@ -901,11 +901,11 @@ Copyright (c) 1986-1988, 1990-1991 by Venue & Xerox Corporation. ) (PUTPROPS EDITINTERFACE COPYRIGHT ("Venue & Xerox Corporation" 1986 1987 1988 1990 1991)) (DECLARE%: DONTCOPY - (FILEMAP (NIL (4145 10444 (ED 4145 . 10444)) (10446 14422 (INSTALL-PROTOTYPE-DEFN 10446 . 14422)) ( -14423 31206 (EDITDEF.FNS 14433 . 15769) (EDITF 15771 . 16651) (EDITFB 16653 . 17501) (EDITFNS 17503 . -18823) (EDITLOADFNS? 18825 . 22625) (EDITMODE 22627 . 24637) (EDITP 24639 . 25150) (EDITV 25152 . -25791) (DC 25793 . 26474) (DF 26476 . 27518) (DP 27520 . 28604) (DV 28606 . 29178) (EDITPROP 29180 . -29399) (EF 29401 . 29730) (EP 29732 . 29915) (EV 29917 . 30096) (EDITE 30098 . 30976) (EDITL 30978 . -31204)) (31556 45142 (NEW/EDITDATE 31566 . 31788) (FIXEDITDATE 31790 . 39177) (EDITDATE? 39179 . 41888 -) (EDITDATE 41890 . 43145) (SETINITIALS 43147 . 45140))))) + (FILEMAP (NIL (4080 10379 (ED 4080 . 10379)) (10381 14357 (INSTALL-PROTOTYPE-DEFN 10381 . 14357)) ( +14358 31141 (EDITDEF.FNS 14368 . 15704) (EDITF 15706 . 16586) (EDITFB 16588 . 17436) (EDITFNS 17438 . +18758) (EDITLOADFNS? 18760 . 22560) (EDITMODE 22562 . 24572) (EDITP 24574 . 25085) (EDITV 25087 . +25726) (DC 25728 . 26409) (DF 26411 . 27453) (DP 27455 . 28539) (DV 28541 . 29113) (EDITPROP 29115 . +29334) (EF 29336 . 29665) (EP 29667 . 29850) (EV 29852 . 30031) (EDITE 30033 . 30911) (EDITL 30913 . +31139)) (31491 45167 (NEW/EDITDATE 31501 . 31723) (FIXEDITDATE 31725 . 39112) (EDITDATE? 39114 . 41913 +) (EDITDATE 41915 . 43170) (SETINITIALS 43172 . 45165))))) STOP diff --git a/sources/EDITINTERFACE.LCOM b/sources/EDITINTERFACE.LCOM index 4171bed23507bf2e91829abf7abe7f1e372435b1..03cccc9c8f43ea9feb326ad1f6e6240346761786 100644 GIT binary patch delta 557 zcmaD-`?z*Ogs_ROOKP&Nk%5t+f`O%#frXWk(ZuX#4jLb#`29tY@rUPli$sa9+H(MFYvoJYDPL4FUuV-XoV`N}*5Da7u^I&HDu!Xs4 zBg0D%rU+)nd2 zO%5==SN2Vi5EBE}WPXe8dJ_YM;83UFkRVS#cLgIO6J(yDp@LtChqH%ckh8yws{+tB z3VtA7u!5n5C6Yoza|;Ea2?72<2{U993{8PNsD!bRf+r~46by~b6r6pmAXakf0&VsM siWyGkw~Uc7Hv&eAl7gX$34}H@P|#402`)%XPSu=TX(_XLnx!8r06@Wn;s5{u delta 543 zcmaD{`=oY4gs`!$OKP&Nk%5t+f}yFEiK&&5!NlxvNkdCb1tkR|grt$Nm9d$XvEjtq zvQ|jKdU|?F3Mq*tsVP{Mn<;5>X}Ed%xH<>9I)=EqOg_pOZ=_&iYH4Y%kerd2m!4Xz zP?E1|rJxb!7!<6)Yk=f9|aB_mtbRccC`InIq%Va%s`+A07 zY>W&{4uXNKVIItkAGR3DlN%%!waLsghtn(jCYTouG;H!W^X7VE1BKvFr{ItvPd|4BBSRBp zo`Io)UxABY#MU}$cMq|ngJLIG$(fIm>e6xjqr6Ce*NVPvG> o=>m)Z1w%tKgx<;AmO*@GM!;}XQZO_&0nw8yEoC-OvGivJ09vVpH~;_u