Merge PR #11609: [stm] Use Default Proof Using only with Proof

5 files changed, 46 insertions, 0 deletions

diff --git a/test-suite/bugs/closed/bug_11342.v b/test-suite/bugs/closed/bug_11342.v
new file mode 100644
index 0000000000..3c163fb772
--- /dev/null
+++ b/test-suite/bugs/closed/bug_11342.v
@@ -0,0 +1,19 @@
+(* -*- mode: coq; coq-prog-args: ("-vos") -*- *)
+
+Section foo.
+  Context {H:True}.
+  Set Default Proof Using "Type".
+  Theorem test2 : True.
+  Proof.
+    (* BUG: this gets run when compiling with -vos *)
+    fail "proof with default using".
+    exact I.
+  Qed.
+
+  Theorem test3 : True.
+  Proof using Type.
+    (* this isn't run with -vos *)
+    fail "using".
+    exact I.
+  Qed.
+End foo.
diff --git a/test-suite/output/bug_11342.out b/test-suite/output/bug_11342.out
new file mode 100644
index 0000000000..9aac16de0d
--- /dev/null
+++ b/test-suite/output/bug_11342.out
@@ -0,0 +1 @@
+without using
diff --git a/test-suite/output/bug_11342.v b/test-suite/output/bug_11342.v
new file mode 100644
index 0000000000..73131a3190
--- /dev/null
+++ b/test-suite/output/bug_11342.v
@@ -0,0 +1,12 @@
+(* -*- mode: coq; coq-prog-args: ("-vos") -*- *)
+
+Section foo.
+  Context {H:True}.
+  Theorem test1 : True.
+  Proof.
+    (* this gets printed with -vos because there's no annotation (either [Set
+    Default Proof Using ...] or an explicit [Proof using ...]) *)
+    idtac "without using".
+    exact I.
+  Qed.
+End foo.
diff --git a/test-suite/output/bug_11608.out b/test-suite/output/bug_11608.out
new file mode 100644
index 0000000000..793ff768d4
--- /dev/null
+++ b/test-suite/output/bug_11608.out
@@ -0,0 +1 @@
+creating x without [Proof.]
diff --git a/test-suite/output/bug_11608.v b/test-suite/output/bug_11608.v
new file mode 100644
index 0000000000..3929082913
--- /dev/null
+++ b/test-suite/output/bug_11608.v
@@ -0,0 +1,13 @@
+(* -*- mode: coq; coq-prog-args: ("-vos") -*- *)
+
+Set Default Proof Using "Type".
+
+Section foo.
+  Context (A:Type).
+  Definition x : option A.
+    (* this can get printed with -vos since without "Proof." there's no Proof
+    using, even with a default annotation. *)
+    idtac "creating x without [Proof.]".
+    exact None.
+  Qed.
+End foo.