diff options
| author | msozeau | 2012-03-14 09:52:41 +0000 |
|---|---|---|
| committer | msozeau | 2012-03-14 09:52:41 +0000 |
| commit | 2053e46c8d6a4da32b4155d346d1b04da3686d06 (patch) | |
| tree | 13113d33071207f1c0133416374b0f8b72e21352 /plugins | |
| parent | 1b3efc6dc25be1bfde5fb7d2d39cc5c35e44a4d8 (diff) | |
Everything compiles again.
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@15034 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/btauto/Algebra.v | 1 | ||||
| -rw-r--r-- | plugins/setoid_ring/Ncring_tac.v | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/plugins/btauto/Algebra.v b/plugins/btauto/Algebra.v index f82db7c582..e3ac563fb0 100644 --- a/plugins/btauto/Algebra.v +++ b/plugins/btauto/Algebra.v @@ -135,6 +135,7 @@ Qed. Program Instance Decidable_null : forall p, Decidable (null p) := { Decidable_witness := match p with Cst false => true | _ => false end }. + Next Obligation. split. destruct p as [[]|]; first [discriminate|constructor]. diff --git a/plugins/setoid_ring/Ncring_tac.v b/plugins/setoid_ring/Ncring_tac.v index 34731eb3b5..d7cee83a51 100644 --- a/plugins/setoid_ring/Ncring_tac.v +++ b/plugins/setoid_ring/Ncring_tac.v @@ -76,11 +76,11 @@ Instance reify_mul (R:Type) : reify (mul:=op) (PEmul e1 e2) lvar (op t1 t2)|10. Instance reify_mul_ext (R:Type) `{Ring R} - lvar z e2 t2 + lvar (z:Z) e2 t2 `{Ring (T:=R)} {_:reify e2 lvar t2} : reify (PEmul (PEc z) e2) lvar - (@multiplication Z _ _ z t2)|9. + (@multiplication Z _ _ z t2)|9. Instance reify_sub (R:Type) e1 lvar t1 e2 t2 op |