Skip to content

Adapt to rocq-prover/rocq#21129. #220

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.

Sign up for GitHub

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

Merged
ppedrot merged 1 commit into from
Sep 28, 2025
Merged

Adapt to rocq-prover/rocq#21129. #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
78 changes: 39 additions & 39 deletions algebra/CMonoids.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,12 +253,12 @@ Proof.
astepl ((Inv f iso_imp_bij) (f a' [+] f b')).
astepl ((Inv f iso_imp_bij) ( f ( a'[+] b'))).
set (H3:= (inv2 M1 M2 f iso_imp_bij (a'[+]b'))).
astepl (a'[+]b'). astepr (a'[+] b'). intuition.
astepl (a'[+]b'). astepr (a'[+] b'). intuition; auto with *.
set (H4:=(inv2 M1 M2 f iso_imp_bij a')).
apply csbf_wd.
astepr (Inv f iso_imp_bij (f a')); intuition.
astepr (Inv f iso_imp_bij (f b')). set (H5:= (inv2 M1 M2 f iso_imp_bij b')); intuition.
intuition.
astepr (Inv f iso_imp_bij (f a')); intuition; auto with *.
astepr (Inv f iso_imp_bij (f b')). set (H5:= (inv2 M1 M2 f iso_imp_bij b')); intuition; auto with *.
intuition; auto with *.
apply Inv_bij.
Qed.

Expand Down Expand Up @@ -335,11 +335,11 @@ Proof.
induction s.
simpl.
replace (k+0) with k.
intuition.
intuition; auto with *.
intuition.
simpl.
replace (k+((l-k)+s*(l-k))) with (l + s*(l-k)).
2:intuition.
2:intuition; auto with *.
set (H1:= (power_plus M u l (s*(l-k)))).
astepr (csbf_fun (csg_crr (cm_crr M)) (csg_crr (cm_crr M))
(csg_crr (cm_crr M)) (csg_op (c:=cm_crr M)) (power_CMonoid u l) (power_CMonoid u (s * (l - k)))).
Expand Down Expand Up @@ -374,7 +374,7 @@ Proof.
intros H4.
set (H6:=(Z_div_mod_eq_full (n-k)(l-k))).
cut (((n - k) mod (l - k))= (n-k)%Z -((l - k) * ((n - k) / (l - k))))%Z.
2:intuition.
2:intuition; auto with *.
set (H7:=(mod_nat_correct (n-k) (l-k) H2)).
intro H8.
cut {s:nat | (mod_nat (n-k)(l-k) H2)=(n-k)-s*(l-k) and s*(l-k)<=(n-k)}.
Expand All @@ -391,7 +391,7 @@ Proof.
rewrite -> (power_plus M u (k+(s*(l-k))) ((n-k)-s*(l-k))).
rewrite -> (power_plus M u k (n-k-s*(l-k))).
setoid_replace (power_CMonoid u (k + s * (l - k))) with (power_CMonoid u k). now reflexivity.
unfold canonical_names.equiv. now intuition.
unfold canonical_names.equiv. now intuition; auto with *.
cut (n=k+(n-k)).
intro H10.
cut (n=((k+(n-k))+(s*(l-k)-s*(l-k)))).
Expand All @@ -408,18 +408,18 @@ Proof.
intro H11.
rewrite H11.
now intuition.
now intuition.
now intuition; auto with *.
cut (n=n+(k-k)).
intro H10.
cut (n+(k-k)=k+(n-k)).
intro H11.
now rewrite<- H10 in H11.
apply minus3.
split; now intuition.
split; now intuition; auto with *.
cut ((k-k)=0).
intro H10.
now rewrite H10.
now intuition.
now intuition; auto with *.
simpl.
cut (l-k>0).
intro H9.
Expand All @@ -435,17 +435,17 @@ Proof.
elim H10'.
clear H10'.
intros H10' H10''.
3:intuition.
3:intuition; auto with *.
cut ((n-k)= q*(l-k)+ (mod_nat (n-k)(l-k) H2)).
intro H11.
intuition.
intuition; auto with *.
cut (r= (mod_nat (n-k)(l-k)H2)).
intro H11.
now rewrite<- H11.
simpl.
cut ((Z_of_nat r)=(mod_nat (n - k) (l - k) H2)).
intro H11.
intuition.
intuition; auto with *.
rewrite<- H7.
apply nat_Z_div with (n-k) q (l-k) ((Z_of_nat n - Z_of_nat k) / (Z_of_nat l - Z_of_nat k))%Z.
exact H10'.
Expand All @@ -459,17 +459,17 @@ Proof.
set (H16:=(inj_minus1 n k H14)).
rewrite H16.
exact H6.
intuition.
intuition.
intuition; auto with *.
intuition; auto with *.
set (H17:=(Z_mod_lt (Z_of_nat (n-k)) (Z_of_nat (l-k)))).
intuition.
intuition; auto with *.
elim H10.
clear H10.
intros r H10.
elim H10.
clear H10.
intros H10 H10'.
intuition.
intuition; auto with *.
Qed.

Lemma cyc_imp_comm: forall (M:CMonoid)(H:(cyclic M)), (commutes (@csg_op M)).
Expand All @@ -491,7 +491,7 @@ Proof.
replace (nx+ny) with (ny+nx).
rewrite -> (power_plus M c0 ny nx).
now apply eq_reflexive.
intuition.
intuition; auto with *.
Qed.

Lemma weakly_inj1:
Expand Down Expand Up @@ -544,12 +544,12 @@ Proof.
split.
intuition.
right.
intuition.
intuition.
intuition; auto with *.
intuition; auto with *.
clear orex.
intro orex.
intuition.
intuition.
intuition; auto with *.
intuition auto with *.
clear H5.
intro H5.
cut False.
Expand Down Expand Up @@ -587,13 +587,13 @@ Proof.
split.
intuition.
right.
intuition.
intuition.
intuition auto with *.
intuition auto with *.
clear orex.
intro orex.
intuition.
intuition.
intuition.
intuition; auto with *.
intuition auto with *.
intuition; auto with *.

Qed.

Expand Down Expand Up @@ -716,14 +716,14 @@ Proof.
simpl.
split.
split.
intuition.
intuition; auto with *.
intros a b.
case a.
intros a0 a1.
case b.
intros b0 b1.
simpl.
intuition.
intuition; auto with *.
unfold bijective.
split.
unfold injective.
Expand All @@ -741,7 +741,7 @@ Proof.
intros a0 a1.
exists (pairT a1 a0).
simpl.
intuition.
intuition; auto with *.
Qed.

End p71E2b2.
Expand All @@ -768,7 +768,7 @@ Proof.
unfold eq_fun in |- *.
unfold id_un_op in |- *.
simpl in |- *.
intuition.
intuition; auto with *.
Qed.

Lemma id_is_lft_unit :
Expand All @@ -781,7 +781,7 @@ Proof.
unfold eq_fun in |- *.
unfold id_un_op in |- *.
simpl in |- *.
intuition.
intuition; auto with *.
Qed.

Definition FS_is_CMonoid (A : CSetoid) :=
Expand Down Expand Up @@ -813,7 +813,7 @@ Proof.
induction a.
apply eq_fm_reflexive.
simpl.
intuition.
intuition; auto with *.
Qed.

Section Th12.
Expand All @@ -835,7 +835,7 @@ Proof.
simpl.
intuition.
simpl.
intuition.
intuition; auto with *.
Qed.

Lemma nil_is_lft_unit: (is_lft_unit (app_as_csb_fun A) (empty_word A)).
Expand All @@ -847,7 +847,7 @@ Proof.
simpl.
intuition.
simpl.
intuition.
intuition; auto with *.
Qed.

Definition free_monoid_is_CMonoid:
Expand Down Expand Up @@ -943,7 +943,7 @@ Proof.
unfold Dbrack.
exists (@nil M).
simpl.
intuition.
intuition; auto with *.
Qed.


Expand All @@ -958,7 +958,7 @@ Proof.
simpl.
astepr (a [+] ( (cm_Sum k)[+](cm_Sum l))).
apply csbf_wd_unfolded.
intuition.
intuition; auto with *.
exact IHk.
Qed.

Expand Down Expand Up @@ -986,7 +986,7 @@ Qed.
Lemma cm_Sum_units (a: list M): (forall x, In x a -> x [=] [0]) -> cm_Sum a [=] [0].
Proof with intuition.
clear D.
induction a. intuition.
induction a. intuition; auto with *.
intros E.
simpl.
rewrite IHa...
Expand Down
2 changes: 1 addition & 1 deletion algebra/COrdFields2.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -739,7 +739,7 @@ Proof.
astepr ((Two:R)[^]S n).
astepl (([1]:R)[^]S n).
apply nexp_resp_less.
intuition.
intuition; auto with *.
apply less_leEq.
apply pos_one.
apply one_less_two.
Expand Down
2 changes: 1 addition & 1 deletion algebra/CSemiGroups.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ Proof.
intros x y.
apply eq_fm_reflexive.
simpl.
intuition.
intuition; auto with *.
Qed.

Definition Astar_as_CSemiGroup:=
Expand Down
4 changes: 2 additions & 2 deletions algebra/CSetoidFun.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ Proof.
simpl in |- *.
unfold eq_fun in |- *.
simpl in |- *.
intuition.
intuition; auto with *.
Qed.

Section unary_and_binary_function_composition.
Expand Down Expand Up @@ -579,7 +579,7 @@ Proof.
simpl.
intuition.
simpl.
intuition.
intuition; auto with *.
Qed.

End p66E2b4.
Expand Down
4 changes: 2 additions & 2 deletions liouville/Liouville.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,8 +239,8 @@ Proof.
unfold Z.abs.
destruct p.
destruct Hap; reflexivity.
simpl; unfold Qle; simpl; intuition.
simpl; unfold Qle; simpl; intuition.
simpl; unfold Qle; simpl; intuition; auto with *.
simpl; unfold Qle; simpl; intuition; auto with *.
Qed.

Lemma Liouville_lemma5 : forall (p : Z_as_CRing) (q : positive), (zx2qx P) ! (p#q)%Q [#] [0] ->
Expand Down
24 changes: 12 additions & 12 deletions logic/CLogic.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1610,7 +1610,7 @@ Lemma CForall_indexed {A} (P: A -> Type) (l: list A): CForall P l ->
Proof.
intros X i.
revert l X.
induction i; destruct l; simpl in *; intuition; exfalso; inversion H.
induction i; destruct l; simpl in *; intuition; auto with *; exfalso; inversion H.
Qed.

Lemma CForall_map {A B} (P: B -> Type) (f: A -> B) (l: list A):
Expand Down Expand Up @@ -1639,24 +1639,24 @@ Qed.

Lemma CNoDup_indexed {T} (R: T -> T -> Type) (Rsym: Csymmetric _ R) (l: list T) (d: T): CNoDup R l ->
forall i j, (i < length l)%nat -> (j < length l)%nat -> i <> j -> R (nth i l d) (nth j l d).
Proof with intuition.
induction l; simpl...
exfalso...
Proof.
induction l; simpl; intuition.
exfalso; auto with *.
destruct i.
destruct j...
apply (CForall_indexed (R a) l)...
destruct j...
destruct j; intuition.
apply (CForall_indexed (R a) l); auto with *.
destruct j; auto with *.
apply Rsym.
apply (CForall_indexed (R a) l)...
apply (CForall_indexed (R a) l); auto with *.
Qed.

Lemma CNoDup_map {A B: Type} (R: B -> B -> Type) (f: A -> B):
forall l, CNoDup (fun x y => R (f x) (f y)) l IFF CNoDup R (map f l).
Proof with auto; intuition.
induction l; simpl...
Proof.
induction l; simpl; auto; intuition; auto with *.
split; intro; split.
apply IHl, X.
apply CForall_map...
apply CForall_map; auto; intuition.
apply IHl, X.
apply CForall_map...
apply CForall_map; auto; intuition.
Qed.
Loading
Loading