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

Fix scheme issue #116

Merged
merged 5 commits into from
Jan 25, 2022
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
1 change: 0 additions & 1 deletion theories/ordinals/Ackermann/Deduction.v
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Set Apply With Renaming.

Require Import Ensembles.
Require Import Coq.Lists.List.
Expand Down
1 change: 0 additions & 1 deletion theories/ordinals/Ackermann/LNN.v
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Set Apply With Renaming.

Require Import Arith.
Require Import Ensembles.
Expand Down
1 change: 0 additions & 1 deletion theories/ordinals/Ackermann/LNN2LNT.v
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Set Apply With Renaming.

Require Import Ensembles.
Require Import Coq.Lists.List.
Expand Down
1 change: 0 additions & 1 deletion theories/ordinals/Ackermann/LNT.v
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Set Apply With Renaming.

Require Import Arith.
Require Import Ensembles.
Expand Down
1 change: 0 additions & 1 deletion theories/ordinals/Ackermann/Languages.v
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Set Apply With Renaming.

Require Import Arith.
Require Import fol.
Expand Down
2 changes: 0 additions & 2 deletions theories/ordinals/Ackermann/ListExt.v
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
Set Apply With Renaming.

Require Import Coq.Lists.List.

Section List_Remove.
Expand Down
1 change: 0 additions & 1 deletion theories/ordinals/Ackermann/NN.v
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Set Apply With Renaming.

Require Import Arith.
Require Import Ensembles.
Expand Down
1 change: 0 additions & 1 deletion theories/ordinals/Ackermann/NN2PA.v
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Set Apply With Renaming.

Require Import Ensembles.
Require Import Coq.Lists.List.
Expand Down
2 changes: 0 additions & 2 deletions theories/ordinals/Ackermann/NNtheory.v
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
Set Apply With Renaming.

Require Import Arith.

Require Import folLogic3.
Expand Down
2 changes: 0 additions & 2 deletions theories/ordinals/Ackermann/PA.v
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
Set Apply With Renaming.

Require Import Arith.
Require Import Ensembles.

Expand Down
2 changes: 0 additions & 2 deletions theories/ordinals/Ackermann/PAconsistent.v
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
Set Apply With Renaming.

Require Import Arith.
Require Import folProof.
Require Import folProp.
Expand Down
2 changes: 0 additions & 2 deletions theories/ordinals/Ackermann/PAtheory.v
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
Set Apply With Renaming.

Require Import Ensembles.
Require Import Coq.Lists.List.
Require Import Arith.
Expand Down
2 changes: 0 additions & 2 deletions theories/ordinals/Ackermann/cPair.v
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
Set Apply With Renaming.

Require Import Arith.
Require Import Coq.Lists.List.
Require Import extEqualNat.
Expand Down
2 changes: 0 additions & 2 deletions theories/ordinals/Ackermann/checkPrf.v
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
Set Apply With Renaming.

Require Import primRec.
Require Import codeFreeVar.
Require Import codeSubFormula.
Expand Down
2 changes: 0 additions & 2 deletions theories/ordinals/Ackermann/code.v
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
Set Apply With Renaming.

Require Import Arith.
Require Import fol.
Require Import folProof.
Expand Down
2 changes: 0 additions & 2 deletions theories/ordinals/Ackermann/codeFreeVar.v
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
Set Apply With Renaming.

Require Import primRec.
Require Import cPair.
Require Import Coq.Lists.List.
Expand Down
2 changes: 0 additions & 2 deletions theories/ordinals/Ackermann/codeList.v
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
Set Apply With Renaming.

Require Import primRec.
Require Import cPair.
Require Export Coq.Lists.List.
Expand Down
2 changes: 0 additions & 2 deletions theories/ordinals/Ackermann/codeNatToTerm.v
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
Set Apply With Renaming.

Require Import primRec.
Require Import cPair.
Require Import Arith.
Expand Down
2 changes: 0 additions & 2 deletions theories/ordinals/Ackermann/codePA.v
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
Set Apply With Renaming.

Require Import Ensembles.
Require Import Coq.Lists.List.
Require Import primRec.
Expand Down
2 changes: 0 additions & 2 deletions theories/ordinals/Ackermann/codeSubFormula.v
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
Set Apply With Renaming.

Require Import primRec.
Require Import cPair.
Require Import Arith.
Expand Down
2 changes: 0 additions & 2 deletions theories/ordinals/Ackermann/codeSubTerm.v
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
Set Apply With Renaming.

Require Import primRec.
Require Import cPair.
Require Import Arith.
Expand Down
2 changes: 0 additions & 2 deletions theories/ordinals/Ackermann/expressible.v
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
Set Apply With Renaming.

Require Import Arith.
Require Import Coq.Lists.List.
Require Import ListExt.
Expand Down
2 changes: 0 additions & 2 deletions theories/ordinals/Ackermann/extEqualNat.v
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
Set Apply With Renaming.

Require Import Arith.

(* begin snippet naryFunc *)
Expand Down
20 changes: 17 additions & 3 deletions theories/ordinals/Ackermann/fol.v
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
(* Author: Russell O'Connor *)
(* This file is Public Domain *)

Set Apply With Renaming.

Require Import Coq.Lists.List.
Require Import Ensembles.
Require Import Peano_dec.
Expand Down Expand Up @@ -34,7 +32,8 @@ Scheme Term_Terms_rec := Minimality for Term Sort Set

Scheme Term_Terms_rec_full := Induction for Term
Sort Set
with Terms_Term_rec_full := Induction for Terms Sort Set.
with Terms_Term_rec_full := Induction for Terms Sort Set.


Inductive Formula : Set :=
| equal : Term -> Term -> Formula
Expand Down Expand Up @@ -133,6 +132,8 @@ simpl in H0.
apply (H0 (refl_equal (S n))).
Qed.

Arguments Term_Terms_rec_full P P0: rename.

Lemma term_dec : forall x y : Term, {x = y} + {x <> y}.
Proof.
induction language_dec.
Expand Down Expand Up @@ -791,3 +792,16 @@ Qed.
End Formula_Depth_Induction.

End First_Order_Logic.


Arguments Term_Terms_ind L P P0 : rename.
Arguments Terms_Term_ind L P P0 : rename.

Arguments Term_Terms_rec L P P0 : rename.
Arguments Terms_Term_rec L P P0 : rename.

Arguments Term_Terms_rec_full L P P0 : rename.
Arguments Terms_Term_rec_full L P P0 : rename.



2 changes: 0 additions & 2 deletions theories/ordinals/Ackermann/folLogic.v
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
Set Apply With Renaming.

Require Import Ensembles.
Require Import Coq.Lists.List.

Expand Down
2 changes: 0 additions & 2 deletions theories/ordinals/Ackermann/folLogic2.v
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
Set Apply With Renaming.

Require Import Ensembles.
Require Import Coq.Lists.List.
Require Import ListExt.
Expand Down
2 changes: 0 additions & 2 deletions theories/ordinals/Ackermann/folLogic3.v
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
Set Apply With Renaming.

Require Import Ensembles.
Require Import Coq.Lists.List.
Require Import ListExt.
Expand Down
2 changes: 0 additions & 2 deletions theories/ordinals/Ackermann/folProof.v
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
Set Apply With Renaming.

Require Import Ensembles.
Require Import Coq.Lists.List.
Require Import Arith.
Expand Down
2 changes: 0 additions & 2 deletions theories/ordinals/Ackermann/folProp.v
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
Set Apply With Renaming.

Require Import Wf_nat.
Require Import Max.
Require Import Arith.
Expand Down
2 changes: 0 additions & 2 deletions theories/ordinals/Ackermann/folReplace.v
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
Set Apply With Renaming.

Require Import Ensembles.
Require Import Coq.Lists.List.
Require Import Peano_dec.
Expand Down
2 changes: 0 additions & 2 deletions theories/ordinals/Ackermann/misc.v
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
Set Apply With Renaming.

Require Import Eqdep_dec.

Global Set Asymmetric Patterns.
Expand Down
3 changes: 0 additions & 3 deletions theories/ordinals/Ackermann/model.v
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
Set Apply With Renaming.


Require Import Ensembles.
Require Import Coq.Lists.List.
Require Import ListExt.
Expand Down
2 changes: 0 additions & 2 deletions theories/ordinals/Ackermann/prLogic.v
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
Set Apply With Renaming.

Require Import primRec.
Require Import code.
Require Import Arith.
Expand Down
9 changes: 7 additions & 2 deletions theories/ordinals/Ackermann/primRec.v
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
(** Primitive Recursive functions *)
(** Russel O'Connor *)
Set Apply With Renaming.

Require Import Arith.
Require Import Peano_dec.
Expand Down Expand Up @@ -44,10 +43,16 @@ with PrimRecs : nat -> nat -> Set :=
Scheme PrimRec_PrimRecs_rec := Induction for PrimRec Sort Set
with PrimRecs_PrimRec_rec := Induction for PrimRecs Sort Set.

Arguments PrimRec_PrimRecs_rec P P0 : rename.
Arguments PrimRecs_PrimRec_rec P P0 : rename.

(* begin snippet SchemePrimRecInd *)

Scheme PrimRec_PrimRecs_ind := Induction for PrimRec Sort Prop
with PrimRecs_PrimRec_ind := Induction for PrimRecs Sort Prop.
with PrimRecs_PrimRec_ind := Induction for PrimRecs Sort Prop.

Arguments PrimRec_PrimRecs_ind P P0 : rename.
Arguments PrimRecs_PrimRec_ind P P0 : rename.
(* end snippet SchemePrimRecInd *)

(* begin snippet SchemePrimRecInda *)
Expand Down
1 change: 0 additions & 1 deletion theories/ordinals/Ackermann/subAll.v
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Set Apply With Renaming.

Require Import Ensembles.
Require Import Coq.Lists.List.
Expand Down
2 changes: 0 additions & 2 deletions theories/ordinals/Ackermann/subProp.v
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
Set Apply With Renaming.

Require Import Ensembles.
Require Import Coq.Lists.List.
Require Import Peano_dec.
Expand Down
2 changes: 0 additions & 2 deletions theories/ordinals/Ackermann/wConsistent.v
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
Set Apply With Renaming.

Require Import folProof.
Require Import Arith.
Require Import folProp.
Expand Down
1 change: 0 additions & 1 deletion theories/ordinals/Ackermann/wellFormed.v
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Set Apply With Renaming.

Require Import primRec.
Require Import cPair.
Expand Down
4 changes: 4 additions & 0 deletions theories/ordinals/Hydra/Hydra_Definitions.v
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ Scheme Hydra_rect2 := Induction for Hydra Sort Type
with Hydrae_rect2 := Induction for Hydrae Sort Type.
(* end snippet HydraRect2 *)

Arguments Hydra_rect2 P P0 : rename.
Arguments Hydrae_rect2 P P0 : rename.


(* begin snippet hForall *)
(** All elements of s satisfy P *)
Fixpoint h_forall (P: Hydra -> Prop) (s: Hydrae) :=
Expand Down
2 changes: 2 additions & 0 deletions theories/ordinals/Hydra/Hydra_Lemmas.v
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,8 @@ Qed.
Scheme R2_ind2 := Induction for R2 Sort Prop
with
S2_ind2 := Induction for S2 Sort Prop.
Arguments R2_ind2 n P P0 : rename.
Arguments S2_ind2 n P P0 : rename.

Lemma S2_app : forall n s1 s2 ,
S2 n s1 s2 ->
Expand Down