--- sml/trunk/src/cm/bootstrap/btcompile.sml	1999/10/22 17:10:09	450
+++ sml/trunk/src/cm/bootstrap/btcompile.sml	1999/10/23 15:05:55	451
@@ -35,7 +35,9 @@
 
     (* instantiate Stabilize... *)
     structure Stabilize =
-	StabilizeFn (fun destroy_state _ i = Compile.evict i
+	StabilizeFn (fun destroy_state _ i =
+			 (Compile.evict i;
+			  Servers.evict i)
 		     structure MachDepVC = MachDepVC
 		     fun recomp gp g = let
 			 val { store, get } = BFC.new ()
@@ -234,11 +236,8 @@
 		        { corenv = corenv }
 	    val stab =
 		if deliver then SOME true else NONE
-
-	    (* We need to announce the project here because Parse.parse
-	     * may already invoke the compiler (because of "deliver"). *)
-	    val _ = Servers.cmb dirbase
 	in
+	    Servers.cmb dirbase;
 	    case Parse.parse NONE param stab maingspec of
 		NONE => NONE
 	      | SOME (g, gp) => let
@@ -313,7 +312,7 @@
     fun compile deliver dbopt =
 	case mk_compile deliver dbopt of
 	    NONE => false
-	  | SOME (_, thunk) => thunk () before Servers.waitforall ()
+	  | SOME (_, thunk) => thunk () before Servers.reset ()
 
     local
 	fun slave dirbase =
@@ -323,7 +322,7 @@
 		    val trav = Compile.newSbnodeTraversal () gp
 		    fun trav' sbn = isSome (trav sbn)
 		in
-		    SOME (g, gp, trav')
+		    SOME (g, trav', Compile.evict)
 		end
     in
 	val _ = CMBSlaveHook.init slave

<script type="text/javascript">//<![CDATA[
		function toggle_ffErrors() {
			var errorsblock = document.getElementById("ffErrorsBlock");
			var errorsgroup = document.getElementById("ffErrors");
			if (errorsblock.style.display == "none") {
				errorsblock.style.display = "block";
				errorsgroup.style.right = "10px";
			} else {
				errorsblock.style.display = "none";
				errorsgroup.style.right = "300px";
			}
		}
//]]></script>
<div id="ffErrors">
<a href="javascript:toggle_ffErrors();">Click to toggle</a>
<div id="ffErrorsBlock">
	<div class="error">does not end with &lt;/html&gt; tag</div>
	<div class="error">does not end with &lt;/body&gt; tag</div>
	<div class="info">The output has ended thus: g, gp, trav')
+		    SOME (g, trav', Compile.evict)
 		end
     in
 	val _ = CMBSlaveHook.init slave</div>
</div></div>
</body></html>