From 1a144a3e11fe8696c187bd2b619893e4d2a0a32e Mon Sep 17 00:00:00 2001 From: dos-reis Date: Tue, 21 Aug 2007 04:57:21 +0000 Subject: * g-error.boot.pamphlet: Import "diagnostics. (errorSupervisor1): Call BUMPERRORCOUNT, not BUMPCOMPERRORCOUNT. The latter no longer exists. * msgdb.boot.pamphlet (throwKeyedErrorMsg): Likewise. * Makefile.pamphlet (${DEPSYS}): Depend also on sys-constant.$(FASLEXT), sys-globals.$(FASLEXT), and diagnostics.$(FASLEXT). (bootfuns.$(FASLEXT)): Likewise. (diagnostics.boot): New rule. (sys-globals.boot): Likewise. (sys-constants.boot): Likewise. * Makefile.in: Regenerate. * diagnostics.boot: New. (BUMPERRORCOUNT): Move from bootlex.lisp.pamphlet. Rewrite as Boot code. * sys-constants.boot: New. * sys-globals.boot: Likewise. * bootlex.lisp.pamphlet (BUMPERRORCOUNT): Move to diagnostics.boot. * varini.boot.pamphlet ($NoValueMode): Don't duplicate define. * spad.lisp.pamphlet (S-PROCESS): Don't bind $LocalFrame here. * patches.lisp.pamphlet: Tidy. * nag-f01.boot.pamphlet (f01mafSolve): Use $EmptyMode to refer to the wildcar type. (f01brfSolve): Likewise. * setq.lisp.pamphlet: Move variables already defined in bootfuns.lisp.pamphlet to sys-contants, and merge initial values. ($SPAD_ERRORS): Move to sys-globals.boot. * bootfuns.lisp.pamphlet: Now import both "sys-constants" and "sys-globals". (|$timerTicksPerSecond|): Move to sys-constants.boot. (|$quadSymbol|): Likewise. ($escapeString): Likewise. ($boxString): Likewise. ($boldString): Likewise. ($normalString): Likewise. ($reverseVideoString): Likewise. ($underlineString): Likewise. ($COMPILE): Likewise. ($BasicPredicates): Likewise. ($BFTag): Likewise. ($BigFloat): Likewise. ($Boolean): Likewise. ($Category): Likewise. ($CategoryNames): Likewise. ($Domain): Likewise. ($DomainNames): Likewise. ($DomainsInScope): Likewise. ($DoubleQuote): Likewise. ($DummyFunctorNames): Likewise. ($EmptyEnvironment): Likewise. ($EmptyList): Likewise. ($EmptyMode): Likewise. ($EmptyString): Likewise. ($EmptyVector): Likewise. ($Expression): Likewise. ($Exit): Likewise. ($failure): Likewise. ($Float): Likewise. ($FormalMapVariableList): Likewise. ($ConstructorNames): Likewise. ($InitialDomainsInScope): Likewise. ($InitialModemapFrame): Likewise. ($Integer): Likewise. ($LocalFrame): Likewise. ($NegativeInteger): Likewise. ($NonNegativeInteger): Likewise. ($NonPositiveInteger): Likewise. ($NonMentionableDomainNames): Likewise. ($noParseCommands): Likewise. ($NoValueMode): Likewise. ($NoValue): Likewise. ($Mode): Likewise. ($ModeVariableList): Likewise. ($One): Likewise. ($PatternVariableList): Likewise. ($PositiveInteger): Likewise. ($PrimitiveDomainNames): Likewise. ($RationalNumber): Likewise. ($SideEffectFreeFunctionList): Likewise. ($SmallInteger): Likewise. ($SpecialDomainNames): Likewise. ($StringCategory): Likewise. ($String): Likewise. ($Symbol): Likewise. ($systemCommands): Likewise. ($ThrowAwayMode): Likewise. ($tokenCommands): Likewise. ($true): Likeiwse. ($underDomainAlist): Likewise. ($Void): Likewise. ($Zero): Likewise. (|$DomainVariableList|): Likewise. (|$quadSym|): Remove. ($BigFloatOpt): Likewise. ($BooleanOpt): Likewise. ($EM): Likewise. ($ExpressionOpt): Likewise. ($FloatOpt): Likewise. ($FormalMapVariableList2): Likewise. ($IntegerOpt): Likewise. ($NegativeIntegerOpt): Likewise. ($NonNegativeIntegerOpt): Likewise. ($NonPositiveIntegerOpt): Likewise. ($PositiveIntegerOpt): Likewise. ($RationalNumberOpt): Likewise. ($SmallIntegerOpt): Likewise. ($StringOpt): Likewise. ($SymbolOpt): Likewise. * setq.lisp.pamphlet (|$timerTicksPerSecond|): Remove. (|$quadSymbol|): Likewise. ($escapeString): Likewise. ($boxString): Likewise. ($boldString): Likewise. ($normalString): Likewise. ($reverseVideoString): Likewise. ($underlineString): Likewise. ($COMPILE): Likewise. ($BasicPredicates): Likewise. ($BFTag): Likewise. ($BigFloat): Likewise. ($Boolean): Likewise. ($Category): Likewise. ($CategoryNames): Likewise. ($Domain): Likewise. ($DomainNames): Likewise. ($DomainsInScope): Likewise. ($DoubleQuote): Likewise. ($DummyFunctorNames): Likewise. ($EmptyEnvironment): Likewise. ($EmptyList): Likewise. ($EmptyMode): Likewise. ($EmptyString): Likewise. ($EmptyVector): Likewise. ($Expression): Likewise. ($Exit): Likewise. ($failure): Likewise. ($Float): Likewise. ($FormalMapVariableList): Likewise. ($ConstructorNames): Likewise. ($InitialDomainsInScope): Likewise. ($InitialModemapFrame): Likewise. ($Integer): Likewise. ($LocalFrame): Likewise. ($NegativeInteger): Likewise. ($NonNegativeInteger): Likewise. ($NonPositiveInteger): Likewise. ($NonMentionableDomainNames): Likewise. ($noParseCommands): Likewise. ($NoValueMode): Likewise. ($NoValue): Likewise. ($Mode): Likewise. ($ModeVariableList): Likewise. ($One): Likewise. ($PatternVariableList): Likewise. ($PositiveInteger): Likewise. ($PrimitiveDomainNames): Likewise. ($RationalNumber): Likewise. ($SideEffectFreeFunctionList): Likewise. ($SmallInteger): Likewise. ($SpecialDomainNames): Likewise. ($StringCategory): Likewise. ($String): Likewise. ($Symbol): Likewise. ($systemCommands): Likewise. ($ThrowAwayMode): Likewise. ($tokenCommands): Likewise. ($true): Likeiwse. ($underDomainAlist): Likewise. ($Void): Likewise. ($Zero): Likewise. (|$DomainVariableList|): Likewise. --- src/interp/setq.lisp.pamphlet | 195 ------------------------------------------ 1 file changed, 195 deletions(-) (limited to 'src/interp/setq.lisp.pamphlet') diff --git a/src/interp/setq.lisp.pamphlet b/src/interp/setq.lisp.pamphlet index 15d4d241..c3b3c927 100644 --- a/src/interp/setq.lisp.pamphlet +++ b/src/interp/setq.lisp.pamphlet @@ -128,7 +128,6 @@ (SETQ $FUNNAME_TAIL '(())) (SETQ $LASTPREFIX "S:") ;"default setting" (SETQ |$inLispVM| 'T) -(SETQ $SPAD_ERRORS (VECTOR 0 0 0)) (SETQ STAKCOLUMN -1) (SETQ ECHOMETA NIL) (SETQ |$checkParseIfTrue| 'NIL) @@ -194,88 +193,6 @@ (setq *print-pretty* nil) (setq *print-circle* nil) -;; $SYSCOMMANDS is now defined at the top of i-syscmd.boot - -(SETQ |$systemCommands| '( -;; COMMAND USER LEVEL - )set userlevel - (|abbreviations| . |compiler| ) - (|boot| . |development|) - (|cd| . |interpreter|) - (|clear| . |interpreter|) - (|close| . |interpreter|) - (|compiler| . |compiler| ) - (|copyright| . |interpreter|) - (|credits| . |interpreter|) - (|display| . |interpreter|) - (|edit| . |interpreter|) - (|fin| . |development|) - (|frame| . |interpreter|) - (|help| . |interpreter|) - (|history| . |interpreter|) -;; (|input| . |interpreter|) - (|lisp| . |development|) - (|library| . |interpreter|) - (|load| . |interpreter|) - (|ltrace| . |interpreter|) - (|pquit| . |interpreter|) - (|quit| . |interpreter|) - (|read| . |interpreter|) - (|savesystem| . |interpreter|) - (|set| . |interpreter|) - (|show| . |interpreter|) - (|spool| . |interpreter|) - (|summary| . |interpreter|) - (|synonym| . |interpreter|) - (|system| . |interpreter|) - (|trace| . |interpreter|) - (|undo| . |interpreter|) - (|what| . |interpreter|) - (|with| . |interpreter|) - (|workfiles| . |development|) - (|zsystemdevelopment| . |interpreter|) - )) - -(SETQ |$noParseCommands| '( - |boot| - |copyright| - |credits| - |fin| - |lisp| - |pquit| - |quit| - |suspend| - |synonym| - |system| - )) - -(SETQ |$tokenCommands| '( - |abbreviations| - |cd| - |clear| - |close| - |compiler| - |depends| - |display| - |edit| - |frame| - |frame| - |help| - |history| - |input| - |library| - |load| - |ltrace| - |read| - |savesystem| - |set| - |spool| - |undo| - |what| - |with| - |workfiles| - |zsystemdevelopment| - )) - (SETQ |S:SPADTOK| 'SPADSYSTOK) (SETQ APLMODE NIL) (SETQ RLGENSYMFG NIL) @@ -417,24 +334,11 @@ ; (|isSubDomain| |hash| UEQUAL |count|) )) -;; following is symbol denoting a failed operation -(SETQ |$failure| (GENSYM)) ;; the following symbol holds the canonical "failed" value (SETQ |$failed| "failed") (SETQ |$constructorDataTable| NIL) -(SETQ |$underDomainAlist| '()) -;;(SETQ |$underDomainAlist| '( -;; (|DistributedMultivariatePolynomial| . 2) -;; (|MultivariatePolynomial| . 2) -;; (|NewDistributedMultivariatePolynomial| . 2) -;; (|RectangularMatrix| . 3) -;; (|SquareMatrix| . 2) -;; (|UnivariatePoly| . 2) -;; (|VVectorSpace| . 2) -;;)) - (SETQ |$univariateDomains| '( |UnivariatePolynomial| |UnivariateTaylorSeries| @@ -475,26 +379,6 @@ (SETQ |$abbreviationTable| NIL) -(SETQ |$ConstructorNames| '( - |SubDomain| |List| |Union| |Record| |Vector| - )) - ;" Used in isFunctor test, and compDefine " - -(SETQ |$SpecialDomainNames| '( - |add| CAPSULE |SubDomain| |List| |Union| |Record| |Vector| - )) - ;" Used in isDomainForm, addEmptyCapsuleIfnecessary" - -(SETQ |$DomainNames| '( - |Integer| |Float| |Symbol| |Boolean| |String| |Expression| - |Mapping| |SubDomain| |List| |Union| |Record| |Vector| |Enumeration| - )) - -(SETQ |$CategoryNames| '( - |Category| |CATEGORY| |RecordCategory| |Join| |EnumerationCategory| - |StringCategory| |SubsetCategory| |UnionCategory| - )) - (|SETQ| |$BasicDomains| '(|Integer| |Float| |Symbol| |Boolean| |String|)) (SETQ |$PrintCompilerMessagesIfTrue| NIL) @@ -505,71 +389,29 @@ (SETQ |$opFilter| NIL) ;" used to |/s a function " (SETQ |$evalDomain| NIL) -(SETQ |$SideEffectFreeFunctionList| '( - |null| |case| |Zero| |One| \: |::| |has| |Mapping| - |elt| = |>| |>=| |<| |<=| MEMBER |is| |isnt| ATOM - $= |$>| |$>=| |$<| |$<=| $^= $MEMBER -)) - (SETQ |$AnonymousFunction| '(|AnonymousFunction|)) (SETQ |$Any| '(|Any|)) -(SETQ |$BFtag| '|:BF:|) -(SETQ |$Boolean| '(|Boolean|)) -(SETQ |$Category| '(|Category|)) -(SETQ |$Domain| '(|Domain|)) -(SETQ |$Exit| '(|Exit|)) -(SETQ |$Expression| '(|OutputForm|)) (SETQ |$OutputForm| '(|OutputForm|)) -(SETQ |$BigFloat| '(|Float|)) -(SETQ |$Float| '(|Float|)) -(SETQ |$DoubleFloat| '(|DoubleFloat|)) (SETQ |$FontTable| '(|FontTable|)) -(SETQ |$Integer| '(|Integer|)) (SETQ |$ComplexInteger| (LIST '|Complex| |$Integer|)) -(SETQ |$Mode| '(|Mode|)) -(SETQ |$NegativeInteger| '(|NegativeInteger|)) -(SETQ |$NonNegativeInteger| '(|NonNegativeInteger|)) -(SETQ |$NonPositiveInteger| '(|NonPositiveInteger|)) -(SETQ |$PositiveInteger| '(|PositiveInteger|)) -(SETQ |$RationalNumber| '(|Fraction| (|Integer|))) -(SETQ |$String| '(|String|)) -(SETQ |$StringCategory| '(|StringCategory|)) -(SETQ |$Symbol| '(|Symbol|)) -(SETQ |$Void| '(|Void|)) (SETQ |$QuotientField| '|Fraction|) (SETQ |$FunctionalExpression| '|Expression|) (SETQ |$defaultFunctionTargets| '(())) -;; Old names -(SETQ |$SmallInteger| '(|SingleInteger|)) - ;; New Names -(SETQ |$SingleFloat| '(|SingleFloat|)) -(SETQ |$DoubleFloat| '(|DoubleFloat|)) (SETQ |$SingleInteger| '(|SingleInteger|)) (SETQ $TOP_LEVEL T) (SETQ $NE (LIST (LIST NIL))) (SETQ |$InteractiveFrame| (LIST (LIST NIL))) (SETQ |$gauss01| '(|gauss| 0 1)) -(SETQ |$LocalFrame| (LIST (LIST NIL))) -(SETQ |$DomainsInScope| (LIST NIL)) -(SETQ |$EmptyEnvironment| '((NIL))) (SETQ |$NETail| (CONS |$EmptyEnvironment| NIL)) -(SETQ |$EmptyMode| '|$EmptyMode|) -(SETQ |$DummyFunctorNames| '(|Mapping|)) (SETQ |$form| NIL) -(SETQ |$DoubleQuote| '"\"") -(SETQ |$EmptyString| "") -(SETQ |$EmptyVector| (VECTOR)) -(SETQ |$EmptyList| ()) (SETQ |$Index| 0) -(SETQ |$true| ''T) (SETQ |$false| NIL) (SETQ |$suffix| NIL) -(SETQ |$BasicPredicates| '(INTEGERP STRINGP FLOATP)) (SETQ |$coerceIntByMapCounter| 0) (SETQ |$reportCoerce| NIL) (SETQ |$reportCompilation| NIL) @@ -581,24 +423,7 @@ (SETQ |$Polvar| '(WRAPPED . ((1 . 1)))) (SETQ |$OneCoef| '(1 1 . 1)) (SETQ |$Lisp| '(|Lisp|)) -(SETQ |$ExpressionOpt| '(|Expression| . OPT)) (SETQ |$formalArgList| ()) -(SETQ |$FormalMapVariableList| - '(|#1| |#2| |#3| |#4| |#5| |#6| |#7| |#8| |#9| |#10| - |#11| |#12| |#13| |#14| |#15| |#16| |#17| |#18| |#19| |#20| - |#21| |#22| |#23| |#24| |#25| |#26| |#27| |#28| |#29| |#30| - |#31| |#32| |#33| |#34| |#35| |#36| |#37| |#38| |#39| |#40| - |#41| |#42| |#43| |#44| |#45| |#46| |#47| |#48| |#49| |#50| - )) -(SETQ |$PatternVariableList| - '(*1 *2 *3 *4 *5 *6 *7 *8 *9 *10 *11 *12 *13 *14 *15 *16 *17 *18 *19 *20 - *21 *22 *23 *24 *25 *26 *27 *28 *29 *30 *31 *32 *33 *34 *35 *36 *37 *38 *39 *40 - *41 *42 *43 *44 *45 *46 *47 *48 *49 *50)) -(SETQ |$ModeVariableList| - '(dv$1 dv$2 dv$3 dv$4 dv$5 dv$6 dv$7 dv$8 dv$9 dv$10 dv$11 dv$12 dv$13 dv$14 dv$15 - dv$16 dv$17 dv$18 dv$19 dv$20)) -(SETQ |$DomainVariableList| - '($1 $2 $3 $4 $5 $6 $7 $8 $9 $10 $11 $12 $13 $14 $15 $16 $17 $18 $19 $20)) (SETQ |$TriangleVariableList| '(|t#1| |t#2| |t#3| |t#4| |t#5| |t#6| |t#7| |t#8| |t#9| |t#10| |t#11| |t#12| |t#13| |t#14| |t#15| |t#16| |t#17| |t#18| |t#19| |t#20| @@ -606,21 +431,6 @@ |t#31| |t#32| |t#33| |t#34| |t#35| |t#36| |t#37| |t#38| |t#39| |t#40| |t#41| |t#42| |t#43| |t#44| |t#45| |t#46| |t#47| |t#48| |t#49| |t#50|)) -(SETQ |$PrimitiveDomainNames| - '(|List| |Integer| |NonNegativeInteger| |PositiveInteger| - |SingleInteger| |String| |Boolean|)) - ;" used in mkCategory to avoid generating vector slots" - ;" for primitive domains " - ;" also used by putInLocalDomainReferences and optCall" -(SETQ |$optimizableConstructorNames| - '(|List| |Integer| |PositiveInteger| |NonNegativeInteger| |SingleInteger| - |String| |Boolean| |Symbol| |DoubleFloat| |PrimitiveArray| |Vector|)) - ;" used by optCallSpecially" -(SETQ |$Zero| '(|Zero|)) -(SETQ |$One| '(|One|)) -(SETQ |$NonMentionableDomainNames| - '($ |Rep| |Record| |Union| |Mapping| |Enumeration|)) - ;" modemap:== ( (p e) (p e) ... (p e) ) " ;" modemaplist:= ( modemap ... ) " (SETQ |$CategoryFrame| '((( @@ -635,11 +445,6 @@ ))) )))) -(SETQ |$InitialDomainsInScope| - '(|$EmptyMode| |$NoValueMode|)) - -(SETQ |$InitialModemapFrame| '((NIL))) - (SETQ NRTPARSE NIL) (SETQ |$NRTflag| T) (SETQ |$NRTaddForm| NIL) -- cgit v1.2.3