From b746535c3f19d5d444eb4ba58e47651e1eb52e1f Mon Sep 17 00:00:00 2001 From: dos-reis Date: Wed, 22 Aug 2007 08:10:00 +0000 Subject: * bootfuns.lisp.pamphlet ($bootStrapMode): Move to sys-globals.boot. ($BreakMode): Likewise. ($cacheAlist): Likewise. ($cacheCount): Likewise. ($clamList): Likewise. ($compCount): Likewise. ($compUniquelyIfTrue): Likewise. ($ConstructorCache): Likewise. ($createUpdateFiles): Likewise. ($currentFunction): Likewise. ($currentLine): Likewise. * setq.lisp.pamphlet: Merge the definitions of the above mentioned variables into sys-globals.boot. * Makefile.pamphlet (sys-globals.$(FASLEXT)): Require hash.$(FASLEXT). * Makefile.in: Regenerate. --- src/interp/ChangeLog | 20 ++++++++++++++++ src/interp/Makefile.in | 3 ++- src/interp/Makefile.pamphlet | 3 ++- src/interp/bootfuns.lisp.pamphlet | 21 ----------------- src/interp/setq.lisp.pamphlet | 24 -------------------- src/interp/sys-globals.boot | 48 +++++++++++++++++++++++++++++++++++++++ 6 files changed, 72 insertions(+), 47 deletions(-) diff --git a/src/interp/ChangeLog b/src/interp/ChangeLog index 7cc07f4e..b174fcdf 100644 --- a/src/interp/ChangeLog +++ b/src/interp/ChangeLog @@ -1,3 +1,23 @@ +2007-08-22 Gabriel Dos Reis + + * bootfuns.lisp.pamphlet ($bootStrapMode): Move to sys-globals.boot. + ($BreakMode): Likewise. + ($cacheAlist): Likewise. + ($cacheCount): Likewise. + ($clamList): Likewise. + ($compCount): Likewise. + ($compUniquelyIfTrue): Likewise. + ($ConstructorCache): Likewise. + ($createUpdateFiles): Likewise. + ($currentFunction): Likewise. + ($currentLine): Likewise. + * setq.lisp.pamphlet: Merge the definitions of the above mentioned + variables into sys-globals.boot. + + * Makefile.pamphlet (sys-globals.$(FASLEXT)): Require + hash.$(FASLEXT). + * Makefile.in: Regenerate. + 2007-08-21 Gabriel Dos Reis * bootfuns.lisp.pamphlet ($SPAD_ERRORS): Don't define here. diff --git a/src/interp/Makefile.in b/src/interp/Makefile.in index 5e4c168b..c9979c8a 100644 --- a/src/interp/Makefile.in +++ b/src/interp/Makefile.in @@ -437,7 +437,8 @@ diagnostics.$(FASLEXT): diagnostics.boot sys-constants.$(FASLEXT) \ sys-globals.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< -sys-globals.$(FASLEXT): sys-globals.boot boot-pkg.$(FASLEXT) +sys-globals.$(FASLEXT): sys-globals.boot boot-pkg.$(FASLEXT) \ + hash.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< sys-constants.$(FASLEXT): sys-constants.boot boot-pkg.$(FASLEXT) diff --git a/src/interp/Makefile.pamphlet b/src/interp/Makefile.pamphlet index bc536bac..1d929b65 100644 --- a/src/interp/Makefile.pamphlet +++ b/src/interp/Makefile.pamphlet @@ -1084,7 +1084,8 @@ diagnostics.$(FASLEXT): diagnostics.boot sys-constants.$(FASLEXT) \ sys-globals.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< -sys-globals.$(FASLEXT): sys-globals.boot boot-pkg.$(FASLEXT) +sys-globals.$(FASLEXT): sys-globals.boot boot-pkg.$(FASLEXT) \ + hash.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< sys-constants.$(FASLEXT): sys-constants.boot boot-pkg.$(FASLEXT) diff --git a/src/interp/bootfuns.lisp.pamphlet b/src/interp/bootfuns.lisp.pamphlet index b0c77707..099cd042 100644 --- a/src/interp/bootfuns.lisp.pamphlet +++ b/src/interp/bootfuns.lisp.pamphlet @@ -110,7 +110,6 @@ offer it as extensions. (export '(,p) "BOOT"))) -(def-boot-var |$abbreviationTable| "???") (def-boot-val |$algebraList| '(|QuotientField| |Polynomial| |UnivariatePoly| @@ -122,12 +121,8 @@ offer it as extensions. (def-boot-val |$BasicDomains| '(|Integer| |Float| |Symbol| |Boolean| |String|) "???") -(def-boot-val |$bootStrapMode| () "if T compCapsule skips body") (def-boot-var |$brightenCommentsFlag| "???") (def-boot-var |$brightenCommentsIfTrue| "???") -(def-boot-val |$BreakMode| '|query| "error.boot") -(def-boot-var |$cacheAlist| "Interpreter>System.boot") -(def-boot-val |$cacheCount| 0 "???") ; modemap:== ( (p e) (p e) ... (p e) ) ; modemaplist:= ( modemap ... ) @@ -138,15 +133,6 @@ offer it as extensions. (((|Category|) (|Category|) (|List| |Category|)) (|Category|)) (T *)) ))))) "Compiler>CUtil.boot") -(def-boot-val |$clamList| - '((|getModemapsFromDatabase| |hash| UEQUAL |count|) - (|getOperationAlistFromLisplib| |hash| UEQUAL |count|) - (|getFileProperty| |hash| UEQUAL |count|) - (|canCoerceFrom| |hash| UEQUAL |count|) - (|selectMms1| |hash| UEQUAL |count|) - (|coerceMmSelection| |hash| UEQUAL |count|) - (|isValidType| |hash| UEQUAL |count|)) - "Interpreter>Clammed.boot") (def-boot-val |$CommonDomains| '(|Record| |Union| |List| |Vector| |String| |Float| |Integer| @@ -155,16 +141,9 @@ offer it as extensions. |PositiveInteger| |SmallInteger| |Boolean|) "???") -(def-boot-var |$compCount| "???") (def-boot-var |$compileMapFlag| "Interpreter>SetVars.boot") -(def-boot-var |$compUniquelyIfTrue| "Compiler>Compiler.boot") -(def-boot-val |$consistencyCheck| nil "Interpreter>Consis.boot") -(def-boot-val |$ConstructorCache| (MAKE-HASHTABLE 'ID) "???") (def-boot-var |$constructorsNotInDatabase| "Interpreter>Database.boot") -(def-boot-var |$createUpdateFiles| "Interpreter>SetVarT.boot") (def-boot-var |$croakIfTrue| "See moan in U.") -(def-boot-var |$currentFunction| "???") -(def-boot-val |$currentLine| "" "current input line for history") (def-boot-val $delay 0 "???") (def-boot-var $Directory "???") (def-boot-var $DISPLAY "???") diff --git a/src/interp/setq.lisp.pamphlet b/src/interp/setq.lisp.pamphlet index c3b3c927..4e396b5d 100644 --- a/src/interp/setq.lisp.pamphlet +++ b/src/interp/setq.lisp.pamphlet @@ -94,7 +94,6 @@ (SETQ |$permitWhere| NIL) (SETQ |$newSystem| T) (SETQ |$noSubsumption| NIL) -(SETQ |$bootStrapMode| NIL) ;; if true skip functor bodies (SETQ |$compileDontDefineFunctions| 'T) (SETQ |$compileOnlyCertainItems| NIL) (SETQ |$devaluateList| NIL) @@ -122,8 +121,6 @@ (setq |$Newline| #\Newline) -(setq |$createUpdateFiles| nil) - (SETQ $FUNNAME NIL) ;; this and next used in COMP,TRAN,1 (SETQ $FUNNAME_TAIL '(())) (SETQ $LASTPREFIX "S:") ;"default setting" @@ -204,7 +201,6 @@ (SETQ OPASSOC NIL) (SETQ SPADSYSKEY '(EOI EOL)) -(SETQ $cacheAlist NIL) (SETQ $streamAlist NIL) ;; following 2 variables are referenced by PREPARSE1 @@ -307,7 +303,6 @@ (SETQ |$existingFiles| (MAKE-HASHTABLE 'UEQUAL)) (SETQ |$updateCatTableIfTrue| 'T) -(SETQ |$ConstructorCache| (MAKE-HASHTABLE 'ID)) (SETQ |$instantRecord| (MAKE-HASHTABLE 'ID)) (SETQ |$immediateDataSymbol| '|--immediateData--|) @@ -318,22 +313,6 @@ (SETQ |$libraryDirectory| 'A) (SETQ |$listingDirectory| 'A) -;; See CLAMMED BOOT for defs of following functions -(SETQ |$clamList| '( - (|canCoerce| |hash| UEQUAL |count|) - (|canCoerceFrom| |hash| UEQUAL |count|) - (|coerceConvertMmSelection| |hash| UEQUAL |count|) -; (|getModemapsFromDatabase| |hash| UEQUAL |count|) -; (|getOperationAlistFromLisplib| |hash| UEQUAL |count|) - (|hasFileProperty| |hash| UEQUAL |count|) - (|isLegitimateMode| |hash| UEQUAL |count|) - (|isValidType| |hash| UEQUAL |count|) - (|resolveTT| |hash| UEQUAL |count|) - (|selectMms1| |hash| UEQUAL |count|) - (|underDomainOf| |hash| UEQUAL |count|) -; (|isSubDomain| |hash| UEQUAL |count|) -)) - ;; the following symbol holds the canonical "failed" value (SETQ |$failed| "failed") @@ -377,8 +356,6 @@ (SETQ |$leftPren| "(") ;;[for use in SAY expressions] (SETQ |$rightPren| ")") -(SETQ |$abbreviationTable| NIL) - (|SETQ| |$BasicDomains| '(|Integer| |Float| |Symbol| |Boolean| |String|)) (SETQ |$PrintCompilerMessagesIfTrue| NIL) @@ -416,7 +393,6 @@ (SETQ |$reportCoerce| NIL) (SETQ |$reportCompilation| NIL) (SETQ |$streamCount| 0) -(SETQ |$cacheCount| 0) (SETQ |$streamIndexing| NIL) (SETQ |$reportExitModeStack| NIL) (SETQ |$prefix| NIL) diff --git a/src/interp/sys-globals.boot b/src/interp/sys-globals.boot index 2c576427..a46571fe 100644 --- a/src/interp/sys-globals.boot +++ b/src/interp/sys-globals.boot @@ -37,6 +37,7 @@ -- the interpreter or the compiler or both. -- +import '"hash" import '"boot-pkg" )package "BOOT" @@ -45,3 +46,50 @@ $saturn := false ++ FIXME $SPAD__ERRORS := VECTOR(0, 0, 0) + +++ +$abbreviationTable := nil + +++ +$bootStrapMode := false + +++ +$BreakMode := "query" + +++ +$cacheAlist := nil +$cacheCount := 0 + + +++ +$clamList := + '((canCoerce hash UEQUAL count) _ + (canCoerceFrom hash UEQUAL count) _ + (coerceConvertMmSelection hash UEQUAL count) _ + (hasFileProperty hash UEQUAL count) _ + (isLegitimateMode hash UEQUAL count) _ + (isValidType hash UEQUAL count) _ + (resolveTT hash UEQUAL count) _ + (selectMms1 hash UEQUAL count) _ + (underDomainOf hash UEQUAL count)) + +++ +$compCount := 0 + +++ +$compUniquelyIfTrue := false + +++ +$consistencyCheck := true + +++ +$ConstructorCache := MAKE_-HASHTABLE "ID" + +++ +$createUpdateFiles := false + +++ +$currentFunction := nil + +++ +$currentLine := nil -- cgit v1.2.3