HCoop
/
hcoop
/
domtool2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reduce set of ACL categories to which '-fake' applies
[hcoop/domtool2.git]
/
src
/
env.sml
diff --git
a/src/env.sml
b/src/env.sml
index
1a93a38
..
ef710c1
100644
(file)
--- a/
src/env.sml
+++ b/
src/env.sml
@@
-41,6
+41,11
@@
fun registerContainer (name, befor, after) =
containers := SM.insert (!containers, name, (befor, after))
fun container name = SM.find (!containers, name)
containers := SM.insert (!containers, name, (befor, after))
fun container name = SM.find (!containers, name)
+val functions : (exp list -> exp option) SM.map ref = ref SM.empty
+fun registerFunction (name, f) =
+ functions := SM.insert (!functions, name, f)
+fun function name = SM.find (!functions, name)
+
local
val pr = ref (fn () => ())
in
local
val pr = ref (fn () => ())
in
@@
-144,6
+149,10
@@
fun three func (name1, arg1, name2, arg2, name3, arg3) f (_, [e1, e2, e3]) =
SM.empty))
| three func _ _ (_, es) = badArgs (func, es)
SM.empty))
| three 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)
fun oneV func (name, arg) f (evs, [e]) =
(case arg e of
NONE => badArg (func, name, e)
@@
-165,7
+174,9
@@
fun env arg (evs, name) =
NONE => raise Fail ("Unavailable environment variable " ^ name)
| SOME e =>
case arg e of
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 =
| SOME v => v
fun type_one func arg f =
@@
-186,6
+197,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 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
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