1
0
mirror of synced 2026-05-04 07:09:35 +00:00

Rmk47: TEDIT, GITFNS, COREIO (#791)

* COMPARETEXT: Inverted nodes stay inverted when scrolled

* COMPARESOURCES: Remove unused stub for browsing in TEDIT window

* COMPAREDIRECTORIES: Upgrade to new LISPFILETYPE, add CD-COMPARE-FILES

CD-COMPARE-FILES interface to compare 2 given files, not whole directory

* TEDIT:  Show only file name, not stream address

* COREIO: preserve STREAMPROPS on stream reopen

* GITFNS:  Various project and git-interface cleanups
This commit is contained in:
rmkaplan
2022-06-13 15:20:41 -07:00
committed by GitHub
parent f262c98f53
commit 3c7fb08932
13 changed files with 550 additions and 470 deletions

View File

@@ -1,11 +1,12 @@
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
(FILECREATED "26-Jan-2022 10:18:51" {DSK}<Users>kaplan>Local>medley3.5>my-medley>sources>COREIO.;15 56955
(FILECREATED " 5-Jun-2022 00:14:07" 
{DSK}<users>kaplan>local>medley3.5>working-medley>sources>COREIO.;17 57355
:CHANGES-TO (VARS COREIOCOMS)
:CHANGES-TO (FNS \CORE.OPENFILE)
:PREVIOUS-DATE "18-Jan-2022 11:22:04"
{DSK}<Users>kaplan>Local>medley3.5>my-medley>sources>COREIO.;14)
:PREVIOUS-DATE " 4-Jun-2022 16:30:20"
{DSK}<users>kaplan>local>medley3.5>working-medley>sources>COREIO.;16)
(* ; "
@@ -411,7 +412,8 @@ Copyright (c) 1981-1988, 1990, 1993, 1999, 2018 by Venue & Xerox Corporation.
(LIST NAME])
(\CORE.OPENFILE
[LAMBDA (NAME ACCESS RECOG PARAMETERS FDEV OLDSTREAM) (* ; "Edited 13-Jan-88 19:23 by bvm")
[LAMBDA (NAME ACCESS RECOG PARAMETERS FDEV OLDSTREAM) (* ; "Edited 5-Jun-2022 00:14 by rmk")
(* ; "Edited 13-Jan-88 19:23 by bvm")
(PROG (STREAM INFOBLK EOL)
(AND OLDSTREAM (RETURN OLDSTREAM))
@@ -420,26 +422,26 @@ Copyright (c) 1981-1988, 1990, 1993, 1999, 2018 by Venue & Xerox Corporation.
(COND
[(type? STREAM NAME)
(COND
((NULL (fetch ACCESS of NAME))
[(NULL (fetch ACCESS of NAME))
(* ;; "A closed file to be re-opened by its stream")
(SETQ INFOBLK (fetch INFOBLK of NAME))
[if (EQ ACCESS 'OUTPUT)
then (* ;
 "Open for OUTPUT implies no content, so smash any existing pages")
(replace IOEOFFSET of INFOBLK with 0)
(replace IOEPAGE of INFOBLK with 0)
(replace IOFILEPAGES of INFOBLK
with (LIST (create CORE.PAGEENTRY
PAGENUMBER _ 0]
(SETQ STREAM (create CORESTREAM
smashing NAME DEVICE _ FDEV INFOBLK _ INFOBLK FULLFILENAME _
(fetch IOFILEFULLNAME of INFOBLK)
EOFFSET _ (fetch IOEOFFSET of INFOBLK)
EPAGE _ (fetch IOEPAGE of INFOBLK)
EOLCONVENTION _ (fetch COREEOLC of INFOBLK)
CBUFMAXSIZE _ BYTESPERPAGE)))
then (* ;
 "Open for OUTPUT implies no content, so smash any existing pages")
(replace IOEOFFSET of INFOBLK with 0)
(replace IOEPAGE of INFOBLK with 0)
(replace IOFILEPAGES of INFOBLK with (LIST (create CORE.PAGEENTRY
PAGENUMBER _ 0]
(SETQ STREAM (create CORESTREAM smashing NAME DEVICE _ FDEV INFOBLK _ INFOBLK
FULLFILENAME _ (fetch IOFILEFULLNAME
of INFOBLK)
EOFFSET _ (fetch IOEOFFSET of INFOBLK)
EPAGE _ (fetch IOEPAGE of INFOBLK)
EOLCONVENTION _ (fetch COREEOLC of INFOBLK)
CBUFMAXSIZE _ BYTESPERPAGE OTHERPROPS _
(fetch OTHERPROPS of NAME]
((\IOMODEP NAME ACCESS T)
(* ;; "hdj - need we ever worry about being passed an already-open stream?")
@@ -451,14 +453,14 @@ Copyright (c) 1981-1988, 1990, 1993, 1999, 2018 by Venue & Xerox Corporation.
((NEQ ACCESS 'INPUT)
(\COREFILE.SETPARAMETERS STREAM PARAMETERS))
((SETQ EOL (ASSOC 'EOL PARAMETERS)) (* ;
 "Set EOL for the input stream, in contradiction of whatever the file might have said.")
 "Set EOL for the input stream, in contradiction of whatever the file might have said.")
(replace EOLCONVENTION of STREAM with (SELECTQ (CADR EOL)
((CR NIL)
((CR NIL)
(* ; "default")
CR.EOLC)
(LF LF.EOLC)
(CRLF CRLF.EOLC)
(\ILLEGAL.ARG EOL]
CR.EOLC)
(LF LF.EOLC)
(CRLF CRLF.EOLC)
(\ILLEGAL.ARG EOL]
(T
(* ;; "Head for not-found error in \OPENFILE")
@@ -870,7 +872,8 @@ Copyright (c) 1981-1988, 1990, 1993, 1999, 2018 by Venue & Xerox Corporation.
(RETURN FDEV])
(\NODIRCORE.OPENFILE
[LAMBDA (NAME ACCESS RECOG PARAMETERS FDEV) (* lmm "24-May-85 11:59")
[LAMBDA (NAME ACCESS RECOG PARAMETERS FDEV) (* ; "Edited 4-Jun-2022 16:27 by rmk")
(* lmm "24-May-85 11:59")
(* ; "Open function for NODIRCORE")
(COND
[(type? STREAM NAME)
@@ -882,13 +885,13 @@ Copyright (c) 1981-1988, 1990, 1993, 1999, 2018 by Venue & Xerox Corporation.
(* ;; "We'll return the stream that was given us, but we make sure that all its fields are back to their initial settings")
(create CORESTREAM smashing NAME DEVICE _ FDEV INFOBLK _ INFOBLK
FULLFILENAME _ (fetch IOFILEFULLNAME
of INFOBLK)
EOFFSET _ (fetch IOEOFFSET of INFOBLK)
EPAGE _ (fetch IOEPAGE of INFOBLK)
EOLCONVENTION _ (fetch COREEOLC of INFOBLK)
CBUFMAXSIZE _ BYTESPERPAGE]
(create CORESTREAM smashing NAME DEVICE _ FDEV INFOBLK _ INFOBLK FULLFILENAME _
(fetch IOFILEFULLNAME of INFOBLK)
EOFFSET _ (fetch IOEOFFSET of INFOBLK)
EPAGE _ (fetch IOEPAGE of INFOBLK)
EOLCONVENTION _ (fetch COREEOLC of INFOBLK)
CBUFMAXSIZE _ BYTESPERPAGE OTHERPROPS _
(fetch OTHERPROPS of NAME]
(T (SELECTQ RECOG
((NEW OLD/NEW)
(SETQ NAME (create CORESTREAM
@@ -997,16 +1000,16 @@ Copyright (c) 1981-1988, 1990, 1993, 1999, 2018 by Venue & Xerox Corporation.
(PUTPROPS COREIO COPYRIGHT ("Venue & Xerox Corporation" 1981 1982 1983 1984 1985 1986 1987 1988 1990
1993 1999 2018))
(DECLARE%: DONTCOPY
(FILEMAP (NIL (1703 46161 (\CORE.CLOSEFILE 1713 . 2486) (\CORE.DELETEFILE 2488 . 4474) (
\CORE.DIRECTORYNAMEP 4476 . 6157) (\CORE.FINDPAGE 6159 . 9388) (\CORE.GENERATEFILES 9390 . 11977) (
\CORE.NEXTFILEFN 11979 . 12478) (\CORE.FILEINFOFN 12480 . 12709) (\CORE.GETFILEHANDLE 12711 . 14865) (
\CORE.GETFILEINFO 14867 . 15830) (\CORE.GETFILEINFO.FROM.INFOBLOCK 15832 . 17369) (\CORE.GETFILENAME
17371 . 19660) (\CORE.GETINFOBLOCK 19662 . 22285) (\CORE.NAMESCAN 22287 . 23834) (\CORE.NAMESEGMENT
23836 . 24273) (\CORE.OPENFILE 24275 . 27394) (\COREFILE.SETPARAMETERS 27396 . 29577) (
\CORE.PACKFILENAME 29579 . 29974) (\CORE.RELEASEPAGES 29976 . 30577) (\CORE.SETFILEPTR 30579 . 31678)
(\CORE.UPDATEOF 31680 . 33309) (\CORE.BACKFILEPTR 33311 . 35519) (\CORE.SETEOFPTR 35521 . 37390) (
\CORE.SETACCESSTIME 37392 . 38017) (\CORE.SETFILEINFO 38019 . 40321) (\CORE.GETNEXTBUFFER 40323 .
44279) (\CORE.UNPACKFILENAME 44281 . 46159)) (46162 49795 (COREDEVICE 46172 . 46343) (
\CREATECOREDEVICE 46345 . 49793)) (49796 52097 (\NODIRCOREFDEV 49806 . 50403) (\NODIRCORE.OPENFILE
50405 . 52095)))))
(FILEMAP (NIL (1717 46448 (\CORE.CLOSEFILE 1727 . 2500) (\CORE.DELETEFILE 2502 . 4488) (
\CORE.DIRECTORYNAMEP 4490 . 6171) (\CORE.FINDPAGE 6173 . 9402) (\CORE.GENERATEFILES 9404 . 11991) (
\CORE.NEXTFILEFN 11993 . 12492) (\CORE.FILEINFOFN 12494 . 12723) (\CORE.GETFILEHANDLE 12725 . 14879) (
\CORE.GETFILEINFO 14881 . 15844) (\CORE.GETFILEINFO.FROM.INFOBLOCK 15846 . 17383) (\CORE.GETFILENAME
17385 . 19674) (\CORE.GETINFOBLOCK 19676 . 22299) (\CORE.NAMESCAN 22301 . 23848) (\CORE.NAMESEGMENT
23850 . 24287) (\CORE.OPENFILE 24289 . 27681) (\COREFILE.SETPARAMETERS 27683 . 29864) (
\CORE.PACKFILENAME 29866 . 30261) (\CORE.RELEASEPAGES 30263 . 30864) (\CORE.SETFILEPTR 30866 . 31965)
(\CORE.UPDATEOF 31967 . 33596) (\CORE.BACKFILEPTR 33598 . 35806) (\CORE.SETEOFPTR 35808 . 37677) (
\CORE.SETACCESSTIME 37679 . 38304) (\CORE.SETFILEINFO 38306 . 40608) (\CORE.GETNEXTBUFFER 40610 .
44566) (\CORE.UNPACKFILENAME 44568 . 46446)) (46449 50082 (COREDEVICE 46459 . 46630) (
\CREATECOREDEVICE 46632 . 50080)) (50083 52497 (\NODIRCOREFDEV 50093 . 50690) (\NODIRCORE.OPENFILE
50692 . 52495)))))
STOP