HCoop
/
hcoop
/
domtool2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Proper handling of Apache log file deletion while Apache might have that file open
[hcoop/domtool2.git]
/
src
/
eval.sml
diff --git
a/src/eval.sml
b/src/eval.sml
index
37a5d63
..
7aa8053
100644
(file)
--- a/
src/eval.sml
+++ b/
src/eval.sml
@@
-30,6
+30,11
@@
fun lookup (evs, ev) =
^ ev ^ " that type-checking has guaranteed")
| SOME v => v
^ ev ^ " that type-checking has guaranteed")
| SOME v => v
+fun printEvs (name, evs) =
+ (print ("Environment " ^ name ^ "\n");
+ SM.appi (fn (name, i) => Print.preface (name, Print.p_exp i)) evs;
+ print "\n")
+
val conjoin : Env.env_vars * Env.env_vars -> Env.env_vars =
SM.unionWith #2
val conjoin : Env.env_vars * Env.env_vars -> Env.env_vars =
SM.unionWith #2
@@
-90,7
+95,7
@@
fun exec evs e =
val evs'' = exec' evs e2
in
cleanup ();
val evs'' = exec' evs e2
in
cleanup ();
- conjoin (conjoin (evs, evs'), evs'')
+ evs'
end
end
end
end
@@
-103,9
+108,10
@@
fun exec evs e =
| SOME action => action (evs, args)
end
| SOME action => action (evs, args)
end
+ val _ = Env.pre ()
val evs' = exec' evs e
in
val evs' = exec' evs e
in
- ()
+
Env.post
()
end
end
end
end