Dependency ordering

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

diff --git a/src/env.sml b/src/env.sml
index acc7e36..48ec715 100644 (file)
--- a/src/env.sml
+++ b/src/env.sml
@@ -96,21 +96,26 @@ fun action_two name args f = registerAction (name, two name args f)
 
 fun container_one name args (f, g) = registerContainer (name, one name args f, g)
 
-type env = SS.set * (typ * exp option) SM.map
-val empty : env = (SS.add (SS.singleton "int", "string"),
-                  SM.empty)
+type env = SS.set * (typ * exp option) SM.map * SS.set
+val empty : env = (SS.empty, SM.empty, SS.empty)
 
-fun lookupType (ts, _) name = SS.member (ts, name)
-fun lookupVal (_, vs) name =
+fun lookupType (ts, _, _) name = SS.member (ts, name)
+fun lookupVal (_, vs, _) name =
     case SM.find (vs, name) of
        NONE => NONE
       | SOME (t, _) => SOME t
-fun lookupEquation (_, vs) name =
+fun lookupEquation (_, vs, _) name =
     case SM.find (vs, name) of
        NONE => NONE
       | SOME (_, eqo) => eqo
+fun lookupContext (_, _, cs) name = SS.member (cs, name)
 
-fun bindType (ts, vs) name = (SS.add (ts, name), vs)
-fun bindVal (ts, vs) (name, t, eqo) = (ts, SM.insert (vs, name, (t, eqo)))
+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 types (ts, _, _) = ts
+fun vals (_, vs, _) = SM.foldli (fn (name, _, vs) => SS.add (vs, name)) SS.empty vs
+fun contexts (_, _, cs) = cs
 
 end