summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Adam Chlipala <adam@chlipala.net>2010-12-16 18:40:49 -0500
committerGravatar Adam Chlipala <adam@chlipala.net>2010-12-16 18:40:49 -0500
commit8f2b2ce3da639c8a140d21a22b0ae67dbbdc649d (patch)
tree8188988af4f08a9dc4bd3e4f6bb1f3f5eb123385 /src
parent5c2db41e18a2b7a65452d3cecf13e3bc1886f863 (diff)
Restore behavior of not complaining about undetermined unification variables when there are other errors
Diffstat (limited to 'src')
-rw-r--r--src/elaborate.sml24
1 files changed, 15 insertions, 9 deletions
diff --git a/src/elaborate.sml b/src/elaborate.sml
index 550e3b8f..008529ea 100644
--- a/src/elaborate.sml
+++ b/src/elaborate.sml
@@ -4408,16 +4408,22 @@ fun elabFile basis topStr topSgn env file =
(!delayedUnifs);
delayedUnifs := []);
- ignore (List.exists (fn d => if kunifsInDecl d then
- (declError env'' (KunifsRemain [d]);
- true)
- else
- false) file);
+ if ErrorMsg.anyErrors () then
+ ()
+ else
+ ignore (List.exists (fn d => if kunifsInDecl d then
+ (declError env'' (KunifsRemain [d]);
+ true)
+ else
+ false) file);
- ignore (List.exists (fn d => case cunifsInDecl d of
- NONE => false
- | SOME _ => (declError env'' (CunifsRemain [d]);
- true)) file);
+ if ErrorMsg.anyErrors () then
+ ()
+ else
+ ignore (List.exists (fn d => case cunifsInDecl d of
+ NONE => false
+ | SOME _ => (declError env'' (CunifsRemain [d]);
+ true)) file);
if ErrorMsg.anyErrors () then
()