X-Git-Url: http://git.hcoop.net/clinton/domtool2.git/blobdiff_plain/8d06030c085c5ae1d186b679bd142a04055cc239..d63aa5e7b08630cc17a606e85e35acc5bd0041ee:/src/main.sml

diff --git a/src/main.sml b/src/main.sml
index 1552791..fe93791 100644
--- a/src/main.sml
+++ b/src/main.sml
@@ -51,7 +51,7 @@ fun check' G fname =
 		 ()
 	     else
 		 Option.app (Unused.check G) (#3 prog);
-	     Tycheck.checkFile G (Defaults.tInit prog) prog)
+	     Tycheck.checkFile G prog)
     end
 
 fun basis () =
@@ -101,7 +101,7 @@ fun check G fname =
 		    raise ErrorMsg.Error
 		else
 		    let
-			val G' = Tycheck.checkFile G (Defaults.tInit prog) prog
+			val G' = Tycheck.checkFile G prog
 		    in
 			if !ErrorMsg.anyErrors then
 			    raise ErrorMsg.Error
@@ -1149,7 +1149,9 @@ fun regenerateEither tc checker context =
 			     ok := false)
 			else
 			    ();
-			ignore (foldl checker' (basis (), Defaults.eInit ()) files)
+			let val basis' = basis () in
+			    ignore (foldl checker' (basis', Env.initialDynEnvVals basis') files)
+			end
 		    end
 		else if String.isSuffix "_admin" user then
 		    ()    
@@ -1314,7 +1316,9 @@ fun service () =
 				 end
 			 in
 			     doIt (fn () => (Env.pre ();
-					     ignore (foldl doOne (basis (), Defaults.eInit ()) codes);
+					     let val basis' = basis () in
+						 ignore (foldl doOne (basis', Env.initialDynEnvVals basis') codes)
+					     end;
 					     Env.post ();
 					     Msg.send (bio, MsgOk);
 					     ("Configuration complete.", NONE)))