Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

consistently require-import all_ssreflect instead of pieces of it #27

Open
wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/adt.v
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
From Coq Require Import ssreflect ssrbool ssrfun.
From mathcomp Require Import eqtype order seq path.
From mathcomp Require Import all_ssreflect.
From favssr Require Import bintree bst.

Set Implicit Arguments.
Expand Down
3 changes: 1 addition & 2 deletions src/avl.v
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
From Equations Require Import Equations.
From Coq Require Import ssreflect ssrbool ssrfun.
From mathcomp Require Import eqtype ssrnat ssrint ssralg ssrnum order seq path.
From mathcomp Require Import all_ssreflect ssrint ssralg ssrnum.
From favssr Require Import prelude bintree bst adt.
Set Implicit Arguments.
Unset Strict Implicit.
Expand Down
3 changes: 1 addition & 2 deletions src/basics.v
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
From Equations Require Import Equations.
From Coq Require Import ssreflect ssrbool ssrfun.
From mathcomp Require Import ssrnat eqtype seq div.
From mathcomp Require Import all_ssreflect.
From favssr Require Import prelude.
Set Implicit Arguments.
Unset Strict Implicit.
Expand Down
3 changes: 1 addition & 2 deletions src/beyond.v
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
From Equations Require Import Equations.
From Coq Require Import ssreflect ssrbool ssrfun.
From mathcomp Require Import ssrnat eqtype order seq path.
From mathcomp Require Import all_ssreflect.
From favssr Require Import prelude bintree bst adt redblack.

Set Implicit Arguments.
Expand Down
5 changes: 2 additions & 3 deletions src/binom_heap.v
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
From Coq Require Import ssreflect ssrbool ssrfun.
From mathcomp Require Import ssrnat eqtype order seq path bigop prime binomial.
From mathcomp Require Import all_ssreflect.
From favssr Require Import prelude basics priority.

Set Implicit Arguments.
Expand Down Expand Up @@ -791,4 +790,4 @@ Fixpoint T_carry (d : nat) (b : seq nat) : nat := 1. (* FIXME *)

Fixpoint T_add (b1 : seq nat) : seq nat -> nat := fun=>1%N. (* FIXME *)

End Exercises.
End Exercises.
3 changes: 1 addition & 2 deletions src/bintree.v
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
From Equations Require Import Equations.
From Coq Require Import ssreflect ssrbool ssrfun.
From mathcomp Require Import eqtype ssrnat seq prime.
From mathcomp Require Import all_ssreflect.
From favssr Require Import prelude.
Set Implicit Arguments.
Unset Strict Implicit.
Expand Down Expand Up @@ -130,7 +129,7 @@

(* Exercise 4.1 *)

Fixpoint inorder2 (t : tree A) (acc : seq A) : seq A := [::]. (* FIXME *)

Check warning on line 132 in src/bintree.v

View workflow job for this annotation

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

Not a truly recursive fixpoint.

Check warning on line 132 in src/bintree.v

View workflow job for this annotation

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

Not a truly recursive fixpoint.

Check warning on line 132 in src/bintree.v

View workflow job for this annotation

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

Not a truly recursive fixpoint.

Lemma inorder2_correct t xs : inorder2 t xs = inorder t ++ xs.
Proof.
Expand Down Expand Up @@ -267,7 +266,7 @@

(* Exercise 4.2 *)

Fixpoint mcs (t : tree A) : tree A := t. (* FIXME *)

Check warning on line 269 in src/bintree.v

View workflow job for this annotation

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

Not a truly recursive fixpoint.

Check warning on line 269 in src/bintree.v

View workflow job for this annotation

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

Not a truly recursive fixpoint.

Check warning on line 269 in src/bintree.v

View workflow job for this annotation

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

Not a truly recursive fixpoint.

Lemma complete_mcs t : complete (mcs t).
Proof.
Expand Down Expand Up @@ -470,7 +469,7 @@

(* Exercise 4.3 *)

Fixpoint acomplete_rec (t : tree A) : bool :=

Check warning on line 472 in src/bintree.v

View workflow job for this annotation

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

Not a truly recursive fixpoint.

Check warning on line 472 in src/bintree.v

View workflow job for this annotation

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

Not a truly recursive fixpoint.

Check warning on line 472 in src/bintree.v

View workflow job for this annotation

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

Not a truly recursive fixpoint.
if t is Node l x r then
false (* FIXME *)
else true.
Expand Down Expand Up @@ -626,7 +625,7 @@
Definition node_mx (l : tree (P*P)) (a : P) (r : tree (P*P)) : tree (P*P) :=
@Leaf (P*P). (* FIXME *)

Fixpoint invar_mx (t : tree (P*P)) : bool :=

Check warning on line 628 in src/bintree.v

View workflow job for this annotation

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

Not a truly recursive fixpoint.

Check warning on line 628 in src/bintree.v

View workflow job for this annotation

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

Not a truly recursive fixpoint.

Check warning on line 628 in src/bintree.v

View workflow job for this annotation

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

Not a truly recursive fixpoint.
true. (* FIXME *)

Lemma max_invar t :
Expand Down
3 changes: 1 addition & 2 deletions src/braun.v
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
From Equations Require Import Equations.
From Coq Require Import ssreflect ssrbool ssrfun.
From mathcomp Require Import eqtype ssrnat seq prime bigop ssrAC.
From mathcomp Require Import all_ssreflect.
From favssr Require Import prelude bintree.

Set Implicit Arguments.
Expand Down
3 changes: 1 addition & 2 deletions src/braun_queue.v
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
From Equations Require Import Equations.
From Coq Require Import ssreflect ssrbool ssrfun.
From mathcomp Require Import ssrnat eqtype order seq.
From mathcomp Require Import all_ssreflect.
From favssr Require Import prelude bintree braun priority.

Set Implicit Arguments.
Expand Down
5 changes: 2 additions & 3 deletions src/bst.v
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
From Equations Require Import Equations.
From Coq Require Import ssreflect ssrbool ssrfun.
From mathcomp Require Import eqtype choice ssrnat seq order path.
From mathcomp Require Import all_ssreflect.
From favssr Require Import prelude bintree.
Set Implicit Arguments.
Unset Strict Implicit.
Expand Down Expand Up @@ -1037,4 +1036,4 @@ Lemma search1_correct t x :
Proof.
Admitted.

End IntervalTrees.
End IntervalTrees.
3 changes: 1 addition & 2 deletions src/huffman.v
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
From Equations Require Import Equations.
From Coq Require Import ssreflect ssrbool ssrfun.
From mathcomp Require Import eqtype ssrnat seq bigop ssrAC.
From mathcomp Require Import all_ssreflect.
From favssr Require Import prelude.

Set Implicit Arguments.
Expand Down
3 changes: 1 addition & 2 deletions src/leftist.v
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
From Coq Require Import ssreflect ssrbool ssrfun.
From mathcomp Require Import ssrnat eqtype order seq path prime.
From mathcomp Require Import all_ssreflect.
From favssr Require Import prelude bintree priority.

Set Implicit Arguments.
Expand Down
3 changes: 1 addition & 2 deletions src/prelude.v
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
From Coq Require Import ssreflect ssrbool ssrfun.
From mathcomp Require Import ssrnat eqtype seq order path prime div.
From mathcomp Require Import all_ssreflect.
Set Implicit Arguments.
Unset Strict Implicit.
Unset Printing Implicit Defensive.
Expand Down Expand Up @@ -351,7 +350,7 @@
case: xs=>//=x xs _; elim/last_ind: xs=>/=.
- by rewrite lexx inE eq_refl.
move=>xs y /andP [/andP [IH1 IH2]]; rewrite !inE=>IH3.
rewrite foldl_rcons le_minl IH1 /= mem_rcons inE eq_minr all_rcons le_minl lexx orbT /=.

Check warning on line 353 in src/prelude.v

View workflow job for this annotation

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

Notation le_minl is deprecated since mathcomp 1.18.0.

Check warning on line 353 in src/prelude.v

View workflow job for this annotation

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

Notation le_minl is deprecated since mathcomp 1.18.0.

Check warning on line 353 in src/prelude.v

View workflow job for this annotation

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

Notation le_minl is deprecated since mathcomp 1.18.0.

Check warning on line 353 in src/prelude.v

View workflow job for this annotation

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

Notation le_minl is deprecated since mathcomp 1.18.0.

Check warning on line 353 in src/prelude.v

View workflow job for this annotation

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

Notation le_minl is deprecated since mathcomp 1.18.0.

Check warning on line 353 in src/prelude.v

View workflow job for this annotation

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

Notation le_minl is deprecated since mathcomp 1.18.0.

Check warning on line 353 in src/prelude.v

View workflow job for this annotation

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

Notation le_minl is deprecated since mathcomp 1.18.0.

Check warning on line 353 in src/prelude.v

View workflow job for this annotation

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

Notation le_minl is deprecated since mathcomp 1.18.0.

Check warning on line 353 in src/prelude.v

View workflow job for this annotation

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

Notation le_minl is deprecated since mathcomp 1.18.0.

Check warning on line 353 in src/prelude.v

View workflow job for this annotation

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

Notation le_minl is deprecated since mathcomp 1.18.0.

Check warning on line 353 in src/prelude.v

View workflow job for this annotation

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

Notation le_minl is deprecated since mathcomp 1.18.0.

Check warning on line 353 in src/prelude.v

View workflow job for this annotation

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

Notation le_minl is deprecated since mathcomp 1.18.0.
rewrite {1 3 6}/Order.min; case: ifP.
- by rewrite IH2 /= =>H; case/orP: IH3=>[/eqP->|->]; rewrite ?eqxx ?orbT.
move/negbT; rewrite -leNgt=>Hy; rewrite Hy /= orbT andbT.
Expand All @@ -366,7 +365,7 @@
Proof.
move=>Hyx; elim/last_ind: xs=>//=t h IH.
rewrite all_rcons foldl_rcons; case/andP=>Hy Ha.
by rewrite le_minr Hy IH.

Check warning on line 368 in src/prelude.v

View workflow job for this annotation

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

Notation le_minr is deprecated since mathcomp 1.18.0.

Check warning on line 368 in src/prelude.v

View workflow job for this annotation

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

Notation le_minr is deprecated since mathcomp 1.18.0.

Check warning on line 368 in src/prelude.v

View workflow job for this annotation

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

Notation le_minr is deprecated since mathcomp 1.18.0.

Check warning on line 368 in src/prelude.v

View workflow job for this annotation

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

Notation le_minr is deprecated since mathcomp 1.18.0.

Check warning on line 368 in src/prelude.v

View workflow job for this annotation

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

Notation le_minr is deprecated since mathcomp 1.18.0.

Check warning on line 368 in src/prelude.v

View workflow job for this annotation

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

Notation le_minr is deprecated since mathcomp 1.18.0.
Qed.

Lemma all_foldl_eq (x : T) xs :
Expand Down Expand Up @@ -426,7 +425,7 @@
case/andP: (mins_min_in Hy)=>Hay Hiy.
apply/andP; split.
- rewrite all_cat; apply/andP; split.
- by apply/sub_all/Hax=>z Hz; rewrite le_minl Hz.

Check warning on line 428 in src/prelude.v

View workflow job for this annotation

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

Notation le_minl is deprecated since mathcomp 1.18.0.

Check warning on line 428 in src/prelude.v

View workflow job for this annotation

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

Notation le_minl is deprecated since mathcomp 1.18.0.
by apply/sub_all/Hay=>z Hz; rewrite le_minl Hz orbT.
rewrite minElt; case: ifP=>_; rewrite mem_cat.
- by rewrite Hix.
Expand Down
3 changes: 1 addition & 2 deletions src/priority.v
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
From Coq Require Import ssreflect ssrbool ssrfun.
From mathcomp Require Import eqtype order seq path.
From mathcomp Require Import all_ssreflect.
From favssr Require Import prelude bintree.

Set Implicit Arguments.
Expand Down Expand Up @@ -77,7 +76,7 @@

Definition empty_list : seq T := [::].

Fixpoint ins_list (x : T) (xs : seq T) : seq T := xs. (* FIXME *)

Check warning on line 79 in src/priority.v

View workflow job for this annotation

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

Not a truly recursive fixpoint.

Check warning on line 79 in src/priority.v

View workflow job for this annotation

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

Not a truly recursive fixpoint.

Check warning on line 79 in src/priority.v

View workflow job for this annotation

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

Not a truly recursive fixpoint.

Definition del_min_list (xs : seq T) : seq T := xs. (* FIXME *)

Expand Down
3 changes: 1 addition & 2 deletions src/quadtree.v
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
From Equations Require Import Equations.
From Coq Require Import ssreflect ssrbool ssrfun.
From mathcomp Require Import eqtype choice ssrnat div bigop ssrAC seq ssralg.
From mathcomp Require Import all_ssreflect ssralg.
From favssr Require Import prelude.
Set Implicit Arguments.
Unset Strict Implicit.
Expand Down Expand Up @@ -318,7 +317,7 @@

(* Exercise 13.1 *)

Fixpoint union (t1 t2 : qtb) : qtb := t1. (* FIXME *)

Check warning on line 320 in src/quadtree.v

View workflow job for this annotation

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

Not a truly recursive fixpoint.

Check warning on line 320 in src/quadtree.v

View workflow job for this annotation

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

Not a truly recursive fixpoint.

Check warning on line 320 in src/quadtree.v

View workflow job for this annotation

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

Not a truly recursive fixpoint.

Lemma height_union t1 t2 : height (union t1 t2) <= maxn (height t1) (height t2).
Proof.
Expand All @@ -337,9 +336,9 @@
Admitted.

(* this might get in handy *)
Fixpoint negate (t : qtb) : qtb := t. (* FIXME *)

Check warning on line 339 in src/quadtree.v

View workflow job for this annotation

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

Not a truly recursive fixpoint.

Check warning on line 339 in src/quadtree.v

View workflow job for this annotation

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

Not a truly recursive fixpoint.

Check warning on line 339 in src/quadtree.v

View workflow job for this annotation

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

Not a truly recursive fixpoint.

Fixpoint diff (t1 t2 : qtb) : qtb := t1. (* FIXME *)

Check warning on line 341 in src/quadtree.v

View workflow job for this annotation

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

Not a truly recursive fixpoint.

Check warning on line 341 in src/quadtree.v

View workflow job for this annotation

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

Not a truly recursive fixpoint.

Check warning on line 341 in src/quadtree.v

View workflow job for this annotation

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

Not a truly recursive fixpoint.

Lemma height_diff t1 t2 : height (diff t1 t2) <= maxn (height t1) (height t2).
Proof.
Expand Down Expand Up @@ -654,7 +653,7 @@

Definition shift_mx (f : nat -> nat -> A) (x y i j : nat) : A := f (i+x) (j+y).

Fixpoint qt_of_fun (f : nat -> nat -> A) (n : nat) : qtree A := L (f 0 0). (* FIXME *)

Check warning on line 656 in src/quadtree.v

View workflow job for this annotation

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

Not a truly recursive fixpoint.

Check warning on line 656 in src/quadtree.v

View workflow job for this annotation

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

Not a truly recursive fixpoint.

Check warning on line 656 in src/quadtree.v

View workflow job for this annotation

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

Not a truly recursive fixpoint.

Lemma height_qt_of_fun f n :
height (qt_of_fun f n) <= n.
Expand Down
3 changes: 1 addition & 2 deletions src/redblack.v
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
From Equations Require Import Equations.
From Coq Require Import ssreflect ssrbool ssrfun.
From mathcomp Require Import eqtype ssrnat prime order seq path.
From mathcomp Require Import all_ssreflect.
From favssr Require Import prelude bintree bst adt.
Set Implicit Arguments.
Unset Strict Implicit.
Expand Down
3 changes: 1 addition & 2 deletions src/selection.v
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
From Equations Require Import Equations.
From Coq Require Import ssreflect ssrbool ssrfun.
From mathcomp Require Import ssrnat eqtype seq path order bigop div ssrnum ssralg ssrint prime.
From mathcomp Require Import all_ssreflect ssralg ssrnum ssrint.
From favssr Require Import prelude sorting.
Set Implicit Arguments.
Unset Strict Implicit.
Expand Down
3 changes: 1 addition & 2 deletions src/sorting.v
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
From Equations Require Import Equations.
From Coq Require Import ssreflect ssrbool ssrfun.
From mathcomp Require Import ssrnat eqtype seq path order bigop prime.
From mathcomp Require Import all_ssreflect.
From favssr Require Import prelude.
Set Implicit Arguments.
Unset Strict Implicit.
Expand Down Expand Up @@ -305,7 +304,7 @@

(* Exercise 2.6 *)

Fixpoint halve {A: Type} (xs ys zs : seq A) : seq A * seq A :=

Check warning on line 307 in src/sorting.v

View workflow job for this annotation

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

Not a truly recursive fixpoint.

Check warning on line 307 in src/sorting.v

View workflow job for this annotation

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

Not a truly recursive fixpoint.

Check warning on line 307 in src/sorting.v

View workflow job for this annotation

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

Not a truly recursive fixpoint.
([::],[::]). (* FIXME *)

Equations? msort2 xs : seq T by wf (size xs) lt :=
Expand Down
3 changes: 1 addition & 2 deletions src/trie.v
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
From Equations Require Import Equations.
From Coq Require Import ssreflect ssrbool ssrfun.
From mathcomp Require Import eqtype ssrnat seq.
From mathcomp Require Import all_ssreflect.
From favssr Require Import prelude bintree adt.

Set Implicit Arguments.
Expand Down
3 changes: 1 addition & 2 deletions src/twothree.v
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
From Equations Require Import Equations.
From Coq Require Import ssreflect ssrbool ssrfun.
From mathcomp Require Import ssrnat eqtype order seq path.
From mathcomp Require Import all_ssreflect.
From favssr Require Import prelude bst adt.

Set Implicit Arguments.
Expand Down
Loading