X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/d63aa5e7b08630cc17a606e85e35acc5bd0041ee..93187cb61e59720a87eeedd0a7f941c69b6a558f:/src/main.sml

diff --git a/src/main.sml b/src/main.sml
index fe93791..cc35c62 100644
--- a/src/main.sml
+++ b/src/main.sml
@@ -194,6 +194,8 @@ fun reduce G fname =
 
 (*(Defaults.eInit ())*)
 
+val toplevel = Env.initialDynEnvVals Reduce.reduceExp
+
 fun eval G evs fname =
     case reduce G fname of
 	(G, SOME body') =>
@@ -201,7 +203,7 @@ fun eval G evs fname =
 	    raise ErrorMsg.Error
 	else
 	    let
-		val evs' = Eval.exec' evs body'
+		val evs' = Eval.exec' (toplevel G, evs) body'
 	    in
 		(G, evs')
 	    end
@@ -1150,7 +1152,7 @@ fun regenerateEither tc checker context =
 			else
 			    ();
 			let val basis' = basis () in
-			    ignore (foldl checker' (basis', Env.initialDynEnvVals basis') files)
+			    ignore (foldl checker' (basis', SM.empty) files)
 			end
 		    end
 		else if String.isSuffix "_admin" user then
@@ -1317,7 +1319,7 @@ fun service () =
 			 in
 			     doIt (fn () => (Env.pre ();
 					     let val basis' = basis () in
-						 ignore (foldl doOne (basis', Env.initialDynEnvVals basis') codes)
+						 ignore (foldl doOne (basis', SM.empty) codes)
 					     end;
 					     Env.post ();
 					     Msg.send (bio, MsgOk);