Skip to content

Commit

Permalink
Adapt to coq/coq#18164
Browse files Browse the repository at this point in the history
We want to remove some deprecated Arith files and NPeano from the
stdlib.
  • Loading branch information
Villetaneuse committed Oct 25, 2023
1 parent 7ac1461 commit 8a52cd9
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 15 deletions.
19 changes: 8 additions & 11 deletions tests/Test.v
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

(*i $Id: List.v 10999 2008-05-27 15:55:22Z letouzey $ i*)

Require Import Le Gt Minus Min Bool.
Require Import Arith Bool.

Set Implicit Arguments.

Expand Down Expand Up @@ -566,7 +566,7 @@ Section Elts.
Theorem count_occ_In : forall (l : list A) (x : A), In x l <-> count_occ l x > 0.
Proof.
induction l as [|y l].
simpl; intros; split; [destruct 1 | apply gt_irrefl].
simpl; intros; split; [destruct 1 | apply Nat.lt_irrefl].
simpl. intro x; destruct (eqA_dec y x) as [Heq|Hneq].
rewrite Heq; intuition.
pose (IHl x). intuition.
Expand Down Expand Up @@ -695,16 +695,13 @@ Section ListOps.
simpl (rev (a :: l)).
simpl (length (a :: l) - S n).
inversion H.
rewrite <- minus_n_n; simpl.
rewrite Nat.sub_diag; simpl.
rewrite <- rev_length.
rewrite app_nth2; auto.
rewrite <- minus_n_n; auto.
rewrite app_nth1; auto.
rewrite (minus_plus_simpl_l_reverse (length l) n 1).
replace (1 + length l) with (S (length l)); auto with arith.
rewrite <- minus_Sn_m; [|auto with arith].
apply IHl ; auto with arith.
rewrite rev_length; auto.
rewrite Nat.sub_diag; auto.
rewrite app_nth1 by (rewrite rev_length; exact H1).
rewrite <-Nat.sub_succ, Nat.sub_succ_l by (exact H1).
apply IHl; exact H1.
Qed.


Expand Down Expand Up @@ -1551,7 +1548,7 @@ Section length_order.
Proof.
unfold lel in |- *; intros.
now_show (length l <= length n).
apply le_trans with (length m); auto with arith.
apply Nat.le_trans with (length m); auto with arith.
Qed.

Lemma lel_cons_cons : lel l m -> lel (a :: l) (b :: m).
Expand Down
8 changes: 4 additions & 4 deletions tests/graph.dpd.oracle
Original file line number Diff line number Diff line change
Expand Up @@ -823,14 +823,14 @@ E: 113 183 [weight=3, ];
E: 114 181 [weight=1, ];
E: 114 183 [weight=10, ];
E: 115 116 [weight=2, ];
E: 115 121 [weight=36, ];
E: 115 121 [weight=35, ];
E: 115 135 [weight=1, ];
E: 115 136 [weight=1, ];
E: 115 145 [weight=43, ];
E: 115 145 [weight=41, ];
E: 115 169 [weight=10, ];
E: 115 173 [weight=78, ];
E: 115 173 [weight=73, ];
E: 115 179 [weight=1, ];
E: 115 181 [weight=30, ];
E: 115 181 [weight=29, ];
E: 115 182 [weight=37, ];
E: 115 183 [weight=4, ];
E: 116 121 [weight=9, ];
Expand Down
1 change: 1 addition & 0 deletions tests/search.oracle
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Welcome to Coq
[Loading ML file coq-dpdgraph.plugin ... done]
[Loading ML file ring_plugin.cmxs (using legacy method) ... done]
Fetching opaque proofs from disk for dpdgraph.tests.Test
[cons(42) nil(6) perm_swap(1) perm_skip(3) list(18) Permutation(11) app(43)
Permutation_trans(3) eq_ind_r(1) eq_ind(2) list_ind(2) Permutation_refl(2)
Expand Down

0 comments on commit 8a52cd9

Please sign in to comment.