diff options
| author | sacerdot | 2005-02-03 12:41:32 +0000 |
|---|---|---|
| committer | sacerdot | 2005-02-03 12:41:32 +0000 |
| commit | a6223e6b4e58d7106f45058d3a5251492bb35bfd (patch) | |
| tree | de0ce89cf0f8ae8e8aa8bbee79bc802d09a1d36f | |
| parent | eefe264e275ae4e59389957ea2df7ef75f451c76 (diff) | |
Trivial bug fixed in "Add [Semi] Setoid Ring". An "&" in place of an "||"
prevendent detection of only one mistake in the user input.
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@6667 85f007b7-540e-0410-9357-904b9bb8a0f7
| -rw-r--r-- | contrib/ring/ring.ml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/contrib/ring/ring.ml b/contrib/ring/ring.ml index 876020ddaf..930f42ddc1 100644 --- a/contrib/ring/ring.ml +++ b/contrib/ring/ring.ml @@ -312,18 +312,18 @@ let add_theory want_ring want_abstract want_setoid a aequiv asetth amorph aplus (str "A (Semi-)(Setoid-)Ring Structure is already declared for " ++ prterm a); let env = Global.env () in - if (want_ring & want_setoid & + if (want_ring & want_setoid & ( not (implement_theory env t coq_Setoid_Ring_Theory [| a; (unbox aequiv); aplus; amult; aone; azero; (unbox aopp); aeq|]) - & + || not (implement_theory env (unbox asetth) coq_Setoid_Theory - [| a; (unbox aequiv) |])) then + [| a; (unbox aequiv) |]))) then errorlabstrm "addring" (str "Not a valid Setoid-Ring theory"); - if (not want_ring & want_setoid & + if (not want_ring & want_setoid & ( not (implement_theory env t coq_Semi_Setoid_Ring_Theory - [| a; (unbox aequiv); aplus; amult; aone; azero; aeq|]) & + [| a; (unbox aequiv); aplus; amult; aone; azero; aeq|]) || not (implement_theory env (unbox asetth) coq_Setoid_Theory - [| a; (unbox aequiv) |])) then + [| a; (unbox aequiv) |]))) then errorlabstrm "addring" (str "Not a valid Semi-Setoid-Ring theory"); if (want_ring & not want_setoid & not (implement_theory env t coq_Ring_Theory |