* interp/define.boot: Remove $LISPLIB.

	* interp/functor.boot: Likewise.
	* interp/lisplib.boot: Likewise.
	* interp/patches.lisp: Likewise.
	* interp/sys-globals.boot: Likewise.

6 files changed, 32 insertions, 36 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 9d358a8d..b6ef1435 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2011-09-05  Gabriel Dos Reis  <gdr@cse.tamu.edu>
+
+	* interp/define.boot: Remove $LISPLIB.
+	* interp/functor.boot: Likewise.
+	* interp/lisplib.boot: Likewise.
+	* interp/patches.lisp: Likewise.
+	* interp/sys-globals.boot: Likewise.
+
 2011-09-05  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
 	* interp/define.boot (compDefineFunctor1): Do not set
diff --git a/src/interp/define.boot b/src/interp/define.boot
index 38854d13..9682de62 100644
--- a/src/interp/define.boot
+++ b/src/interp/define.boot
@@ -1054,8 +1054,7 @@ compDefineCategory2(form,signature,specialCases,body,m,e,
     $lisplibCategory:= formalBody
     dbPrincipals(db) := getParentsFor(db,$FormalMapVariableList,$lisplibCategory)
     dbAncestors(db) := computeAncestorsOf($form,nil)
-    if $LISPLIB then
-      augLisplibModemapsFromCategory([op',:sargl],formalBody,signature')
+    augLisplibModemapsFromCategory([op',:sargl],formalBody,signature')
     dbBeingDefined?(db) := false
     [fun,$Category,e]
 
@@ -1075,7 +1074,7 @@ compDefineCategory(df,m,e,prefix,fal) ==
   kind := getConstructorKindFromDB ctor
   kind ~= "category" => throwKeyedMsg("S2IC0016",[ctor,"category",kind])
   dbConstructorForm(constructorDB ctor) := lhs
-  $insideFunctorIfTrue or $LISPLIB = nil or $compileDefaultsOnly =>
+  $insideFunctorIfTrue or $compileDefaultsOnly =>
     compDefineCategory1(df,m,e,prefix,fal)
   compDefineLisplib(df,m,e,prefix,fal,'compDefineCategory1)
 
@@ -1311,7 +1310,6 @@ compDefineFunctor(df,m,e,prefix,fal) ==
   $domainShell: local := nil -- holds the category of the object being compiled
   $profileCompiler: local := true
   $profileAlist:    local := nil
-  $LISPLIB = nil => compDefineFunctor1(df,m,e,prefix,fal)
   compDefineLisplib(df,m,e,prefix,fal,'compDefineFunctor1)
  
 compDefineFunctor1(df is ['DEF,form,signature,nils,body],
@@ -1408,8 +1406,7 @@ compDefineFunctor1(df is ['DEF,form,signature,nils,body],
     fun:= compile applySubst($pairlis, [op',[lamOrSlam,argl,body']])
     --The above statement stops substitutions gettting in one another's way
     operationAlist := applySubst($pairlis,$lisplibOperationAlist)
-    if $LISPLIB then
-      augmentLisplibModemapsFromFunctor(parForm,operationAlist,parSignature)
+    augmentLisplibModemapsFromFunctor(parForm,operationAlist,parSignature)
     reportOnFunctorCompilation()
  
     --  5. give operator a 'modemap property
@@ -1419,20 +1416,19 @@ compDefineFunctor1(df is ['DEF,form,signature,nils,body],
     dbPrincipals(db) := getParentsFor(db,$FormalMapVariableList,$lisplibCategory)
     dbAncestors(db) := computeAncestorsOf($form,nil)
     $insideFunctorIfTrue:= false
-    if $LISPLIB then
-      if not $bootStrapMode then
-        $NRTslot1Info := NRTmakeSlot1Info()
-        libFn := getConstructorAbbreviationFromDB op'
-        $lookupFunction: local :=
-            NRTgetLookupFunction($functorForm,modemap.mmTarget,$NRTaddForm,$e)
-            --either lookupComplete (for forgetful guys) or lookupIncomplete
-        $byteAddress :local := 0
-        $byteVec :local := nil
-        $NRTslot1PredicateList :=
-          [simpBool x for x in $NRTslot1PredicateList]
-        LAM_,FILEACTQ('loadTimeStuff,
-          ['MAKEPROP,MKQ $op,''infovec,getInfovecCode()])
-      $lisplibOperationAlist:= operationAlist
+    if not $bootStrapMode then
+      $NRTslot1Info := NRTmakeSlot1Info()
+      libFn := getConstructorAbbreviationFromDB op'
+      $lookupFunction: local :=
+          NRTgetLookupFunction($functorForm,modemap.mmTarget,$NRTaddForm,$e)
+          --either lookupComplete (for forgetful guys) or lookupIncomplete
+      $byteAddress :local := 0
+      $byteVec :local := nil
+      $NRTslot1PredicateList :=
+        [simpBool x for x in $NRTslot1PredicateList]
+      LAM_,FILEACTQ('loadTimeStuff,
+        ['MAKEPROP,MKQ $op,''infovec,getInfovecCode()])
+    $lisplibOperationAlist:= operationAlist
     -- Functors are incomplete during bootstrap
     if $bootStrapMode then
       evalAndRwriteLispForm('%incomplete,
@@ -1966,7 +1962,7 @@ compile u ==
     u:= [op',lamExpr]
   -- If just updating certain functions, check for previous existence.
   -- Deduce old sequence number and use it (items have been skipped).
-  if $LISPLIB and $compileOnlyCertainItems then
+  if $compileOnlyCertainItems then
     parts := splitEncodedFunctionName(u.op, ";")
   --  Next line JHD/SMWATT 7/17/86 to deal with inner functions
     parts='inner => $savableItems:=[u.op,:$savableItems]
diff --git a/src/interp/functor.boot b/src/interp/functor.boot
index 33e7c592..62738ea8 100644
--- a/src/interp/functor.boot
+++ b/src/interp/functor.boot
@@ -801,9 +801,8 @@ encodeFunctionName(fun,package is [packageName,:arglist],signature,sep,count)
           strconc(STRINGIMAGE n,encodeItem x)
     encodedName:= INTERNL(getConstructorAbbreviationFromDB packageName,";",
         encodeItem fun,";",encodedSig, sep,STRINGIMAGE count)
-    if $LISPLIB then
-      $lisplibSignatureAlist:=
-        [[encodedName,:signature'],:$lisplibSignatureAlist]
+    $lisplibSignatureAlist :=
+      [[encodedName,:signature'],:$lisplibSignatureAlist]
     encodedName
 
 ++ Return the linkage name of the local operation named `op'.
diff --git a/src/interp/lisplib.boot b/src/interp/lisplib.boot
index 72ac576d..a2841b70 100644
--- a/src/interp/lisplib.boot
+++ b/src/interp/lisplib.boot
@@ -225,8 +225,7 @@ putFileProperty(fn,ft,id,val) ==
  
 lisplibWrite(prop,val,filename) ==
   -- this may someday not write nil keys, but it will now
-  if $LISPLIB then
-     rwrite128(prop,val,filename)
+  rwrite128(prop,val,filename)
  
 rwrite128(key,value,stream) ==
   rwrite(key,value,stream)
@@ -236,9 +235,8 @@ evalAndRwriteLispForm(key,form) ==
   rwriteLispForm(key,form)
  
 rwriteLispForm(key,form) ==
-  if $LISPLIB then
-    rwrite( key,form,$libFile)
-    LAM_,FILEACTQ(key,form)
+  rwrite( key,form,$libFile)
+  LAM_,FILEACTQ(key,form)
  
 getLisplib(name,id) ==
   -- this version does cache the returned value
@@ -443,7 +441,6 @@ compileConstructorLib(l,op,editFlag,traceFlag) ==
  
 compConLib1(fun,infileOrNil,outfileOrNil,auxOp,editFlag,traceFlag) ==
   $PrettyPrint: local := 'T
-  $LISPLIB: local := 'T
   $lisplibPredicates: local := nil
   $lisplibModemapAlist: local := nil
   $lisplibOperationAlist: local := nil
@@ -465,7 +462,6 @@ compConLib1(fun,infileOrNil,outfileOrNil,auxOp,editFlag,traceFlag) ==
 compDefineLisplib(df:=["DEF",[op,:.],:.],m,e,prefix,fal,fn) ==
   --fn= compDefineCategory1 OR compDefineFunctor1
   sayMSG fillerSpaces(72,char "-")
-  $LISPLIB: local := 'T
   $op: local := op
   $lisplibPredicates: local := nil -- set by makePredicateBitVector
   $lisplibModemapAlist: local := nil
diff --git a/src/interp/patches.lisp b/src/interp/patches.lisp
index f9ec2f50..62e8eb3e 100644
--- a/src/interp/patches.lisp
+++ b/src/interp/patches.lisp
@@ -72,8 +72,8 @@
   (declare (special |$Echo|))
   (/RF-1 nil))
 
-(defun |/RQ,LIB| (&rest foo &aux (|$Echo| nil) ($LISPLIB T))
-  (declare (special |$Echo| $LISPLIB))
+(defun |/RQ,LIB| (&rest foo &aux (|$Echo| nil))
+  (declare (special |$Echo|))
   (/RF-1 nil))
 
 (defun /RF-1 (ignore)
diff --git a/src/interp/sys-globals.boot b/src/interp/sys-globals.boot
index e2f7bd5d..a1167b39 100644
--- a/src/interp/sys-globals.boot
+++ b/src/interp/sys-globals.boot
@@ -291,9 +291,6 @@ $printLoadMsgs := false
 $reportCompilation := false
 
 ++
-$LISPLIB := false
-
-++
 $CategoryFrame :=
   '((((Category (modemap (((Category) (Category)) (T *))))_
       (Join (modemap (((Category) (Category) (Category)) (T *))_