From 41564143f03fc7ef7fa3a464c2a7df3744e83359 Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Wed, 2 Nov 2011 19:04:24 +0000
Subject: 	* interp/lisplib.boot (findModule): Tidy. 	(loadLib):
 Exit early on builtin constructors. 	(loadDB): Likewise.

---
 src/interp/lisplib.boot | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'src/interp')

diff --git a/src/interp/lisplib.boot b/src/interp/lisplib.boot
index 9f7de79c..a7ef99c4 100644
--- a/src/interp/lisplib.boot
+++ b/src/interp/lisplib.boot
@@ -238,7 +238,11 @@ rwriteLispForm(key,form) ==
 ++ Error if the file container of the module does not exist.
 findModule: %Symbol -> %Maybe %String
 findModule cname ==
-  m := getConstructorModuleFromDB cname or return nil
+  db := constructorDB cname or return nil
+  m :=
+    $buildingSystemAlgebra =>
+      getSystemModulePath symbolName dbAbbreviation db
+    getConstructorModuleFromDB cname
   existingFile? m => m
   strap := algebraBootstrapDir() =>
     m := strconc(strap,PATHNAME_-NAME m,'".",$faslType)
@@ -254,6 +258,7 @@ loadLibIfNotLoaded libName ==
   loadLib libName
  
 loadLib cname ==
+  builtinConstructor? cname => nil  -- these don't have nrlib yet.
   startTimingProcess 'load
   fullLibName := findModule cname or return nil
   systemdir? := isSystemDirectory(pathnameDirectory fullLibName)
@@ -308,10 +313,11 @@ loadDB db ==
     dbBeingDefined? db => nil
     dbLoaded? db => db
     ctor := dbConstructor db
+    builtinConstructor? ctor => nil
     lib := findModule ctor or return nil
     loadModule(lib,ctor)
     dbLoadPath(db) := lib
-    constructorDB ctor
+    db
   finally stopTimingProcess 'load
  
 convertOpAlist2compilerInfo(opalist) ==
-- 
cgit v1.2.3