diff options
| author |  Stephane Glondu <steph@glondu.net> | 2012-08-20 18:27:02 +0200 |
|---|---|---|
| committer | Stephane Glondu <steph@glondu.net> | 2012-08-20 18:27:02 +0200 |
| commit | 595aa062e10b8d7100ec2ad9b766f9e624e47295 (patch) | |
| tree | 963f9c948173de70209cba5828b372f184afc306 /test-suite/complexity/ring2.v | |
| parent | ab08ae9f0f944d9f801c44e4ffd3e6b7fcf4b024 (diff) | |
| parent | e0d682ec25282a348d35c5b169abafec48555690 (diff) | |
Merge tag 'upstream/8.4dfsg' into experimental/master
Upstream version 8.4dfsg
Diffstat (limited to 'test-suite/complexity/ring2.v')
| -rw-r--r-- | test-suite/complexity/ring2.v | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/test-suite/complexity/ring2.v b/test-suite/complexity/ring2.v index 6945edc8..52dae265 100644 --- a/test-suite/complexity/ring2.v +++ b/test-suite/complexity/ring2.v @@ -3,7 +3,7 @@ Require Import BinInt Zbool. -Definition Zplus x y := +Definition Zadd x y := match x with | 0%Z => y | Zpos x' => @@ -30,9 +30,10 @@ match x with end end. + Require Import Ring. -Lemma Zth : ring_theory Z0 (Zpos xH) Zplus Zmult Zminus Zopp (@eq Z). +Lemma Zth : ring_theory Z0 (Zpos xH) Zadd Z.mul Z.sub Z.opp (@eq Z). Admitted. Ltac Zcst t := @@ -45,7 +46,7 @@ Add Ring Zr : Zth (decidable Zeq_bool_eq, constants [Zcst]). Open Scope Z_scope. -Infix "+" := Zplus : Z_scope. +Infix "+" := Zadd : Z_scope. Goal forall a, a+a+a+a+a+a+a+a+a+a+a+a+a = a*13. Timeout 5 Time intro; ring. |