Skip to content

Commit

Permalink
Remove workaround for coq/coq#3488
Browse files Browse the repository at this point in the history
  • Loading branch information
pi8027 committed Feb 16, 2024
1 parent c641258 commit c5b4e86
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions theories/stablesort.v
Original file line number Diff line number Diff line change
Expand Up @@ -508,13 +508,10 @@ case=> // x xs; have [n] := ubnP (size xs).
rewrite /Abstract.sortN /sortN -[Nil (option _)]/(astack_of_stack [::]).
elim: n (Nil (seq _)) x xs => // n IHn stack x [|y xs /= /ltnSE Hxs].
by rewrite [LHS]apop_mergeE.
rewrite /Abstract.sortNrec -/(Abstract.sortNrec' _ _ _ _).
have {1}->: [:: x] = condrev (leT x y) [:: x] by rewrite [RHS]if_same.
move: xs Hxs x y (RS in x :: RS) {-2}(leT x y) (erefl (leT x y)).
elim=> [_|z xs IHxs /= /ltnW Hxs] x y rs incr incrE.
by rewrite /Abstract.sortNrec' apop_mergeE /= incrE mergeEcons; case: ifP.

Check failure on line 514 in theories/stablesort.v

View workflow job for this annotation

GitHub Actions / build (mathcomp/mathcomp:1.19.0-coq-8.17)

The LHS of apop_mergeE

Check failure on line 514 in theories/stablesort.v

View workflow job for this annotation

GitHub Actions / build (mathcomp/mathcomp:1.17.0-coq-8.18)

The LHS of apop_mergeE

Check failure on line 514 in theories/stablesort.v

View workflow job for this annotation

GitHub Actions / build (mathcomp/mathcomp:1.19.0-coq-8.18)

The LHS of apop_mergeE

Check failure on line 514 in theories/stablesort.v

View workflow job for this annotation

GitHub Actions / build (mathcomp/mathcomp:1.18.0-coq-8.17)

The LHS of apop_mergeE

Check failure on line 514 in theories/stablesort.v

View workflow job for this annotation

GitHub Actions / build (mathcomp/mathcomp:1.17.0-coq-8.17)

The LHS of apop_mergeE

Check failure on line 514 in theories/stablesort.v

View workflow job for this annotation

GitHub Actions / build (mathcomp/mathcomp:1.19.0-coq-8.16)

The LHS of apop_mergeE

Check failure on line 514 in theories/stablesort.v

View workflow job for this annotation

GitHub Actions / build (mathcomp/mathcomp:1.17.0-coq-8.16)

The LHS of apop_mergeE

Check failure on line 514 in theories/stablesort.v

View workflow job for this annotation

GitHub Actions / build (mathcomp/mathcomp:1.18.0-coq-8.16)

The LHS of apop_mergeE

Check failure on line 514 in theories/stablesort.v

View workflow job for this annotation

GitHub Actions / build (mathcomp/mathcomp:1.16.0-coq-8.17)

The LHS of apop_mergeE

Check failure on line 514 in theories/stablesort.v

View workflow job for this annotation

GitHub Actions / build (mathcomp/mathcomp:1.18.0-coq-8.18)

The LHS of apop_mergeE

Check failure on line 514 in theories/stablesort.v

View workflow job for this annotation

GitHub Actions / build (mathcomp/mathcomp:2.1.0-coq-8.17)

The LHS of apop_mergeE

Check failure on line 514 in theories/stablesort.v

View workflow job for this annotation

GitHub Actions / build (mathcomp/mathcomp:2.0.0-coq-8.18)

The LHS of apop_mergeE

Check failure on line 514 in theories/stablesort.v

View workflow job for this annotation

GitHub Actions / build (mathcomp/mathcomp:2.0.0-coq-8.16)

The LHS of apop_mergeE

Check failure on line 514 in theories/stablesort.v

View workflow job for this annotation

GitHub Actions / build (mathcomp/mathcomp:1.16.0-coq-8.18)

The LHS of apop_mergeE

Check failure on line 514 in theories/stablesort.v

View workflow job for this annotation

GitHub Actions / build (mathcomp/mathcomp:2.0.0-coq-8.17)

The LHS of apop_mergeE

Check failure on line 514 in theories/stablesort.v

View workflow job for this annotation

GitHub Actions / build (mathcomp/mathcomp:2.1.0-coq-8.18)

The LHS of apop_mergeE

Check failure on line 514 in theories/stablesort.v

View workflow job for this annotation

GitHub Actions / build (mathcomp/mathcomp:2.2.0-coq-8.18)

The LHS of apop_mergeE

Check failure on line 514 in theories/stablesort.v

View workflow job for this annotation

GitHub Actions / build (mathcomp/mathcomp:2.2.0-coq-8.17)

The LHS of apop_mergeE

Check failure on line 514 in theories/stablesort.v

View workflow job for this annotation

GitHub Actions / build (mathcomp/mathcomp:1.14.0-coq-8.13)

The LHS of apop_mergeE

Check failure on line 514 in theories/stablesort.v

View workflow job for this annotation

GitHub Actions / build (mathcomp/mathcomp:1.13.0-coq-8.13)

The LHS of apop_mergeE

Check failure on line 514 in theories/stablesort.v

View workflow job for this annotation

GitHub Actions / build (mathcomp/mathcomp:1.16.0-coq-8.13)

The LHS of apop_mergeE

Check failure on line 514 in theories/stablesort.v

View workflow job for this annotation

GitHub Actions / build (mathcomp/mathcomp:2.1.0-coq-8.16)

The LHS of apop_mergeE

Check failure on line 514 in theories/stablesort.v

View workflow job for this annotation

GitHub Actions / build (mathcomp/mathcomp:1.14.0-coq-8.14)

The LHS of apop_mergeE

Check failure on line 514 in theories/stablesort.v

View workflow job for this annotation

GitHub Actions / build (mathcomp/mathcomp:1.16.0-coq-8.14)

The LHS of apop_mergeE

Check failure on line 514 in theories/stablesort.v

View workflow job for this annotation

GitHub Actions / build (mathcomp/mathcomp:2.2.0-coq-8.16)

The LHS of apop_mergeE

Check failure on line 514 in theories/stablesort.v

View workflow job for this annotation

GitHub Actions / build (mathcomp/mathcomp:1.15.0-coq-8.13)

The LHS of apop_mergeE

Check failure on line 514 in theories/stablesort.v

View workflow job for this annotation

GitHub Actions / build (mathcomp/mathcomp:1.16.0-coq-8.15)

The LHS of apop_mergeE

Check failure on line 514 in theories/stablesort.v

View workflow job for this annotation

GitHub Actions / build (mathcomp/mathcomp:1.14.0-coq-8.15)

The LHS of apop_mergeE

Check failure on line 514 in theories/stablesort.v

View workflow job for this annotation

GitHub Actions / build (mathcomp/mathcomp:1.15.0-coq-8.15)

The LHS of apop_mergeE

Check failure on line 514 in theories/stablesort.v

View workflow job for this annotation

GitHub Actions / build (mathcomp/mathcomp:1.17.0-coq-8.15)

The LHS of apop_mergeE

Check failure on line 514 in theories/stablesort.v

View workflow job for this annotation

GitHub Actions / build (mathcomp/mathcomp:1.15.0-coq-8.14)

The LHS of apop_mergeE

Check failure on line 514 in theories/stablesort.v

View workflow job for this annotation

GitHub Actions / build (mathcomp/mathcomp:1.16.0-coq-8.16)

The LHS of apop_mergeE

Check failure on line 514 in theories/stablesort.v

View workflow job for this annotation

GitHub Actions / build (mathcomp/mathcomp:1.15.0-coq-8.16)

The LHS of apop_mergeE

Check failure on line 514 in theories/stablesort.v

View workflow job for this annotation

GitHub Actions / build (mathcomp/mathcomp:1.13.0-coq-8.14)

The LHS of apop_mergeE

Check failure on line 514 in theories/stablesort.v

View workflow job for this annotation

GitHub Actions / build (mathcomp/mathcomp:1.13.0-coq-8.15)

The LHS of apop_mergeE

Check failure on line 514 in theories/stablesort.v

View workflow job for this annotation

GitHub Actions / build (mathcomp/mathcomp-dev:coq-8.18)

The LHS of apop_mergeE

Check failure on line 514 in theories/stablesort.v

View workflow job for this annotation

GitHub Actions / build (mathcomp/mathcomp-dev:coq-8.17)

The LHS of apop_mergeE
rewrite /Abstract.sortNrec'.
rewrite -/(Abstract.sortNrec' _ _ _ _) -/(Abstract.sortNrec _ _ _ _).
rewrite eqbE incrE mergeEcons apush_mergeE ?condrev_nilp // IHn //.
by have [/[dup] /IHxs -> // ->|] := eqVneq; do 2?case: ifP.
Qed.
Expand Down Expand Up @@ -560,12 +557,9 @@ case=> // x xs; have [n] := ubnP (size xs).
rewrite /Abstract.sortN -[RHS]/(flatten_stack (x :: xs) [::]).
elim: n x (Nil (option _)) xs => // n IHn x stack [|y xs /= /ltnSE Hxs];
first by rewrite [LHS]apop_catE.
rewrite /Abstract.sortNrec -/(Abstract.sortNrec' _ _ _ _).
pose rs := Nil T; rewrite -[x :: y :: _]/(rs ++ _) -[[:: x]]/(rs ++ _).
elim: xs Hxs x y rs => [_|z xs IHxs /= /ltnW Hxs] x y rs.
by rewrite [LHS]apop_catE if_same -catA.
rewrite /Abstract.sortNrec'.
rewrite -/(Abstract.sortNrec' _ _ _ _) -/(Abstract.sortNrec _ _ _ _).
move: (IHxs Hxs y z (rcons rs x)).
by rewrite eqbE if_same IHn // apush_catE -cats1 -!catA; case: eqVneq => // ->.
Qed.
Expand Down

0 comments on commit c5b4e86

Please sign in to comment.