X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/cf879b4f037242eb535207f0ff3400fe89ab61b1..4e1a9fdcd846bca926c8c118799d6a426ee3c8fe:/src/env.sml

diff --git a/src/env.sml b/src/env.sml
index f87278f..8ebcaf4 100644
--- a/src/env.sml
+++ b/src/env.sml
@@ -149,6 +149,20 @@ fun three func (name1, arg1, name2, arg2, name3, arg3) f (_, [e1, e2, e3]) =
 					 SM.empty))
   | three func _ _ (_, es) = badArgs (func, es)
 
+fun four func (name1, arg1, name2, arg2, name3, arg3, name4, arg4) f (_, [e1, e2, e3, e4]) =
+    (case (arg1 e1, arg2 e2, arg3 e3, arg4 e4) of
+	 (NONE, _, _, _) => badArg (func, name1, e1)
+       | (_, NONE, _, _) => badArg (func, name2, e2)
+       | (_, _, NONE, _) => badArg (func, name3, e3)
+       | (_, _, _, NONE) => badArg (func, name4, e4)
+       | (SOME v1, SOME v2, SOME v3, SOME v4) => (f (v1, v2, v3, v4);
+						  SM.empty))
+  | four func _ _ (_, es) = badArgs (func, es)
+
+fun noneV func f (evs, []) = (f evs;
+			      SM.empty)
+  | noneV func _ (_, es) = badArgs (func, es)
+
 fun oneV func (name, arg) f (evs, [e]) =
     (case arg e of
 	 NONE => badArg (func, name, e)
@@ -170,7 +184,9 @@ fun env arg (evs, name) =
 	NONE => raise Fail ("Unavailable environment variable " ^ name)
       | SOME e =>
 	case arg e of
-	    NONE => raise Fail ("Bad format for environment variable " ^ name)
+	    NONE => (Print.preface ("Unexpected value for " ^ name ^ ":",
+				    Print.p_exp e);
+		     raise Fail ("Bad format for environment variable " ^ name))
 	  | SOME v => v
 
 fun type_one func arg f =
@@ -183,6 +199,7 @@ fun action_none name f = registerAction (name, none name f)
 fun action_one name args f = registerAction (name, one name args f)
 fun action_two name args f = registerAction (name, two name args f)
 fun action_three name args f = registerAction (name, three name args f)
+fun action_four name args f = registerAction (name, four name args f)
 
 fun actionV_none name f = registerAction (name, fn (env, _) => (f env; env))
 fun actionV_one name args f = registerAction (name, oneV name args f)
@@ -191,6 +208,7 @@ fun actionV_two name args f = registerAction (name, twoV name args f)
 fun container_none name (f, g) = registerContainer (name, none name f, g)
 fun container_one name args (f, g) = registerContainer (name, one name args f, g)
 
+fun containerV_none name (f, g) = registerContainer (name, noneV name f, g)
 fun containerV_one name args (f, g) = registerContainer (name, oneV name args f, g)
 
 type env = SS.set * (typ * exp option) SM.map * SS.set