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

diff --git a/src/env.sml b/src/env.sml
index f87278f..be8438a 100644
--- a/src/env.sml
+++ b/src/env.sml
@@ -1,5 +1,6 @@
 (* HCoop Domtool (http://hcoop.sourceforge.net/)
  * Copyright (c) 2006, Adam Chlipala
+ * Copyright (c) 2014 Clinton Ebadi <clinton@unknownlamer.org>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -149,6 +150,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 +185,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 +200,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,28 +209,46 @@ 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
-val empty : env = (SS.empty, SM.empty, SS.empty)
+datatype env = Env of SS.set * (typ * exp option * env) SM.map * SS.set * (typ * exp * env) SM.map
+val empty : env = Env (SS.empty, SM.empty, SS.empty, SM.empty)
+
 
-fun lookupType (ts, _, _) name = SS.member (ts, name)
-fun lookupVal (_, vs, _) name =
+fun initialDynEnvTypes (Env (_, _, _, ds)) =
+    SM.map (fn (t, _, _) => t) ds
+
+(* hack ahead: These are not reduced when declared and must be before
+   starting evaluation. Pass in reduceExp, and force an awkward
+   calling convention so no one thinks this is the Right Way (tm) *)
+fun initialDynEnvVals f (Env (_, _, _, ds)) =
+    SM.map (fn (t, v, env) => f env v) ds
+
+fun lookupType (Env (ts, _, _, _)) name = SS.member (ts, name)
+fun lookupVal (Env (_, vs, _, _)) name =
     case SM.find (vs, name) of
 	NONE => NONE
-      | SOME (t, _) => SOME t
-fun lookupEquation (_, vs, _) name =
+      | SOME (t, _, _) => SOME t
+fun lookupEquation (Env (_, vs, _, _)) name =
     case SM.find (vs, name) of
 	NONE => NONE
-      | SOME (_, eqo) => eqo
-fun lookupContext (_, _, cs) name = SS.member (cs, name)
+      | SOME (_, NONE, _) => NONE
+      | SOME (_, SOME eq, env) => SOME (eq, env)
+fun lookupContext (Env (_, _, cs, _)) name = SS.member (cs, name)
+fun lookupInitialDynEnvVal (Env (_, _, _, ds)) name =
+    case SM.find (ds, name) of
+	NONE => NONE
+      | SOME (t, _, _) => SOME t
 
-fun bindType (ts, vs, cs) name = (SS.add (ts, name), vs, cs)
-fun bindVal (ts, vs, cs) (name, t, eqo) = (ts, SM.insert (vs, name, (t, eqo)), cs)
-fun bindContext (ts, vs, cs) name = (ts, vs, SS.add (cs, name))
+fun bindType (Env (ts, vs, cs, ds)) name = Env (SS.add (ts, name), vs, cs, ds)
+fun bindVal (env as (Env (ts, vs, cs, ds))) (name, t, eqo) = Env (ts, SM.insert (vs, name, (t, eqo, env)), cs, ds)
+fun bindContext (Env (ts, vs, cs, ds)) name = Env (ts, vs, SS.add (cs, name), ds)
+fun bindInitialDynEnvVal (env as (Env (ts, vs, cs, ds))) (name, t, eqn) = Env (ts, vs, cs, SM.insert (ds, name, (t, eqn, env)))
 
-fun types (ts, _, _) = ts
-fun vals (_, vs, _) = SM.foldli (fn (name, _, vs) => SS.add (vs, name)) SS.empty vs
-fun contexts (_, _, cs) = cs
+fun types (Env (ts, _, _, _)) = ts
+fun vals (Env (_, vs, _, _)) = SM.foldli (fn (name, _, vs) => SS.add (vs, name)) SS.empty vs
+fun contexts (Env (_, _, cs, _)) = cs
+fun dynamics (Env (_, _, _, ds)) = SM.foldli (fn (name, _, ds) => SS.add (ds, name)) SS.empty ds
 
 end