--- sml/trunk/src/cm/smlfile/skel-cvt.sml	1999/05/17 14:53:49	278
+++ sml/trunk/src/cm/smlfile/skel-cvt.sml	1999/05/18 08:10:36	279
@@ -163,7 +163,7 @@
 		VarFctExp (symbolModPath path, fsigexpConst constraint)
 	  | BaseFct { params, body, constraint } =>
 		BaseFctExp {
-			    params = map functorParams params,
+			    params = SeqDecl (map functorParams params),
 			    body = c_strexp body,
 			    constraint = sigexpConst constraint
 			   }
@@ -179,8 +179,8 @@
 	val c = c_sigexp constraint
     in
 	case symOpt of
-	    NONE => (NONE,c)
-	  | SOME sym => (SOME sym, c)
+	    NONE => OpenDecl [c]
+	  | SOME sym => StrDecl [{ name = sym, def = c, constraint = NONE }]
     end
 
     and sigexpConst sec =
@@ -198,7 +198,8 @@
 		    SS.add (x, head)
 		  | f _ = raise Fail "decl/convert/c_sigexp" 
 	    in
-		AugStrExp (c_sigexp se, foldr f SS.empty whspecs)
+		LetStrExp (DeclRef (foldr f SS.empty whspecs),
+			   c_sigexp se)
 	    end
 	  | BaseSig specList =>
 		BaseStrExp (SeqDecl (foldr c_spec [] specList))
@@ -215,7 +216,7 @@
 	    VarFsig symbol => VarFctExp (symbolModPath [symbol], NONE)
 	  | BaseFsig { param, result } =>
 		BaseFctExp {
-			    params = map functorParams param,
+			    params = SeqDecl (map functorParams param),
 			    body = c_sigexp result,
 			    constraint = NONE
 			   }

<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: eqDecl (map functorParams param),
 			    body = c_sigexp result,
 			    constraint = NONE
 			   }</div>
</div></div>
</body></html>