diff options
| -rw-r--r-- | src/ChangeLog | 12 | ||||
| -rw-r--r-- | src/interp/format.boot | 2 | ||||
| -rw-r--r-- | src/interp/i-coerce.boot | 1 | ||||
| -rw-r--r-- | src/interp/i-object.boot | 2 | ||||
| -rw-r--r-- | src/interp/nrunfast.boot | 3 | ||||
| -rw-r--r-- | src/interp/setq.lisp | 6 | ||||
| -rw-r--r-- | src/interp/setvars.boot | 1 | ||||
| -rw-r--r-- | src/interp/spad.lisp | 3 |
8 files changed, 20 insertions, 10 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 63a6b1ea..8cf82a31 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,17 @@ 2008-02-02 Gabriel Dos Reis <gdr@cs.tamu.edu> + * interp/spad.lisp (APLMODE): Don't define. + (XTOKENREADER): Don't set; define. + * interp/setvars.boot (resetWorkspaceVariables): Don't reset + $coerceIntByMapCounter. + * interp/setq.lisp: Stop redundant assignments. + * interp/nrunfast.boot ($NRTmonitorIfTrue): Define here. + * interp/i-object.boot (objEnv): Use $EmptyEnvironment. + * interp/i-coerce.boot ($useConvertForCoercions): Likewise. + * interp/format.boot ($abbreviateJoin): Define here. + +2008-02-02 Gabriel Dos Reis <gdr@cs.tamu.edu> + * interp/sys-globals.boot ($consistencyCheck): Remove. ($insideCanCoerceFrom): Define. diff --git a/src/interp/format.boot b/src/interp/format.boot index 3dffd32a..4e948e41 100644 --- a/src/interp/format.boot +++ b/src/interp/format.boot @@ -41,6 +41,8 @@ import '"macros" $formatSigAsTeX := 1 $permitWhere := false +++ +$abbreviateJoin := false --% Formatting modemaps diff --git a/src/interp/i-coerce.boot b/src/interp/i-coerce.boot index 92226235..dbb97309 100644 --- a/src/interp/i-coerce.boot +++ b/src/interp/i-coerce.boot @@ -37,6 +37,7 @@ import '"i-resolv" )package "BOOT" $useCoerceOrCroak := true +$useConvertForCoercions := false --% Algebraic coercions using interactive code diff --git a/src/interp/i-object.boot b/src/interp/i-object.boot index 803244cb..19d27c76 100644 --- a/src/interp/i-object.boot +++ b/src/interp/i-object.boot @@ -73,7 +73,7 @@ objSetMode(obj,mode) == RPLACA(obj,mode) objVal obj == CDR obj objValUnwrap obj == unwrap CDR obj objMode obj == CAR obj -objEnv obj == $NE +objEnv obj == $EmptyEnvironment objCodeVal obj == CADDR obj objCodeMode obj == CADR obj diff --git a/src/interp/nrunfast.boot b/src/interp/nrunfast.boot index 81791987..add8fb88 100644 --- a/src/interp/nrunfast.boot +++ b/src/interp/nrunfast.boot @@ -41,6 +41,9 @@ $doNotCompressHashTableIfTrue := false ++ $lookupDefaults := false +++ +$NRTmonitorIfTrue := false + --======================================================================= -- Basic Functions --======================================================================= diff --git a/src/interp/setq.lisp b/src/interp/setq.lisp index f64336c7..abda3b8f 100644 --- a/src/interp/setq.lisp +++ b/src/interp/setq.lisp @@ -48,10 +48,7 @@ (SETQ |$returnNowhereFromGoGet| NIL) -(SETQ |$abbreviateJoin| NIL) - (SETQ |S:SPADTOK| 'SPADSYSTOK) -(SETQ APLMODE NIL) (SETQ RLGENSYMFG NIL) (SETQ RLGENSYMLST NIL) (SETQ XTOKENREADER 'SPADTOK) @@ -80,14 +77,11 @@ (SETQ |$functorForm| NIL) -(SETQ $NE (LIST (LIST NIL))) (SETQ |$suffix| NIL) -(SETQ |$coerceIntByMapCounter| 0) (SETQ |$prefix| NIL) (SETQ |$formalArgList| ()) (SETQ |$NRTopt| NIL) ;; turns off buggy code -(SETQ |$NRTmonitorIfTrue| NIL) (SETQ |$useConvertForCoercions| NIL) diff --git a/src/interp/setvars.boot b/src/interp/setvars.boot index d1e8b40a..f0f4d933 100644 --- a/src/interp/setvars.boot +++ b/src/interp/setvars.boot @@ -156,7 +156,6 @@ resetWorkspaceVariables() == SETQ($msgDatabase , NIL) SETQ($msgDatabaseName , NIL) SETQ($IOindex , 1 ) - SETQ($coerceIntByMapCounter , 0 ) SETQ($e , $EmptyEnvironment) SETQ($env , [[nil]]) diff --git a/src/interp/spad.lisp b/src/interp/spad.lisp index a05ff9b2..fe1c8dfe 100644 --- a/src/interp/spad.lisp +++ b/src/interp/spad.lisp @@ -80,7 +80,6 @@ (defvar /EDIT-FT 'SPAD) (defvar /RELEASE '"UNKNOWN") (defvar /rp '/RP) -(defvar APLMODE NIL) (defvar error-print) (defvar ind) (defvar INITCOLUMN 0) @@ -96,7 +95,7 @@ (defvar sortpred) (defvar SPADSYSKEY '(EOI EOL)) (defvar STAKCOLUMN -1) -(setq XTOKENREADER 'SPADTOK) +(defvar XTOKENREADER 'SPADTOK) (defvar xtrans '|boot-new|) (defvar |$IOAlist| '((|%i| . (|gauss| 0 1)))) (defvar |InteractiveMode|) |