Skip to content

ron-1: a number of little cleanups in various places #581

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rmkaplan merged 7 commits into from
Nov 27, 2021
Merged

ron-1: a number of little cleanups in various places #581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
98aa154
XCCS: Mark format as unstable
rmkaplan Nov 25, 2021
d479ef2
IOCHAR: Fix DST comment
rmkaplan Nov 25, 2021
824e0f2
COMPARE: better alignment in header printing
rmkaplan Nov 25, 2021
6611f96
COREIO, FASLOAD: FILEDATE and directory dates
rmkaplan Nov 25, 2021
1ff0018
FILESETS: Add DTDECLARE to EXPORTFILES
rmkaplan Nov 25, 2021
c385039
IMAGEIO: Fontchange characters don't change charposition
rmkaplan Nov 25, 2021
8266980
FILEPKG: SHOWDEF uses reader environment, better COMPAREDEFS formatting
rmkaplan Nov 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 17 additions & 11 deletions sources/COMPARE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
(DEFINE-FILE-INFO READTABLE "INTERLISP" PACKAGE "INTERLISP")
(FILECREATED "16-May-90 14:59:25" {DSK}<usr>local>lde>lispcore>sources>COMPARE.;2 12260
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)

changes to%: (VARS COMPARECOMS)
(FILECREATED " 5-Nov-2021 20:53:09" {DSK}<Users>kaplan>Local>medley3.5>my-medley>sources>COMPARE.;2 12484

previous date%: "20-Jan-87 12:44:37" {DSK}<usr>local>lde>lispcore>sources>COMPARE.;1)
changes to%: (FNS COMPAREPRINTN)

previous date%: "16-May-90 14:59:25"
{DSK}<Users>kaplan>Local>medley3.5>my-medley>sources>COMPARE.;1)


(* ; "
Copyright (c) 1987, 1990 by Venue & Xerox Corporation. All rights reserved.
Copyright (c) 1987, 1990 by Venue & Xerox Corporation.
")

(PRETTYCOMPRINT COMPARECOMS)
Expand Down Expand Up @@ -214,7 +216,11 @@ Copyright (c) 1987, 1990 by Venue & Xerox Corporation. All rights reserved.
(TERPRI STREAM])

(COMPAREPRINTN
[LAMBDA (N SPACE FLG STREAM) (* ; "Edited 29-Dec-86 11:56 by jds")
[LAMBDA (N SPACE FLG STREAM) (* ; "Edited 5-Nov-2021 20:53 by rmk:")
(* ; "Edited 29-Dec-86 11:56 by jds")

(* ;; "RMK: Added STREAM to POSITION and LINELENGTH")

[COND
((NEQ N 0)
(COND
Expand All @@ -223,9 +229,9 @@ Copyright (c) 1987, 1990 by Venue & Xerox Corporation. All rights reserved.
(SELECTQ N
(1 (PRIN1 '& STREAM))
(PROGN (COND
((NOT (ILESSP (IPLUS (POSITION)
((NOT (ILESSP (IPLUS (POSITION STREAM)
7)
(LINELENGTH)))
(LINELENGTH NIL STREAM)))
(TERPRI STREAM)))
(PRIN1 '- STREAM)
(PRIN2 N STREAM)
Expand Down Expand Up @@ -299,7 +305,7 @@ Copyright (c) 1987, 1990 by Venue & Xerox Corporation. All rights reserved.
)
(PUTPROPS COMPARE COPYRIGHT ("Venue & Xerox Corporation" 1987 1990))
(DECLARE%: DONTCOPY
(FILEMAP (NIL (823 11885 (COMPARELST 833 . 1095) (COMPARE1 1097 . 2506) (COMPAREPRINT 2508 . 3465) (
COMPAREPRINT1 3467 . 7731) (COMPARELISTS 7733 . 9020) (COMPAREPRINTN 9022 . 9666) (COMPARENCHARS 9668
. 10226) (COMPAREFAIL 10228 . 11355) (COMPAREMAX 11357 . 11594) (COUNTDOWN 11596 . 11883)))))
(FILEMAP (NIL (847 12109 (COMPARELST 857 . 1119) (COMPARE1 1121 . 2530) (COMPAREPRINT 2532 . 3489) (
COMPAREPRINT1 3491 . 7755) (COMPARELISTS 7757 . 9044) (COMPAREPRINTN 9046 . 9890) (COMPARENCHARS 9892
. 10450) (COMPAREFAIL 10452 . 11579) (COMPAREMAX 11581 . 11818) (COUNTDOWN 11820 . 12107)))))
STOP
Binary file modified sources/COMPARE.LCOM
View file
Open in desktop
Binary file not shown.
148 changes: 74 additions & 74 deletions sources/COREIO
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
(DEFINE-FILE-INFO READTABLE "INTERLISP" PACKAGE "INTERLISP")
(FILECREATED " 4-Oct-2018 14:13:06" {DSK}<Users>kaplan>Local>medley3.5>lispcore>sources>COREIO.;4 55097
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)

changes to%: (FNS \CORE.GETFILEINFO)
(FILECREATED "22-Nov-2021 09:25:42" {DSK}<Users>kaplan>Local>medley3.5>my-medley>sources>COREIO.;3 55023

previous date%: "28-Jun-99 16:15:28"
{DSK}<Users>kaplan>Local>medley3.5>lispcore>sources>COREIO.;3)
changes to%: (FNS \CORE.SETFILEINFO)

previous date%: " 4-Oct-2018 14:13:06"
{DSK}<Users>kaplan>Local>medley3.5>my-medley>sources>COREIO.;2)


(* ; "
Copyright (c) 1981, 1982, 1983, 1984, 1985, 1986, 1987, 1988, 1990, 1993, 1999, 2018 by Venue & Xerox Corporation. All rights reserved.
Copyright (c) 1981-1988, 1990, 1993, 1999, 2018 by Venue & Xerox Corporation.
")

(PRETTYCOMPRINT COREIOCOMS)

(RPAQQ COREIOCOMS
(

(* ;;; "Implementation of Core resident `files'")
(* ;;; "Implementation of Core resident `files'")

(FNS \CORE.CLOSEFILE \CORE.DELETEFILE \CORE.DIRECTORYNAMEP \CORE.FINDPAGE \CORE.GENERATEFILES
\CORE.NEXTFILEFN \CORE.FILEINFOFN \CORE.GETFILEHANDLE \CORE.GETFILEINFO
Expand Down Expand Up @@ -611,7 +612,8 @@ Copyright (c) 1981, 1982, 1983, 1984, 1985, 1986, 1987, 1988, 1990, 1993, 1999,
STREAM])

(\CORE.SETFILEINFO
[LAMBDA (STREAM ATTRIBUTE VALUE DEV) (* bvm%: "15-Jan-85 17:40")
[LAMBDA (STREAM ATTRIBUTE VALUE DEV) (* ; "Edited 22-Nov-2021 09:25 by rmk:")
(* bvm%: "15-Jan-85 17:40")
(PROG ((INFOBLOCK (\CORE.GETINFOBLOCK STREAM 'OLD DEV)))
(SELECTQ ATTRIBUTE
(CREATIONDATE (SETQ VALUE (OR (IDATE VALUE)
Expand All @@ -624,10 +626,20 @@ Copyright (c) 1981, 1982, 1983, 1984, 1985, 1986, 1987, 1988, 1990, 1993, 1999,
(replace IOFIBType of INFOBLOCK with VALUE))
(EOL (replace COREEOLC of INFOBLOCK
with (SELECTQ VALUE
(CR CR.EOLC)
(LF LF.EOLC)
(CRLF CRLF.EOLC)
(LISPERROR "ILLEGAL ARG" VALUE))))
(CR CR.EOLC)
(LF LF.EOLC)
(CRLF CRLF.EOLC)
(LISPERROR "ILLEGAL ARG" VALUE))))
(CREATIONDATE (replace IOFIBCreationTime of INFOBLOCK
with (IDATE VALUE)))
(READDATE (replace IOFIBReadTime of INFOBLOCK
with (IDATE VALUE)))
(WRITEDATE (replace IOFIBWriteTime of INFOBLOCK
with (IDATE VALUE)))
(ICREATIONDATE (replace IOFIBCreationTime of INFOBLOCK
with VALUE))
(IREADDATE (replace IOFIBReadTime of INFOBLOCK with VALUE))
(IWRITEDATE (replace IOFIBWriteTime of INFOBLOCK with VALUE))
NIL])

(\CORE.GETNEXTBUFFER
Expand Down Expand Up @@ -851,60 +863,48 @@ Copyright (c) 1981, 1982, 1983, 1984, 1985, 1986, 1987, 1988, 1990, 1993, 1999,
(RECORD CORE.PAGEENTRY (PAGENUMBER . PAGEPOINTER))

(DATATYPE COREFILEINFOBLK ((IOFIBCreationTime FIXP)
(IOFIBReadTime FIXP)
(IOFIBWriteTime FIXP)
(IOFIBType POINTER)
(IOFILEPAGES POINTER)
(IOFILEFULLNAME POINTER)
(IOEPAGE WORD)
(IOEOFFSET WORD)
(COREEOLC BITS 2)
(IOFIBFileType WORD))
IOFIBCreationTime _ (IDATE)
IOFILEPAGES _ (LIST (create CORE.PAGEENTRY
PAGENUMBER _ 0))
COREEOLC _ CR.EOLC)
(IOFIBReadTime FIXP)
(IOFIBWriteTime FIXP)
(IOFIBType POINTER)
(IOFILEPAGES POINTER)
(IOFILEFULLNAME POINTER)
(IOEPAGE WORD)
(IOEOFFSET WORD)
(COREEOLC BITS 2)
(IOFIBFileType WORD))
IOFIBCreationTime _ (IDATE)
IOFILEPAGES _ (LIST (create CORE.PAGEENTRY
PAGENUMBER _ 0))
COREEOLC _ CR.EOLC)

(RECORD CORESTREAM STREAM (SUBRECORD STREAM)
[ACCESSFNS CORESTREAM ((INFOBLK (fetch F1 of DATUM)
(replace F1 of DATUM with
NEWVALUE))
(COREPAGECACHE (fetch F10 of DATUM)
(replace F10 of DATUM with
NEWVALUE))
(BEINGPRINTED (fetch IOBEINGPRINTED
of (fetch INFOBLK
of DATUM))
(replace IOBEINGPRINTED
of (fetch INFOBLK of DATUM)
with NEWVALUE))
(FILEPAGES (fetch IOFILEPAGES
of (fetch INFOBLK
of DATUM))
(replace IOFILEPAGES
of (fetch INFOBLK of DATUM)
with NEWVALUE))
(CreationTime (fetch IOFIBCreationTime
of (fetch INFOBLK
of DATUM))
(replace IOFIBCreationTime
of (fetch INFOBLK of DATUM)
with NEWVALUE))
(ReadTime (fetch IOFIBReadTime
of (fetch INFOBLK
of DATUM))
(replace IOFIBReadTime
of (fetch INFOBLK of DATUM)
with NEWVALUE))
(WriteTime (fetch IOFIBWriteTime
of (fetch INFOBLK
of DATUM))
(replace IOFIBWriteTime
of (fetch INFOBLK of DATUM)
with NEWVALUE])
[ACCESSFNS CORESTREAM ((INFOBLK (fetch F1 of DATUM)
(replace F1 of DATUM with NEWVALUE))
(COREPAGECACHE (fetch F10 of DATUM)
(replace F10 of DATUM with NEWVALUE))
(BEINGPRINTED (fetch IOBEINGPRINTED
of (fetch INFOBLK of DATUM))
(replace IOBEINGPRINTED
of (fetch INFOBLK of DATUM) with NEWVALUE))
(FILEPAGES (fetch IOFILEPAGES
of (fetch INFOBLK of DATUM))
(replace IOFILEPAGES
of (fetch INFOBLK of DATUM) with NEWVALUE))
(CreationTime (fetch IOFIBCreationTime
of (fetch INFOBLK of DATUM))
(replace IOFIBCreationTime
of (fetch INFOBLK of DATUM) with NEWVALUE))
(ReadTime (fetch IOFIBReadTime
of (fetch INFOBLK of DATUM))
(replace IOFIBReadTime
of (fetch INFOBLK of DATUM) with NEWVALUE))
(WriteTime (fetch IOFIBWriteTime
of (fetch INFOBLK of DATUM))
(replace IOFIBWriteTime
of (fetch INFOBLK of DATUM) with NEWVALUE])

(ACCESSFNS COREDEVICE ((COREDIRECTORY (FETCH DEVICEINFO OF DATUM)
(REPLACE DEVICEINFO OF DATUM WITH NEWVALUE))))
(REPLACE DEVICEINFO OF DATUM WITH NEWVALUE))))

(RECORD COREGENFILESTATE (COREFILELST))
)
Expand Down Expand Up @@ -954,16 +954,16 @@ Copyright (c) 1981, 1982, 1983, 1984, 1985, 1986, 1987, 1988, 1990, 1993, 1999,
(PUTPROPS COREIO COPYRIGHT ("Venue & Xerox Corporation" 1981 1982 1983 1984 1985 1986 1987 1988 1990
1993 1999 2018))
(DECLARE%: DONTCOPY
(FILEMAP (NIL (1755 43279 (\CORE.CLOSEFILE 1765 . 2538) (\CORE.DELETEFILE 2540 . 4526) (
\CORE.DIRECTORYNAMEP 4528 . 4789) (\CORE.FINDPAGE 4791 . 8020) (\CORE.GENERATEFILES 8022 . 10609) (
\CORE.NEXTFILEFN 10611 . 11110) (\CORE.FILEINFOFN 11112 . 11341) (\CORE.GETFILEHANDLE 11343 . 13497) (
\CORE.GETFILEINFO 13499 . 14462) (\CORE.GETFILEINFO.FROM.INFOBLOCK 14464 . 16001) (\CORE.GETFILENAME
16003 . 18292) (\CORE.GETINFOBLOCK 18294 . 20917) (\CORE.NAMESCAN 20919 . 22686) (\CORE.NAMESEGMENT
22688 . 23125) (\CORE.OPENFILE 23127 . 26246) (\COREFILE.SETPARAMETERS 26248 . 28429) (
\CORE.PACKFILENAME 28431 . 28826) (\CORE.RELEASEPAGES 28828 . 29429) (\CORE.SETFILEPTR 29431 . 30530)
(\CORE.UPDATEOF 30532 . 32161) (\CORE.BACKFILEPTR 32163 . 34371) (\CORE.SETEOFPTR 34373 . 36242) (
\CORE.SETACCESSTIME 36244 . 36869) (\CORE.SETFILEINFO 36871 . 38062) (\CORE.GETNEXTBUFFER 38064 .
42020) (\CORE.UNPACKFILENAME 42022 . 43277)) (43280 46913 (COREDEVICE 43290 . 43461) (
\CREATECOREDEVICE 43463 . 46911)) (46914 49215 (\NODIRCOREFDEV 46924 . 47521) (\NODIRCORE.OPENFILE
47523 . 49213)))))
(FILEMAP (NIL (1710 44229 (\CORE.CLOSEFILE 1720 . 2493) (\CORE.DELETEFILE 2495 . 4481) (
\CORE.DIRECTORYNAMEP 4483 . 4744) (\CORE.FINDPAGE 4746 . 7975) (\CORE.GENERATEFILES 7977 . 10564) (
\CORE.NEXTFILEFN 10566 . 11065) (\CORE.FILEINFOFN 11067 . 11296) (\CORE.GETFILEHANDLE 11298 . 13452) (
\CORE.GETFILEINFO 13454 . 14417) (\CORE.GETFILEINFO.FROM.INFOBLOCK 14419 . 15956) (\CORE.GETFILENAME
15958 . 18247) (\CORE.GETINFOBLOCK 18249 . 20872) (\CORE.NAMESCAN 20874 . 22641) (\CORE.NAMESEGMENT
22643 . 23080) (\CORE.OPENFILE 23082 . 26201) (\COREFILE.SETPARAMETERS 26203 . 28384) (
\CORE.PACKFILENAME 28386 . 28781) (\CORE.RELEASEPAGES 28783 . 29384) (\CORE.SETFILEPTR 29386 . 30485)
(\CORE.UPDATEOF 30487 . 32116) (\CORE.BACKFILEPTR 32118 . 34326) (\CORE.SETEOFPTR 34328 . 36197) (
\CORE.SETACCESSTIME 36199 . 36824) (\CORE.SETFILEINFO 36826 . 39012) (\CORE.GETNEXTBUFFER 39014 .
42970) (\CORE.UNPACKFILENAME 42972 . 44227)) (44230 47863 (COREDEVICE 44240 . 44411) (
\CREATECOREDEVICE 44413 . 47861)) (47864 50165 (\NODIRCOREFDEV 47874 . 48471) (\NODIRCORE.OPENFILE
48473 . 50163)))))
STOP
Binary file modified sources/COREIO.LCOM
View file
Open in desktop
Binary file not shown.
Loading