diff options
| author | Hugo Herbelin | 2015-11-10 14:50:13 +0100 |
|---|---|---|
| committer | Hugo Herbelin | 2015-11-10 16:38:17 +0100 |
| commit | 2bad1e8d896b40495bc8579e407f142f7f3fb7d9 (patch) | |
| tree | 0fee1c7082449ec26a98e0b2b0a7b699453273ca /test-suite | |
| parent | b382bb1b42319d7be422f92fd196df8bfbe21a83 (diff) | |
| parent | ab1d8792143a05370a1efe3d19469c25b82d7097 (diff) | |
Merge origin/v8.5 into trunk
Did some manual merge in tactics/tactics.ml.
Diffstat (limited to 'test-suite')
| -rw-r--r-- | test-suite/bugs/closed/4404.v | 4 | ||||
| -rw-r--r-- | test-suite/output/Existentials.out | 4 | ||||
| -rw-r--r-- | test-suite/success/destruct.v | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/test-suite/bugs/closed/4404.v b/test-suite/bugs/closed/4404.v new file mode 100644 index 0000000000..27b43a61d4 --- /dev/null +++ b/test-suite/bugs/closed/4404.v @@ -0,0 +1,4 @@ +Inductive Foo : Type -> Type := foo A : Foo A. +Goal True. + remember Foo. + diff --git a/test-suite/output/Existentials.out b/test-suite/output/Existentials.out index 483a9ea792..52e1e0ed01 100644 --- a/test-suite/output/Existentials.out +++ b/test-suite/output/Existentials.out @@ -1,5 +1,5 @@ Existential 1 = -?Goal0 : [p : nat q := S p : nat n : nat m : nat |- ?y = m] +?Goal1 : [p : nat q := S p : nat n : nat m : nat |- ?y = m] Existential 2 = ?y : [p : nat q := S p : nat n : nat m : nat |- nat] (p, q cannot be used) -Existential 3 = ?e : [q : nat n : nat m : nat |- n = ?y] +Existential 3 = ?Goal0 : [q : nat n : nat m : nat |- n = ?y] diff --git a/test-suite/success/destruct.v b/test-suite/success/destruct.v index 83a33f75dc..59cd25cd76 100644 --- a/test-suite/success/destruct.v +++ b/test-suite/success/destruct.v @@ -97,6 +97,7 @@ Abort. Goal exists x, S x = S 0. eexists. +Show x. (* Incidentally test Show on a named goal *) destruct (S _). (* Incompatible occurrences but takes the first one since Oct 2014 *) change (0 = S 0). Abort. @@ -105,6 +106,7 @@ Goal exists x, S 0 = S x. eexists. destruct (S _). (* Incompatible occurrences but takes the first one since Oct 2014 *) change (0 = S ?x). +[x]: exact 0. (* Incidentally test applying a tactic to a goal on the shelve *) Abort. Goal exists n p:nat, (S n,S n) = (S p,S p) /\ p = n. |