More Apache directory option stuff

[hcoop/domtool2.git] / src / main.sml

diff --git a/src/main.sml b/src/main.sml
index 415d9c2..705b20a 100644 (file)
--- 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 () =
@@ -61,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
@@ -74,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
@@ -114,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