HCoop
/
hcoop
/
domtool2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
For install_{server,slave}, insserv so domtool starts on boot
[hcoop/domtool2.git]
/
src
/
tycheck.sml
diff --git
a/src/tycheck.sml
b/src/tycheck.sml
index
d5b3f1e
..
12efce3
100644
(file)
--- a/
src/tycheck.sml
+++ b/
src/tycheck.sml
@@
-258,10
+258,7
@@
fun envVarSetFrom v (e, _) =
| _ => NONE
| _ => NONE
-fun ununify (tAll as (t, _)) =
- case t of
- TUnif (_, ref (SOME t)) => ununify t
- | _ => tAll
+val ununify = Describe.ununify
fun checkExp G (eAll as (e, loc)) =
let
fun checkExp G (eAll as (e, loc)) =
let
@@
-446,14
+443,14
@@
fun checkExp G (eAll as (e, loc)) =
(TAction (p', d', r'), loc)
end
| (TError, _) => t2
(TAction (p', d', r'), loc)
end
| (TError, _) => t2
- | _ => (dte (WrongForm ("
A
ction to be sequenced",
+ | _ => (dte (WrongForm ("
First a
ction to be sequenced",
"action",
e2,
t2,
NONE));
(TError, loc)))
| (TError, _) => t1
"action",
e2,
t2,
NONE));
(TError, loc)))
| (TError, _) => t1
- | _ => (dte (WrongForm ("
A
ction to be sequenced",
+ | _ => (dte (WrongForm ("
Second a
ction to be sequenced",
"action",
e1,
t1,
"action",
e1,
t1,
@@
-505,14
+502,14
@@
fun checkExp G (eAll as (e, loc)) =
(TAction (p', d', r2), loc)
end
| (TError, _) => t2
(TAction (p', d', r2), loc)
end
| (TError, _) => t2
- | _ => (dte (WrongForm ("
Action to be sequenced
",
+ | _ => (dte (WrongForm ("
Body of local settings
",
"action",
e2,
t2,
NONE));
(TError, loc)))
| (TError, _) => t1
"action",
e2,
t2,
NONE));
(TError, loc)))
| (TError, _) => t1
- | _ => (dte (WrongForm ("
Action to be sequenced
",
+ | _ => (dte (WrongForm ("
Local settings
",
"action",
e1,
t1,
"action",
e1,
t1,