--- sml/trunk/src/cm/semant/semant.sml	1999/05/08 13:53:45	267
+++ sml/trunk/src/cm/semant/semant.sml	1999/05/10 07:00:02	268
@@ -10,7 +10,7 @@
     exception ExplicitError of string
     exception ExpressionError of exn
 
-    type pathname
+    type pathname = AbsPath.t
     type ml_symbol
     type cm_symbol
 
@@ -97,7 +97,7 @@
 
     type group = unit
 
-    type environment = MemberCollection.environment
+    type environment = MemberCollection.collection
 
     type perms = { required : StringSet.set, granted : StringSet.set }
 
@@ -142,14 +142,10 @@
 	     { required = required, granted = StringSet.add (granted, s) })
     end
 
-    fun emptyMembers env = MemberCollection.empty
-    fun member (f, c) env = MemberCollection.expandOne (f, c)
-    fun members (m1, m2) env = let
-	val c1 = m1 env
-	val c2 = m2 (MemberCollection.envOf c1)
-    in
-	MemberCollection.sequential (c1, c2)
-    end
+    fun emptyMembers env = env
+    fun member (f, c) env =
+	MemberCollection.sequential (env, MemberCollection.expandOne (f, c))
+    fun members (m1, m2) env = m2 (m1 env)
     fun guarded_members (c, (m1, m2)) env =
 	if saveEval (c, env) then m1 env else m2 env
     fun error_member m env = raise ExplicitError m

<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: =
 	if saveEval (c, env) then m1 env else m2 env
     fun error_member m env = raise ExplicitError m</div>
</div></div>
</body></html>