diff options
| author |  msozeau <msozeau@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2008-04-17 19:00:55 +0000 |
|---|---|---|
| committer | msozeau <msozeau@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2008-04-17 19:00:55 +0000 |
| commit | 042fc90dba4305448553d5831a443203b0151b28 (patch) | |
| tree | 5c9472024535991843dc46b2b069666ac24b2462 /toplevel | |
| parent | 5276072c26582cac0ce2f0582824959dc12dad15 (diff) | |
Bug squashing day !
- Closed bugs 121, 1696, 1438, 1425, 1696, 1604, 1738, 1760, 1683 related to
setoids. Add corresponding test files.
- Add new modulo_zeta flag to control zeta during unification (e.g. not
allowed for setoid_rewrite unification, but ok for almost everything
else).
- Various fixes in class_tactics with respect to evars and error
messages.
- Correct error message for NoOccurenceFound, distinguishing between a
rewrite in the goal or an hypothesis.
- Move notations for ==>, --> and ++> to level 90 as suggested by
Russell O'Conor.
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@10813 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'toplevel')
| -rw-r--r-- | toplevel/himsg.ml | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/toplevel/himsg.ml b/toplevel/himsg.ml index 505f456db..4950f4064 100644 --- a/toplevel/himsg.ml +++ b/toplevel/himsg.ml @@ -406,9 +406,12 @@ let explain_refiner_cannot_generalize env ty = str "Cannot find a well-typed generalisation of the goal with type : " ++ pr_lconstr_env env ty -let explain_no_occurrence_found env c = +let explain_no_occurrence_found env c id = str "Found no subterm matching " ++ pr_lconstr_env env c ++ - str " in the current goal" + str " in " ++ + (match id with + | Some id -> pr_id id + | None -> str"the current goal") let explain_cannot_unify_binding_type env m n = let pm = pr_lconstr_env env m in @@ -465,7 +468,7 @@ let explain_pretype_error env err = | CannotUnify (m,n) -> explain_cannot_unify env m n | CannotUnifyLocal (m,n,sn) -> explain_cannot_unify_local env m n sn | CannotGeneralize ty -> explain_refiner_cannot_generalize env ty - | NoOccurrenceFound c -> explain_no_occurrence_found env c + | NoOccurrenceFound (c, id) -> explain_no_occurrence_found env c id | CannotUnifyBindingType (m,n) -> explain_cannot_unify_binding_type env m n |