BOOTSTRAP: Read initial DEFINE-FILE-INFO as a string, not an atom
If it is ead with RATOM, then e.g. LISPSOURCEFILEP gives an error if the first line of the file begins with something like (Author:
This commit is contained in:
rmkaplan
parent
db3ca49564
commit
6b66665e9d
@ -1,11 +1,11 @@
|
||||
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
|
||||
(FILECREATED "17-Aug-2021 00:08:39"
|
||||
{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>BOOTSTRAP.;58 47657
|
||||
(FILECREATED "26-Sep-2021 23:38:02"
|
||||
{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>BOOTSTRAP.;59 47644
|
||||
|
||||
changes to%: (FNS \DO-DEFINE-FILE-INFO PRINT-READER-ENVIRONMENT)
|
||||
changes to%: (FNS READ-READER-ENVIRONMENT)
|
||||
|
||||
previous date%: "15-Aug-2021 21:21:35"
|
||||
{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>BOOTSTRAP.;57)
|
||||
previous date%: "17-Aug-2021 00:08:39"
|
||||
{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>BOOTSTRAP.;58)
|
||||
|
||||
|
||||
(* ; "
|
||||
@ -15,14 +15,14 @@ Copyright (c) 1983-1990, 1992, 2021 by Venue & Xerox Corporation.
|
||||
(PRETTYCOMPRINT BOOTSTRAPCOMS)
|
||||
|
||||
(RPAQQ BOOTSTRAPCOMS
|
||||
[(COMS (* ; "Some basic fns. Note that several are redefined later. E.g., RPAQQ et al real definitions are on UNDO")
|
||||
[(COMS (* ; "Some basic fns. Note that several are redefined later. E.g., RPAQQ et al real definitions are on UNDO")
|
||||
(FNS GETPROP SETATOMVAL RPAQQ RPAQ RPAQ? MOVD MOVD? SELECTQ SELECTQ1 NCONC1 PUTPROP
|
||||
PROPNAMES ADDPROP REMPROP MEMB CLOSEF?))
|
||||
(COMS (* ;
|
||||
"Need these in order to load even compiled files SYSLOAD")
|
||||
(COMS (* ;
|
||||
"Need these in order to load even compiled files SYSLOAD")
|
||||
(FNS LOAD \LOAD-STREAM FILECREATED FILECREATED1 PRETTYCOMPRINT BOOTSTRAP-NAMEFIELD
|
||||
PUTPROPS DECLARE%: DECLARE%:1 ROOTFILENAME))
|
||||
[COMS (* ; "For DEFINE-FILE-INFO")
|
||||
[COMS (* ; "For DEFINE-FILE-INFO")
|
||||
(FNS DEFINE-FILE-INFO \DO-DEFINE-FILE-INFO PRINT-READER-ENVIRONMENT
|
||||
READ-READER-ENVIRONMENT MAKE-DEFINE-FILE-INFO-ENV)
|
||||
(INITVARS (*DEFINE-FILE-INFO-ENV* (MAKE-DEFINE-FILE-INFO-ENV]
|
||||
@ -76,7 +76,7 @@ Copyright (c) 1983-1990, 1992, 2021 by Venue & Xerox Corporation.
|
||||
(AND (CCODEP 'BOOTSTRAP-NAMEFIELD)
|
||||
(PUTD 'BOOTSTRAP-NAMEFIELD]
|
||||
(P (RADIX 10)))
|
||||
(DECLARE%: DOEVAL@COMPILE DONTCOPY (* ; "eventually imported from FASL")
|
||||
(DECLARE%: DOEVAL@COMPILE DONTCOPY (* ; "eventually imported from FASL")
|
||||
(CONSTANTS FASL:SIGNATURE))
|
||||
(DECLARE%: DONTEVAL@LOAD DOEVAL@COMPILE DONTCOPY COMPILERVARS
|
||||
(ADDVARS (NLAMA DEFINE-FILE-INFO DECLARE%: PUTPROPS FILECREATED SELECTQ)
|
||||
@ -810,11 +810,11 @@ Copyright (c) 1983-1990, 1992, 2021 by Venue & Xerox Corporation.
|
||||
(FETCH (READER-ENVIRONMENT REREADTABLE) OF *DEFINE-FILE-INFO-ENV*))))])
|
||||
|
||||
(READ-READER-ENVIRONMENT
|
||||
[LAMBDA (STREAM DEFAULTENV RETURNFORM) (* ; "Edited 30-Jul-2021 09:58 by rmk:")
|
||||
[LAMBDA (STREAM DEFAULTENV RETURNFORM) (* ; "Edited 26-Sep-2021 23:31 by rmk:")
|
||||
|
||||
(* ;; "Starting environment is the old interlisp file, just for the seprchar scans.")
|
||||
(* ;; "Starting environment is the old interlisp file, just for the seprchar scans.")
|
||||
|
||||
(* ;; "RETURNFORM=T means return the DEFINE-FILE-INFO as a second value, for READFILE")
|
||||
(* ;; "RETURNFORM=T means return the DEFINE-FILE-INFO as a second value, for READFILE")
|
||||
|
||||
(CL:UNLESS DEFAULTENV (SETQ DEFAULTENV *OLD-INTERLISP-READ-ENVIRONMENT*))
|
||||
(LET ((START (GETFILEPTR STREAM))
|
||||
@ -825,32 +825,32 @@ Copyright (c) 1983-1990, 1992, 2021 by Venue & Xerox Corporation.
|
||||
)))
|
||||
(DECLARE (SPECVARS *READTABLE*))
|
||||
(SELCHARQ (SKIPSEPRCODES STREAM)
|
||||
(";" (* ; "Assume it's a common lisp file")
|
||||
(";" (* ; "Assume it's a common lisp file")
|
||||
(\EXTERNALFORMAT STREAM (FETCH (READER-ENVIRONMENT REFORMAT) OF
|
||||
*COMMON-LISP-READ-ENVIRONMENT*
|
||||
))
|
||||
*COMMON-LISP-READ-ENVIRONMENT*)
|
||||
("(" (\EXTERNALFORMAT STREAM (FETCH (READER-ENVIRONMENT REFORMAT) OF
|
||||
*DEFINE-FILE-INFO-ENV*
|
||||
)) (* ;
|
||||
"Should we reset the format if we fail?")
|
||||
)) (* ;
|
||||
"Should we reset the format if we fail?")
|
||||
(READCCODE STREAM)
|
||||
(WITH-READER-ENVIRONMENT *DEFINE-FILE-INFO-ENV*
|
||||
(IF (EQ 'DEFINE-FILE-INFO (RATOM STREAM))
|
||||
(IF (STREQUAL "DEFINE-FILE-INFO" (RSTRING STREAM))
|
||||
THEN
|
||||
|
||||
(* ;;
|
||||
"After the \DO-DEFINE-FILE-INFO, we have the new environment and we have set the new format.")
|
||||
(* ;;
|
||||
"After the \DO-DEFINE-FILE-INFO, we have the new environment and we have set the new format.")
|
||||
|
||||
[SETQ ENV (\DO-DEFINE-FILE-INFO STREAM (SETQ ARGS
|
||||
(CL:READ-DELIMITED-LIST
|
||||
(CHARCODE ")")
|
||||
STREAM]
|
||||
ELSE (* ; "Hope we are RANDACCESSP")
|
||||
ELSE (* ; "Hope we are RANDACCESSP")
|
||||
(SETFILEPTR STREAM START))
|
||||
|
||||
(* ;;
|
||||
"If we didn't see ARGS, then we didn't see a DEFINE-FILE-INFO, no form to return.")
|
||||
(* ;;
|
||||
"If we didn't see ARGS, then we didn't see a DEFINE-FILE-INFO, no form to return.")
|
||||
|
||||
(CL:IF (AND RETURNFORM ARGS)
|
||||
(CL:VALUES ENV (CONS 'DEFINE-FILE-INFO ARGS))
|
||||
@ -981,13 +981,13 @@ Copyright (c) 1983-1990, 1992, 2021 by Venue & Xerox Corporation.
|
||||
(PUTPROPS BOOTSTRAP COPYRIGHT ("Venue & Xerox Corporation" 1983 1984 1985 1986 1987 1988 1989 1990
|
||||
1992 2021))
|
||||
(DECLARE%: DONTCOPY
|
||||
(FILEMAP (NIL (4748 14420 (GETPROP 4758 . 5330) (SETATOMVAL 5332 . 5461) (RPAQQ 5463 . 5516) (RPAQ
|
||||
5518 . 5830) (RPAQ? 5832 . 6202) (MOVD 6204 . 8068) (MOVD? 8070 . 8500) (SELECTQ 8502 . 8689) (
|
||||
SELECTQ1 8691 . 9033) (NCONC1 9035 . 9231) (PUTPROP 9233 . 10717) (PROPNAMES 10719 . 10910) (ADDPROP
|
||||
10912 . 12975) (REMPROP 12977 . 13831) (MEMB 13833 . 14092) (CLOSEF? 14094 . 14418)) (14493 35057 (
|
||||
LOAD 14503 . 15672) (\LOAD-STREAM 15674 . 28748) (FILECREATED 28750 . 30168) (FILECREATED1 30170 .
|
||||
31278) (PRETTYCOMPRINT 31280 . 31765) (BOOTSTRAP-NAMEFIELD 31767 . 32727) (PUTPROPS 32729 . 33097) (
|
||||
DECLARE%: 33099 . 33231) (DECLARE%:1 33233 . 34105) (ROOTFILENAME 34107 . 35055)) (35095 45489 (
|
||||
DEFINE-FILE-INFO 35105 . 35540) (\DO-DEFINE-FILE-INFO 35542 . 39888) (PRINT-READER-ENVIRONMENT 39890
|
||||
. 41443) (READ-READER-ENVIRONMENT 41445 . 44211) (MAKE-DEFINE-FILE-INFO-ENV 44213 . 45487)))))
|
||||
(FILEMAP (NIL (4726 14398 (GETPROP 4736 . 5308) (SETATOMVAL 5310 . 5439) (RPAQQ 5441 . 5494) (RPAQ
|
||||
5496 . 5808) (RPAQ? 5810 . 6180) (MOVD 6182 . 8046) (MOVD? 8048 . 8478) (SELECTQ 8480 . 8667) (
|
||||
SELECTQ1 8669 . 9011) (NCONC1 9013 . 9209) (PUTPROP 9211 . 10695) (PROPNAMES 10697 . 10888) (ADDPROP
|
||||
10890 . 12953) (REMPROP 12955 . 13809) (MEMB 13811 . 14070) (CLOSEF? 14072 . 14396)) (14471 35035 (
|
||||
LOAD 14481 . 15650) (\LOAD-STREAM 15652 . 28726) (FILECREATED 28728 . 30146) (FILECREATED1 30148 .
|
||||
31256) (PRETTYCOMPRINT 31258 . 31743) (BOOTSTRAP-NAMEFIELD 31745 . 32705) (PUTPROPS 32707 . 33075) (
|
||||
DECLARE%: 33077 . 33209) (DECLARE%:1 33211 . 34083) (ROOTFILENAME 34085 . 35033)) (35073 45476 (
|
||||
DEFINE-FILE-INFO 35083 . 35518) (\DO-DEFINE-FILE-INFO 35520 . 39866) (PRINT-READER-ENVIRONMENT 39868
|
||||
. 41421) (READ-READER-ENVIRONMENT 41423 . 44198) (MAKE-DEFINE-FILE-INFO-ENV 44200 . 45474)))))
|
||||
STOP
|
||||
|
||||
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user