diff options
| author |  msozeau <msozeau@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2009-03-29 10:26:26 +0000 |
|---|---|---|
| committer | msozeau <msozeau@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2009-03-29 10:26:26 +0000 |
| commit | 02699217340a08f9ac7e6cef8650246d730f9624 (patch) | |
| tree | 7e027b2fa46362a98a22da1c2f75ff99b9371264 /test-suite/success | |
| parent | 2d8aa8a39eaa4e44d9ece9fdfbcbf4bc4a516dec (diff) | |
Avoid inadvertent declaration of "on" as a keyword. New syntax is
{measure ms [id] [(rel)]}. Fix script of bug #2083 and test-suite file
accordingly.
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@12032 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'test-suite/success')
| -rw-r--r-- | test-suite/success/ProgramWf.v | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/test-suite/success/ProgramWf.v b/test-suite/success/ProgramWf.v index 8cf97b03f..1898853f6 100644 --- a/test-suite/success/ProgramWf.v +++ b/test-suite/success/ProgramWf.v @@ -3,8 +3,9 @@ Set Implicit Arguments. (* Set Printing All. *) Print sigT_rect. Obligation Tactic := program_simplify ; auto with *. +About MR. -Program Fixpoint merge (n m : nat) {measure (n + m) on lt} : nat := +Program Fixpoint merge (n m : nat) {measure (n + m) (lt)} : nat := match n with | 0 => 0 | S n' => merge n' m @@ -21,7 +22,7 @@ Print Zwf. Open Local Scope Z_scope. -Program Fixpoint Zwfrec (n m : Z) {measure (n + m) on (Zwf 0)} : Z := +Program Fixpoint Zwfrec (n m : Z) {measure (n + m) (Zwf 0)} : Z := match n ?= m with | Lt => Zwfrec n (Zpred m) | _ => 0 @@ -91,13 +92,7 @@ Next Obligation. simpl in *; intros. apply H. simpl. omega. Qed. -Print check_n. -Print sigT_rect. -Print check_n. - Program Fixpoint check_n' (n : nat) (m : nat | m = n) (p : nat) (q : nat | q = p) {measure (p - n) p} : nat := _. -Print Opaque Dependencies check_n. - |