Skip to content
Merged
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
4 changes: 2 additions & 2 deletions src/Extract.v
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
(* 02110-1301 USA *)

From Stalmarck Require Import algoRun.
From Coq Require Import ZArith.
From Coq Require Import Extraction.
From Stdlib Require Import ZArith.
From Stdlib Require Import Extraction.

Extraction "stal.ml" run checkTracef zero Pos.of_succ_nat.
2 changes: 1 addition & 1 deletion src/staltac_lib.ml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ let global_reference_in_absolute_module dir id =
Nametab.global_of_path (Libnames.make_path dir id)

let constant dir s =
let dir = DirPath.make (List.map Id.of_string (List.rev ("Coq"::dir))) in
let dir = DirPath.make (List.map Id.of_string (List.rev ("Corelib"::dir))) in
let id = Id.of_string s in
try
EConstr.of_constr (UnivGen.constr_of_monomorphic_global (Global.env ()) (global_reference_in_absolute_module dir id))
Expand Down
2 changes: 1 addition & 1 deletion theories/Algorithm/BoolAux.v
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Some standard properties of booleans.

*)

From Coq Require Export Bool.
From Stdlib Require Export Bool.

Lemma de_morgan1 : forall b1 b2 : bool, negb (b1 || b2) = negb b1 && negb b2.
Proof.
Expand Down
10 changes: 5 additions & 5 deletions theories/Algorithm/OrderedListEq.v
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ we took a special care so that every function can be evaluated
inside Coq, see OrderedListEq_ex
*)

From Coq Require Import Arith.
From Coq Require Export List.
From Coq Require Import Lexicographic_Exponentiation.
From Coq Require Export Relation_Definitions.
From Coq Require Export Relation_Operators.
From Stdlib Require Import Arith.
From Stdlib Require Export List.
From Stdlib Require Import Lexicographic_Exponentiation.
From Stdlib Require Export Relation_Definitions.
From Stdlib Require Export Relation_Operators.
From Stalmarck Require Export sTactic.

Section OrderedList.
Expand Down
4 changes: 2 additions & 2 deletions theories/Algorithm/OrderedListEq_ex.v
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ How to use OrderedList
*)

From Stalmarck Require Import OrderedListEq.
From Coq Require Import Arith. (* For Nat *)
From Stdlib Require Import Arith. (* For Nat *)

Definition CNat : forall a b : nat, {a < b} + {b < a} + {a = b}.
fix CNat 1; intros a; case a; [ idtac | intros a' ]; intros b; case b;
Expand Down Expand Up @@ -58,7 +58,7 @@ Eval compute in (appnat l1 l2).
Eval compute in (getminnat l1 l2).
Eval compute in (internat l1 l2).

From Coq Require Import ZArith. (* For Z *)
From Stdlib Require Import ZArith. (* For Z *)

Definition CZ : forall a b : Z, {(a < b)%Z} + {(b < a)%Z} + {a = b}.
intros a b; CaseEq (a - b)%Z.
Expand Down
4 changes: 2 additions & 2 deletions theories/Algorithm/PolyListAux.v
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ Pierre Letouzey & Laurent Thery
Definition of rem a function that removes elt from polymorphic lists
*)

From Coq Require Import Arith.
From Coq Require Import List.
From Stdlib Require Import Arith.
From Stdlib Require Import List.

Section Auxrem.
Variable A : Type.
Expand Down
2 changes: 1 addition & 1 deletion theories/Algorithm/algoRun.v
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Pierre Letouzey & Laurent Thery
Some examples of computing with stalmarck inside Coq
*)

From Coq Require Import ZArith.
From Stdlib Require Import ZArith.
From Stalmarck Require Export algoStalmarck.
From Stalmarck Require Export algoTrace.
From Stalmarck Require Export makeTriplet.
Expand Down
2 changes: 1 addition & 1 deletion theories/Algorithm/complete.v
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ rewrite (Hab1 f Abs Hf2); rewrite (rZEvalCompInv b f).
case (rZEval f b); auto with bool stalmarck.
Qed.

From Coq Require Import Arith.
From Stdlib Require Import Arith.

Fixpoint nthTail (n : nat) : list rZ -> list rZ :=
fun l : list rZ =>
Expand Down
2 changes: 1 addition & 1 deletion theories/Algorithm/equalBefore.v
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Pierre Letouzey & Laurent Thery
Definition of equality on booleans up to a certain number
*)

From Coq Require Import Relation_Definitions.
From Stdlib Require Import Relation_Definitions.
From Stalmarck Require Export triplet.

(** f and g gives same value for rNat less than m *)
Expand Down
2 changes: 1 addition & 1 deletion theories/Algorithm/interImplement2.v
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Implement the intersection (2 files)
From Stalmarck Require Import rZ.
From Stalmarck Require Import OrderedListEq.
From Stalmarck Require Import LetP.
From Coq Require Import Relation_Definitions.
From Stdlib Require Import Relation_Definitions.
From Stalmarck Require Import state.
From Stalmarck Require Import restrictState.
From Stalmarck Require Import ltState.
Expand Down
2 changes: 1 addition & 1 deletion theories/Algorithm/interImplement2_ex.v
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ How to use our module on ordered list
*)

From Stalmarck Require Import interImplement2.
From Coq Require Import ZArith.
From Stdlib Require Import ZArith.

#[local] Definition A := rArrayInit _ (fun n : rNat => class nil).

Expand Down
2 changes: 1 addition & 1 deletion theories/Algorithm/interState.v
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Pierre Letouzey & Laurent Thery
Definition of the intersection of two states
*)

From Coq Require Import List.
From Stdlib Require Import List.
From Stalmarck Require Export stateDec.

(** The property of being an intersection *)
Expand Down
8 changes: 4 additions & 4 deletions theories/Algorithm/ltState.v
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ of valid equations where variables belong to a given list
*)

From Stalmarck Require Import state.
From Coq Require Import Arith.
From Stdlib Require Import Arith.
From Stalmarck Require Import stateDec.
From Coq Require Import Inverse_Image.
From Coq Require Import Compare.
From Coq Require Import Relation_Definitions.
From Stdlib Require Import Inverse_Image.
From Stdlib Require Import Compare.
From Stdlib Require Import Relation_Definitions.

Section lt.
Variable L : list rNat.
Expand Down
12 changes: 6 additions & 6 deletions theories/Algorithm/rZ.v
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ At the end we define functional arrays that will be used in implementation
*)

From Stalmarck Require Import sTactic.
From Coq Require Import Relation_Definitions.
From Coq Require Import ZArith.
From Coq Require Import Inverse_Image.
From Coq Require Import Inclusion.
From Coq Require Import Wf_nat.
From Coq Require Import List.
From Stdlib Require Import Relation_Definitions.
From Stdlib Require Import ZArith.
From Stdlib Require Import Inverse_Image.
From Stdlib Require Import Inclusion.
From Stdlib Require Import Wf_nat.
From Stdlib Require Import List.

Definition rNat := positive.

Expand Down
4 changes: 2 additions & 2 deletions theories/Algorithm/refl.v
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ Pierre Letouzey & Laurent Thery
Construct a function of type [Expr -> Prop]
*)

From Coq Require Import ZArith.
From Stdlib Require Import ZArith.
From Stalmarck Require Import normalize.
From Coq Require Import Classical.
From Stdlib Require Import Classical.
From Stalmarck Require Import sTactic.

Section refl.
Expand Down
2 changes: 1 addition & 1 deletion theories/Algorithm/state.v
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Pierre Letouzey & Laurent Thery
Definition of states as the list of equations, i.e., pairs of rZ
*)

From Coq Require Import List.
From Stdlib Require Import List.
From Stalmarck Require Export triplet.

Definition State := list (rZ * rZ).
Expand Down
2 changes: 1 addition & 1 deletion theories/Algorithm/stateDec.v
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Pierre Letouzey & Laurent Thery
Given a state, equality is decidable
*)

From Coq Require Import List.
From Stdlib Require Import List.
From Stalmarck Require Export state.

(** To show that the equality is decidable we need a more `constructive' predicate
Expand Down
4 changes: 2 additions & 2 deletions theories/Algorithm/triplet.v
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ Pierre Letouzey & Laurent Thery
Definition of triplets
*)

From Coq Require Export Bool.
From Stdlib Require Export Bool.
From Stalmarck Require Export rZ.
From Coq Require Export List.
From Stdlib Require Export List.
From Stalmarck Require Export normalize.
From Stalmarck Require Export sTactic.

Expand Down
2 changes: 1 addition & 1 deletion theories/Algorithm/unionState.v
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Pierre Letouzey & Laurent Thery
Definition of the union of two states
*)

From Coq Require Import List.
From Stdlib Require Import List.
From Stalmarck Require Export state.

(** The property of being an union *)
Expand Down
4 changes: 2 additions & 2 deletions theories/Algorithm/wfArray.v
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ Define a notion of wellformedness of function arrays for our application

From Stalmarck Require Export rZ.
From Stalmarck Require Export OrderedListEq.
From Coq Require Export Relation_Definitions.
From Stdlib Require Export Relation_Definitions.
From Stalmarck Require Export LetP.
From Stalmarck Require Export PolyListAux.
From Coq Require Export List.
From Stdlib Require Export List.
From Stalmarck Require Export sTactic.

(** Definition of well formed array and some properties *)
Expand Down
2 changes: 1 addition & 1 deletion theories/Tactic/StalTac.v
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Pierre Letouzey & Laurent Thery
A wrapper for the stalmarck tactic
*)

From Coq Require Export ZArith.
From Stdlib Require Export ZArith.
From Stalmarck Require Export normalize.
From Stalmarck Require Export algoTrace.
From Stalmarck Require Export refl.
Expand Down
2 changes: 1 addition & 1 deletion theories/Tactic/StalTac_ex.v
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Examples for the stalmarck tactic
*)

From Stalmarck Require Import StalTac.
From Coq Require Import Classical.
From Stdlib Require Import Classical.

Theorem Praeclarum :
forall x y z t : Prop, (x -> z) /\ (y -> t) -> x /\ y -> z /\ t.
Expand Down
Loading