* interp/sys-globals.boot ($consistencyCheck): Remove.

	($insideCanCoerceFrom): Define.
	* interp/setq.lisp: Remove more unused variables.
	* interp/patches.lisp (/RF-1): Tidy.
	* interp/server.boot (parseAndInterpret): Likewise.
	* interp/packtran.boot ($useNewParser): Remove.
	* interp/ht-util.boot (parseAndEval): Tidy.
	* interp/clam.boot ($failed): Define.
	* interp/g-timer.boot ($printStorageIfTrue): Likewise.
	* interp/hashcode.boot ($DomainsWithoutLisplibs): Likewise.
	* interp/i-coerce.boot ($useCoerceOrCroak): Likewise.
	* interp/i-analy.boot ($univariateDomains): Likewise.
	($multivariateDomains): Likewise.
	* interp/i-object.boot ($useIntegerSubdomain): Likewise.
	* interp/i-syscmd.boot ($existingFiles): Likewise.
	* interp/newfort.boot ($fortranArrayStartingIndex): Likewise.
	* interp/setvars.boot (resetWorkspaceVariables): Don't reset
	$dependeeClosureAlist. 

8 files changed, 32 insertions, 19 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 50a905f8..ff7ce709 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,26 @@
 2008-02-02  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
+	* interp/sys-globals.boot ($consistencyCheck): Remove.
+	($insideCanCoerceFrom): Define.
+	* interp/setq.lisp: Remove more unused variables.
+	* interp/patches.lisp (/RF-1): Tidy.
+	* interp/server.boot (parseAndInterpret): Likewise.
+	* interp/packtran.boot ($useNewParser): Remove.
+	* interp/ht-util.boot (parseAndEval): Tidy.
+	* interp/clam.boot ($failed): Define.
+	* interp/g-timer.boot ($printStorageIfTrue): Likewise.
+	* interp/hashcode.boot ($DomainsWithoutLisplibs): Likewise.
+	* interp/i-coerce.boot ($useCoerceOrCroak): Likewise.
+	* interp/i-analy.boot ($univariateDomains): Likewise.
+	($multivariateDomains): Likewise.
+	* interp/i-object.boot ($useIntegerSubdomain): Likewise.
+	* interp/i-syscmd.boot ($existingFiles): Likewise.
+	* interp/newfort.boot ($fortranArrayStartingIndex): Likewise.
+	* interp/setvars.boot (resetWorkspaceVariables): Don't reset
+	$dependeeClosureAlist. 
+
+2008-02-02  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
 	* interp/setq.lisp: Remove more unused variables.
 	* interp/nruncomp.boot ($Slot1DataBase): Define here.
 	* interp/parse.boot ($oldParserExpandAbbrs): Likewise.
diff --git a/src/interp/apply.boot b/src/interp/apply.boot
index 3da4dd8e..1faf163b 100644
--- a/src/interp/apply.boot
+++ b/src/interp/apply.boot
@@ -220,7 +220,6 @@ compApplyModemap(form,modemap,$e,sl) ==
 --+ information which is no longer valid; thus ignore this index and
 --+ store the signature instead.
 
---$NRTflag=true and f is [op1,d,.] and NE(d,'$) and member(op1,'(ELT CONST)) =>
   f is [op1,d,.] and member(op1,'(ELT CONST Subsumed)) =>
     [genDeltaEntry [op,:modemap],lt',$bindings]
   [f,lt',$bindings]
diff --git a/src/interp/category.boot b/src/interp/category.boot
index c6a411bb..304b943f 100644
--- a/src/interp/category.boot
+++ b/src/interp/category.boot
@@ -451,7 +451,6 @@ JoinInner(l,$e) ==
           if ancindex
              then ($NewCatVec.ancindex:= bname; reallynew:= nil)
              else
-               -- check for $NRTflag until massive algebra recompilation
               if originalVector and (condition=true) then
                 $NewCatVec:= CatEval bname
                 copied:= nil
diff --git a/src/interp/cattable.boot b/src/interp/cattable.boot
index 0da1a93f..c69bb136 100644
--- a/src/interp/cattable.boot
+++ b/src/interp/cattable.boot
@@ -459,7 +459,7 @@ updateCategoryTable(cname,kind) ==
     updateCategoryTableForDomain(cname,getConstrCat(
       GETDATABASE(cname,'CONSTRUCTORCATEGORY)))
 --+
-  kind = 'domain and $NRTflag = true =>
+  kind = 'domain =>
     updateCategoryTableForDomain(cname,getConstrCat(
       GETDATABASE(cname,'CONSTRUCTORCATEGORY)))
 
diff --git a/src/interp/nruncomp.boot b/src/interp/nruncomp.boot
index 71b79c0b..d2730f29 100644
--- a/src/interp/nruncomp.boot
+++ b/src/interp/nruncomp.boot
@@ -54,6 +54,13 @@ $profileCompiler := false
 ++
 $Slot1DataBase := MAKE_-HASHTABLE "ID"
 
+++
+$NRTdeltaList := []
+$NRTdeltaLength := 0
+
+++
+$NRTaddForm := nil
+
 
 -----------------------------NEW buildFunctor CODE-----------------------------
 NRTaddDeltaCode() ==
@@ -567,9 +574,7 @@ NRTsetVector4a(sig,form,cond) ==
 
 NRTmakeSlot1 domainShell ==
   opDirectName := INTERN STRCONC(PNAME first $definition,'";opDirect")
-  fun :=
-    $NRTmakeCompactDirect => '(function lookupInCompactTable)
-    '(function lookupInTable)
+  fun := '(function lookupInCompactTable)
   [($QuickCode=>'QSETREFV;'SETELT), '$,1, ['LIST,fun,'$,opDirectName]]
 
 NRTmakeSlot1Info() ==
diff --git a/src/interp/nrunfast.boot b/src/interp/nrunfast.boot
index 520dda39..81791987 100644
--- a/src/interp/nrunfast.boot
+++ b/src/interp/nrunfast.boot
@@ -45,12 +45,7 @@ $lookupDefaults := false
 --                     Basic Functions
 --=======================================================================
 initNewWorld() ==
-  $NRTflag := true
   $NRTvec := true
-  $NRTmakeCompactDirect := true
-  $NRTquick := true
-  $NRTmakeShortDirect := true
-  $newWorld := true
   $monitorNewWorld := false
   $spadLibFT := 'NRLIB
   $NRTmonitorIfTrue := false
diff --git a/src/interp/rulesets.boot b/src/interp/rulesets.boot
index 0e786f7f..d6e9ae15 100644
--- a/src/interp/rulesets.boot
+++ b/src/interp/rulesets.boot
@@ -35,6 +35,8 @@
 import '"vmlisp"
 )package "BOOT"
 
+$ruleSetsInitialized := false
+
 --% Mode and Type Resolution Rule Data and Ruleset Creation
 
 --% resolveTT Rules
diff --git a/src/interp/setq.lisp b/src/interp/setq.lisp
index eb0202ee..f64336c7 100644
--- a/src/interp/setq.lisp
+++ b/src/interp/setq.lisp
@@ -46,10 +46,6 @@
 (defvar MARG 0)
   ;" Margin for testing by ?OP"
 
-(SETQ |$NRTmakeCompactDirect| NIL)
-(SETQ |$NRTquick| NIL)
-(SETQ |$NRTmakeShortDirect| NIL)
-(SETQ |$newWorld| NIL)
 (SETQ |$returnNowhereFromGoGet| NIL)
 
 (SETQ |$abbreviateJoin| NIL)
@@ -90,10 +86,6 @@
 (SETQ |$prefix| NIL)
 (SETQ |$formalArgList| ())
 
-(SETQ |$NRTflag| T)
-(SETQ |$NRTaddForm| NIL)
-(SETQ |$NRTdeltaList| NIL)
-(SETQ |$NRTdeltaLength| 0)
 (SETQ |$NRTopt| NIL) ;; turns off buggy code
 (SETQ |$NRTmonitorIfTrue| NIL)