10 files changed, 15 insertions, 41 deletions
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/define.boot b/src/interp/define.boot
index 945b4cc4..725a8bcf 100644
--- a/src/interp/define.boot
+++ b/src/interp/define.boot
@@ -400,7 +400,7 @@ compDefineFunctor1(df is ['DEF,form,signature,$functorSpecialCases,body],
     $NRTloadTimeAlist: local := nil --used for things in slot4 (NRTsetVector4)
     $NRTdomainFormList: local := nil -- of form ((gensym . (Repe...)) ...
     -- the above optimizes the calls to local domains
-    $template: local:= nil --stored in the lisplib (if $NRTvec = true)
+    $template: local:= nil --stored in the lisplib
     $functionLocations: local := nil --locations of defined functions in source
     -- generate slots for arguments first, then for $NRTaddForm in compAdd
     for x in argl repeat NRTgetLocalIndex x
diff --git a/src/interp/nruncomp.boot b/src/interp/nruncomp.boot
index d986a708..b0eeb807 100644
--- a/src/interp/nruncomp.boot
+++ b/src/interp/nruncomp.boot
@@ -391,9 +391,7 @@ buildFunctor($definition is [name,:args],sig,code,$locals,$e) ==
   domainShell := GETREFV ($NRTbase + $NRTdeltaLength)
   for i in 0..4 repeat domainShell.i := $domainShell.i
     --we will clobber elements; copy since $domainShell may be a cached vector
-  $template :=
-    $NRTvec = true => GETREFV ($NRTbase + $NRTdeltaLength)
-    nil
+  $template := GETREFV ($NRTbase + $NRTdeltaLength)
   $catvecList:= [domainShell,:[emptyVector for u in CADR domainShell.4]]
   $catNames := ['$] -- for DescendCode -- to be changed below for slot 4
   $maximalViews:= nil
@@ -412,19 +410,16 @@ buildFunctor($definition is [name,:args],sig,code,$locals,$e) ==
   storeOperationCode:= DescendCode(code,true,nil,first $catNames)
   outsideFunctionCode:= NRTaddDeltaCode()
   storeOperationCode:= NRTputInLocalReferences storeOperationCode
-  if $NRTvec = true then
-    NRTdescendCodeTran(storeOperationCode,nil) --side effects storeOperationCode
+  NRTdescendCodeTran(storeOperationCode,nil) --side effects storeOperationCode
   codePart2:=
-    $NRTvec = true =>
-      argStuffCode :=
-        [[$setelt,'$,i,v] for i in $NRTbase.. for v in $FormalMapVariableList
-          for arg in rest $definition]
-      if MEMQ($NRTaddForm,$locals) then
-         addargname := $FormalMapVariableList.(POSN1($NRTaddForm,$locals))
-         argStuffCode := [[$setelt,'$,5,addargname],:argStuffCode]
-      [['stuffDomainSlots,'$],:argStuffCode,
-         :predBitVectorCode2,storeOperationCode]
-    [:outsideFunctionCode,storeOperationCode]
+    argStuffCode :=
+      [[$setelt,'$,i,v] for i in $NRTbase.. for v in $FormalMapVariableList
+	for arg in rest $definition]
+    if MEMQ($NRTaddForm,$locals) then
+       addargname := $FormalMapVariableList.(POSN1($NRTaddForm,$locals))
+       argStuffCode := [[$setelt,'$,5,addargname],:argStuffCode]
+    [['stuffDomainSlots,'$],:argStuffCode,
+       :predBitVectorCode2,storeOperationCode]
 
   $CheckVectorList := NRTcheckVector domainShell
 --CODE: part 1
@@ -594,9 +589,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 d791335a..5903b539 100644
--- a/src/interp/nrunfast.boot
+++ b/src/interp/nrunfast.boot
@@ -36,20 +36,14 @@ import '"c-util"
 )package "BOOT"
 
 ++
-$doNotCompressHashTableIfTrue := false
+$doNotCompressHashTableIfTrue := true
 
 --=======================================================================
 --                     Basic Functions
 --=======================================================================
 initNewWorld() ==
-  $NRTflag := true
-  $NRTvec := true
-  $NRTmakeCompactDirect := true
   $NRTquick := true
-  $NRTmakeShortDirect := true
-  $newWorld := true
   $monitorNewWorld := false
-  $consistencyCheck := false
   $spadLibFT := 'NRLIB
   $NRTmonitorIfTrue := false
   $updateCatTableIfTrue := false
diff --git a/src/interp/patches.lisp b/src/interp/patches.lisp
index 21f12ec1..6b993ceb 100644
--- a/src/interp/patches.lisp
+++ b/src/interp/patches.lisp
@@ -221,8 +221,6 @@
 (define-function '|isLowerCaseLetter| #'LOWER-CASE-P)
 (define-function '|isUpperCaseLetter| #'UPPER-CASE-P)
 (define-function '|isLetter| #'ALPHA-CHAR-P)
-;; reset from /spad/lisp/setq.lisp
-(setq |$consistencyCheck| ()) ;; prevents wasting time checking consistency
 
 
 #+(or :CCL (and :lucid :ibm/370))
diff --git a/src/interp/setq.lisp b/src/interp/setq.lisp
index 8ea2c57a..84f053d7 100644
--- a/src/interp/setq.lisp
+++ b/src/interp/setq.lisp
@@ -74,7 +74,6 @@
 (SETQ |$displayParserOutput| 'T)
 
 (SETQ |$insideReadRulesIfTrue| NIL)
-(SETQ |$consistencyCheck| 'T)
 (SETQ |$useUndo| NIL)
 (SETQ |$ruleSetsInitialized| NIL)
 
@@ -83,10 +82,7 @@
 
 (SETQ |$htPrecedenceTable| NIL)
 
-(SETQ |$NRTmakeCompactDirect| NIL)
 (SETQ |$NRTquick| NIL)
-(SETQ |$NRTmakeShortDirect| NIL)
-(SETQ |$newWorld| NIL)
 (SETQ |$returnNowhereFromGoGet| NIL)
 
 (SETQ |$insideCanCoerceFrom| NIL)
@@ -174,7 +170,6 @@
 (SETQ |$prefix| NIL)
 (SETQ |$formalArgList| ())
 
-(SETQ |$NRTflag| T)
 (SETQ |$NRTaddForm| NIL)
 (SETQ |$NRTdeltaList| NIL)
 (SETQ |$NRTdeltaLength| 0)
diff --git a/src/interp/sys-globals.boot b/src/interp/sys-globals.boot
index 1cd31a55..c72ab519 100644
--- a/src/interp/sys-globals.boot
+++ b/src/interp/sys-globals.boot
@@ -82,9 +82,6 @@ $compCount := 0
 $compUniquelyIfTrue := false
 
 ++
-$consistencyCheck := true
-
-++
 $ConstructorCache := MAKE_-HASHTABLE "ID"
 
 ++
diff --git a/src/interp/wi2.boot b/src/interp/wi2.boot
index 45fa17f3..5e9ed89a 100644
--- a/src/interp/wi2.boot
+++ b/src/interp/wi2.boot
@@ -131,7 +131,7 @@ compDefineFunctor1(df, m,$e,$prefix,$formalArgList) ==
     $NRTloadTimeAlist: local := nil --used for things in slot4 (NRTsetVector4)
     $NRTdomainFormList: local := nil -- of form ((gensym . (Repe...)) ...
     -- the above optimizes the calls to local domains
-    $template: local:= nil --stored in the lisplib (if $NRTvec = true)
+    $template: local:= nil --stored in the lisplib
     $functionLocations: local := nil --locations of defined functions in source
     -- generate slots for arguments first, then for $NRTaddForm in compAdd
     for x in argl repeat NRTgetLocalIndex x
@@ -651,7 +651,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]
   markImport mc