* interp/sys-globals.boot ($clamList): Do not include hasFileProperty.

	* interp/database.boot (loadDBIfnecessary): Tidy.
	* interp/clammed.boot (hasFileProperty): Remove as unused.
	* interp/lisplib.boot (putFileProperty): Likewise.
	(getLisplib): Likewise.
	(getLisplibNoCache): Likewise.
	(getFileProperty): Likewise.
	(hasfilePropertyNoCache): Likewise.
	(unInstantiate): Likewise.
	(killNestedInstantiations): Likewise.
	(isNestedInstantiations): Likewise.
	(loadFunctor): Likewise.
	(getLisplibVersion): Likewise.
	(Operators): Likewise.
	(compDefineLisplib): Don't LOCALDATABASE if building system algebra.

6 files changed, 23 insertions, 77 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 66b06063..f286dfef 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,23 @@
 2011-09-07  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
+	* interp/sys-globals.boot ($clamList): Do not include hasFileProperty.
+	* interp/database.boot (loadDBIfnecessary): Tidy.
+	* interp/clammed.boot (hasFileProperty): Remove as unused.
+	* interp/lisplib.boot (putFileProperty): Likewise.
+	(getLisplib): Likewise.
+	(getLisplibNoCache): Likewise.
+	(getFileProperty): Likewise.
+	(hasfilePropertyNoCache): Likewise.
+	(unInstantiate): Likewise.
+	(killNestedInstantiations): Likewise.
+	(isNestedInstantiations): Likewise.
+	(loadFunctor): Likewise.
+	(getLisplibVersion): Likewise.
+	(Operators): Likewise.
+	(compDefineLisplib): Don't LOCALDATABASE if building system algebra.
+
+2011-09-07  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
 	* interp/lisplib.boot (finalizeLisplib): Finalize documentaion
 	only if not bootstrapping.
 	(isFunctor): Tidy.
diff --git a/src/interp/clammed.boot b/src/interp/clammed.boot
index 79e9e788..80b4a8db 100644
--- a/src/interp/clammed.boot
+++ b/src/interp/clammed.boot
@@ -67,9 +67,6 @@ coerceConvertMmSelection(funName,m1,m2) ==
     hasCorrectTarget(m2,sig) and sig is [dc,targ,oarg] and oarg = m1]
   mmS and first mmS
 
-hasFileProperty(p,id,abbrev) ==
-  hasFilePropertyNoCache(p,id,abbrev)
-
 ++ Note: this function is used in the algebra part.
 isValidType form ==
   -- returns true IFF form is a type whose arguments satisfy the
diff --git a/src/interp/database.boot b/src/interp/database.boot
index 632867f3..c4a42992 100644
--- a/src/interp/database.boot
+++ b/src/interp/database.boot
@@ -833,5 +833,4 @@ dbLoaded? db ==
 loadDBIfNecessary db ==
   ctor := dbConstructor db
   dbLoaded? db => db
-  loadLib ctor or return nil
-  constructorDB ctor
+  loadDB db
diff --git a/src/interp/lisplib.boot b/src/interp/lisplib.boot
index abdf8e04..4d7d0d7c 100644
--- a/src/interp/lisplib.boot
+++ b/src/interp/lisplib.boot
@@ -217,12 +217,6 @@ writeLib(fn,ft) == writeLib1(fn,ft,"*")
  
 writeLib1(fn,ft,fm) == RDEFIOSTREAM [['FILE,fn,ft,fm],'(MODE . OUTPUT)]
  
-putFileProperty(fn,ft,id,val) ==
-  fnStream:= writeLib1(fn,ft,"*")
-  val:= rwrite( id,val,fnStream)
-  RSHUT fnStream
-  val
- 
 lisplibWrite(prop,val,filename) ==
   -- this may someday not write nil keys, but it will now
   rwrite128(prop,val,filename)
@@ -238,51 +232,6 @@ rwriteLispForm(key,form) ==
   rwrite( key,form,$libFile)
   LAM_,FILEACTQ(key,form)
  
-getLisplib(name,id) ==
-  -- this version does cache the returned value
-  getFileProperty(name,$spadLibFT,id,true)
- 
-getLisplibNoCache(name,id) ==
-  -- this version does not cache the returned value
-  getFileProperty(name,$spadLibFT,id,false)
- 
-getFileProperty(fn,ft,id,cache) ==
-  fn in '(DOMAIN SUBDOM MODE) => nil
-  p := pathname [fn,ft,'"*"] or return nil
-  cache => hasFileProperty(p,id,fn)
-  hasFilePropertyNoCache(p,id,fn)
- 
-hasFilePropertyNoCache(p,id,abbrev) ==
-  -- it is assumed that the file exists and is a proper pathname
-  -- startTimingProcess 'diskread
-  fnStream:= readLibPathFast p
-  null fnStream => nil
-  -- str:= object2String id
-  val:= rread(id,fnStream, nil)
-  RSHUT fnStream
-  -- stopTimingProcess 'diskread
-  val
- 
---% Uninstantiating
- 
-unInstantiate(clist) ==
-  for c in clist repeat
-    clearConstructorCache(c)
-  killNestedInstantiations(clist)
- 
-killNestedInstantiations(deps) ==
-  for key in HKEYS($ConstructorCache)
-    repeat
-      for [arg,count,:inst] in tableValue($ConstructorCache,key) repeat
-        isNestedInstantiation(inst.0,deps) =>
-          HREMPROP($ConstructorCache,key,arg)
- 
-isNestedInstantiation(form,deps) ==
-  form is [op,:argl] =>
-    symbolMember?(op,deps) => true
-    or/[isNestedInstantiation(x,deps) for x in argl]
-  false
- 
 --% Loading
 
 ++ Return a path to the loadable module that contains the
@@ -363,6 +312,7 @@ loadDB db ==
     lib := findModule ctor or return nil
     loadModule(lib,ctor)
     dbLoadPath(db) := lib
+    constructorDB ctor
   finally stopTimingProcess 'load
  
 convertOpAlist2compilerInfo(opalist) ==
@@ -387,11 +337,6 @@ updateCategoryFrameForCategory(category) ==
      put(category, 'isCategory, 'T,
          addModemap(category, dc, sig, pred, impl, $CategoryFrame))
 
-loadFunctor u ==
-  cons? u => loadFunctor first u
-  loadLibIfNotLoaded u
-  u
- 
 makeConstructorsAutoLoad() ==
   for cnam in allConstructors() repeat
     builtinCategoryName? cnam => nil
@@ -497,6 +442,7 @@ compDefineLisplib(df:=["DEF",[op,:.],:.],m,e,prefix,fal,fn) ==
   FRESH_-LINE $algebraOutputStream
   sayMSG fillerSpaces(72,char "-")
   unloadOneConstructor op
+  $buildingSystemAlgebra => res
   LOCALDATABASE([symbolName getConstructorAbbreviationFromDB op],nil)
   $newConlist := [op, :$newConlist]  ---------->  bound in function "compiler"
   res
@@ -511,12 +457,6 @@ compileDocumentation(ctor,libName) ==
   $REPLACE([libName,$spadLibFT],[libName,'DOCLB])
   ['dummy, $EmptyMode, $e]
 
-getLisplibVersion libName ==
-  stream := RDEFIOSTREAM [['FILE,libName,$spadLibFT],['MODE, :'I]]
-  version:= second rread('VERSION, stream,nil)
-  RSHUT(stream)
-  version
- 
 initializeLisplib libName ==
   _$ERASE(libName,'ERRORLIB,$libraryDirectory)
   resetErrorCount()
@@ -639,14 +579,6 @@ mergeSignatureAndLocalVarAlists(signatureAlist, localVarAlist) ==
   [[funcName,:[signature,:LASSOC(funcName,localVarAlist)]] for
     [funcName, :signature] in signatureAlist]
  
-Operators u ==
-  u isnt [.,:.] => []
-  first u isnt [.,:.] =>
-    answer:="union"/[Operators v for v in rest u]
-    symbolMember?(first u,answer) => answer
-    [first u,:answer]
-  "union"/[Operators v for v in u]
- 
 getConstructorOpsAndAtts(form,kind,modemap) ==
   kind is 'category => getCategoryOpsAndAtts(form)
   getFunctorOpsAndAtts(form,modemap)
@@ -784,6 +716,7 @@ getSlotFromCategoryForm (x,index) ==
  
 isDomainForm(D,e) ==
   op := opOf D
+  not ident? op => false
   --added for MPOLY 3/83 by RDJ
   symbolMember?(op,$SpecialDomainNames) or isFunctor op or
      ((getmode(op,e) is ['Mapping,target,:.]) and isCategoryForm(target,e)) or
diff --git a/src/interp/sys-globals.boot b/src/interp/sys-globals.boot
index a1167b39..c9abeef9 100644
--- a/src/interp/sys-globals.boot
+++ b/src/interp/sys-globals.boot
@@ -66,7 +66,6 @@ $clamList :=
   '((canCoerce hash UEQUAL count)                 _
     (canCoerceFrom hash UEQUAL count)             _
     (coerceConvertMmSelection hash UEQUAL count)  _
-    (hasFileProperty hash UEQUAL count)           _
     (isLegitimateMode hash UEQUAL count)          _
     (isValidType hash UEQUAL count)               _
     (resolveTT hash UEQUAL count)                 _
diff --git a/src/interp/trace.boot b/src/interp/trace.boot
index ab1890b5..9d079469 100644
--- a/src/interp/trace.boot
+++ b/src/interp/trace.boot
@@ -536,7 +536,7 @@ traceDomainConstructor(domainConstructor,options) ==
   -- Trace all domains built with the given domain constructor,
   -- including all presently instantiated domains, and all future
   -- instantiations, while domain constructor is traced.
-  loadFunctor domainConstructor
+  loadLibIfNotLoaded domainConstructor
   listOfLocalOps := getOption("LOCAL",options)
   if listOfLocalOps then
     traceDomainLocalOps(domainConstructor,listOfLocalOps,