--- sml/trunk/src/compiler/FLINT/cps/convert.sml	1999/09/05 22:49:38	422
+++ sml/trunk/src/compiler/FLINT/cps/convert.sml	1999/09/06 02:32:11	423
@@ -21,7 +21,7 @@
       structure DI = DebIndex
       structure F  = FLINT
       structure FU = FlintUtil
-      structure M  = IntmapF
+      structure M  = IntBinaryMap
 
       open CPS 
 in
@@ -412,7 +412,7 @@
 				 (vl,
 				  FIX([(KNOWN_TAIL, f', vl', cl',
 					(* add the function to the tail map *)
-					loop' (M.add(m,f,f')) (e, kont))],
+					loop' (M.insert(m,f,f')) (e, kont))],
 				      APP(VAR f', map VAR (tl vl))))
 			     end
 			      | _ => (k::(map #1 vts), loop(e, kont))
@@ -422,16 +422,16 @@
 	    end
           | F.APP(f as F.VAR lv, vs) =>
 	    (* first check if it's a recursive call to a tail loop *)
-	    (let val f' = M.lookup m lv
-	    in APP(VAR f', lpvars vs)
-	    end handle M.IntmapF =>
-		     (* code for the non-tail case.
-		      * Sadly this is *not* exceptional *)
-		     let val (hdr, F) = preventEta c
-			 val vf = lpvar f
-			 val ul = lpvars vs
-		     in hdr(APP(vf, F::ul))
-		     end)
+	    (case M.find(m, lv)
+	      of SOME f' => APP(VAR f', lpvars vs)
+	       | NONE =>
+		 (* code for the non-tail case.
+		  * Sadly this is *not* exceptional *)
+		 let val (hdr, F) = preventEta c
+		     val vf = lpvar f
+		     val ul = lpvars vs
+		 in hdr(APP(vf, F::ul))
+		 end)
           | F.APP _ => bug "unexpected APP in convert"
      	  
           | (F.TFN _ | F.TAPP _) =>

<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:          | F.APP _ =&gt; bug &quot;unexpected APP in convert&quot;
      	  
           | (F.TFN _ | F.TAPP _) =&gt;</div>
</div></div>
</body></html>