aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChantal Keller <Chantal.Keller@lri.fr>2021-04-28 17:15:18 +0200
committerChantal Keller <Chantal.Keller@lri.fr>2021-04-28 17:15:18 +0200
commit9f296bd2cfb4a053b8a5233019d4cd2479998da2 (patch)
tree2695899f868413bd6009708df0cc52b3a4913153
parent4edc3f9f40d131bb64311a533d483ae32257bbf2 (diff)
parent084feb7d0c0ee7d2156d7508979682e3bf14fabe (diff)
downloadsmtcoq-9f296bd2cfb4a053b8a5233019d4cd2479998da2.tar.gz
smtcoq-9f296bd2cfb4a053b8a5233019d4cd2479998da2.zip
Merge branch 'coq-8.10' of github.com:smtcoq/smtcoq into coq-8.11
-rw-r--r--src/PropToBool.v4
-rw-r--r--src/versions/standard/Tactics_standard.v2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/PropToBool.v b/src/PropToBool.v
index 5d7fd60..bb0ec85 100644
--- a/src/PropToBool.v
+++ b/src/PropToBool.v
@@ -211,8 +211,8 @@ Ltac prop2bool_hyp H :=
].
Ltac prop2bool_hyps Hs :=
- match Hs with
- | (?Hs, ?H) => try prop2bool_hyp H; [ .. | prop2bool_hyps Hs]
+ lazymatch Hs with
+ | (?Hs1, ?Hs2) => prop2bool_hyps Hs1; [ .. | prop2bool_hyps Hs2]
| ?H => try prop2bool_hyp H
end.
diff --git a/src/versions/standard/Tactics_standard.v b/src/versions/standard/Tactics_standard.v
index 232ae54..61e663a 100644
--- a/src/versions/standard/Tactics_standard.v
+++ b/src/versions/standard/Tactics_standard.v
@@ -23,7 +23,7 @@ Ltac get_hyps_acc acc k :=
match goal with
| [ H : ?P |- _ ] =>
let T := type of P in
- match T with
+ lazymatch T with
| Prop =>
lazymatch P with
| id _ => fail