X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/d189ec0eee8569e5811335e7fc93a921e14c2b1f..7f012ffdbae5dbee9642fee030647d558b25c8c4:/src/main.sml

diff --git a/src/main.sml b/src/main.sml
index 86da95f..705b20a 100644
--- a/src/main.sml
+++ b/src/main.sml
@@ -22,12 +22,23 @@ structure Main :> MAIN = struct
 
 open Ast Print
 
+structure SM = StringMap
+
 val dmy = ErrorMsg.dummyLoc
 
-val tInit = (TAction ((CRoot, dmy),
-		      StringMap.empty,
-		      StringMap.empty),
-	     dmy)
+val defaultT : record ref = ref SM.empty
+val defaultV : (unit -> exp) SM.map ref = ref SM.empty
+
+fun registerDefault (name, t, v) =
+    case SM.find (!defaultT, name) of
+	NONE => (defaultT := SM.insert (!defaultT, name, t);
+		 defaultV := SM.insert (!defaultV, name, v))
+      | SOME _ => raise Fail "Duplicate default environment variable"
+
+fun tInit () = (TAction ((CRoot, dmy),
+			 !defaultT,
+			 StringMap.empty),
+		dmy)
 
 
 	    
@@ -39,7 +50,7 @@ fun check' G fname =
 	if !ErrorMsg.anyErrors then
 	    G
 	else
-	    Tycheck.checkFile G tInit prog
+	    Tycheck.checkFile G (tInit ()) prog
     end
 
 fun basis () =
@@ -48,10 +59,12 @@ fun basis () =
 
 	fun loop files =
 	    case Posix.FileSys.readdir dir of
-		NONE => files
+		NONE => (Posix.FileSys.closedir dir;
+			 files)
 	      | SOME fname =>
 		if String.isSuffix ".dtl" fname then
-		    loop (String.concatWith "/" [Config.libRoot, fname]
+		    loop (OS.Path.joinDirFile {dir = Config.libRoot,
+					       file = fname}
 			  :: files)
 		else
 		    loop files
@@ -59,12 +72,16 @@ fun basis () =
 	val files = loop []
 	val files = Order.order files
     in
-	foldl (fn (fname, G) => check' G fname) Env.empty files
+	if !ErrorMsg.anyErrors then
+	    Env.empty
+	else
+	    foldl (fn (fname, G) => check' G fname) Env.empty files
     end
 
 fun check fname =
     let
 	val _ = ErrorMsg.reset ()
+	val _ = Env.preTycheck ()
 
 	val b = basis ()
     in
@@ -72,13 +89,14 @@ fun check fname =
 	    (b, NONE)
 	else
 	    let
+		val _ = ErrorMsg.reset ()
 		val prog = Parse.parse fname
 	    in
 		if !ErrorMsg.anyErrors then
 		    (Env.empty, NONE)
 		else
 		    let
-			val G' = Tycheck.checkFile b tInit prog
+			val G' = Tycheck.checkFile b (tInit ()) prog
 		    in
 			(G', #3 prog)
 		    end
@@ -112,7 +130,7 @@ fun eval fname =
 	if !ErrorMsg.anyErrors then
 	    ()
 	else
-	    Eval.exec StringMap.empty body'
+	    Eval.exec (SM.map (fn f => f ()) (!defaultV)) body'
       | NONE => ()
 
 end