Skip to content

Commit cb4600c

Browse files
committed
fix the make autosubst target
1 parent 0ab22b1 commit cb4600c

File tree

3 files changed

+24
-12
lines changed

3 files changed

+24
-12
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
all: partial-fun logrel
44

55
autosubst:
6-
autosubst -f -s ucoq -v ge813 -p ./theories/AutoSubst/Ast_preamble -no-static -o ./theories/AutoSubst/Ast.v ./theories/AutoSubst/Ast.sig
6+
autosubst -f -s urocq -v ge813 -p ./theories/AutoSubst/Ast_preamble -no-static -o ./theories/AutoSubst/Ast.v ./theories/AutoSubst/Ast.sig
77
partial-fun:
88
@+$(MAKE) -C coq-partialfun all
99

theories/AutoSubst/Ast.v

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,8 @@ Lemma congr_tId {s0 : term} {s1 : term} {s2 : term} {t0 : term} {t1 : term}
131131
Proof.
132132
exact (eq_trans
133133
(eq_trans (eq_trans eq_refl (ap (fun x => tId x s1 s2) H0))
134-
(ap (fun x => tId t0 x s2) H1)) (ap (fun x => tId t0 t1 x) H2)).
134+
(ap (fun x => tId t0 x s2) H1))
135+
(ap (fun x => tId t0 t1 x) H2)).
135136
Qed.
136137

137138
Lemma congr_tRefl {s0 : term} {s1 : term} {t0 : term} {t1 : term}
@@ -588,15 +589,17 @@ subst_term tau_term (ren_term xi_term s) = subst_term theta_term s :=
588589
congr_tNatElim
589590
(compRenSubst_term (upRen_term_term xi_term) (up_term_term tau_term)
590591
(up_term_term theta_term) (up_ren_subst_term_term _ _ _ Eq_term)
591-
s0) (compRenSubst_term xi_term tau_term theta_term Eq_term s1)
592+
s0)
593+
(compRenSubst_term xi_term tau_term theta_term Eq_term s1)
592594
(compRenSubst_term xi_term tau_term theta_term Eq_term s2)
593595
(compRenSubst_term xi_term tau_term theta_term Eq_term s3)
594596
| tEmpty => congr_tEmpty
595597
| tEmptyElim s0 s1 =>
596598
congr_tEmptyElim
597599
(compRenSubst_term (upRen_term_term xi_term) (up_term_term tau_term)
598600
(up_term_term theta_term) (up_ren_subst_term_term _ _ _ Eq_term)
599-
s0) (compRenSubst_term xi_term tau_term theta_term Eq_term s1)
601+
s0)
602+
(compRenSubst_term xi_term tau_term theta_term Eq_term s1)
600603
| tSig s0 s1 =>
601604
congr_tSig (compRenSubst_term xi_term tau_term theta_term Eq_term s0)
602605
(compRenSubst_term (upRen_term_term xi_term) (up_term_term tau_term)
@@ -606,7 +609,8 @@ subst_term tau_term (ren_term xi_term s) = subst_term theta_term s :=
606609
congr_tPair (compRenSubst_term xi_term tau_term theta_term Eq_term s0)
607610
(compRenSubst_term (upRen_term_term xi_term) (up_term_term tau_term)
608611
(up_term_term theta_term) (up_ren_subst_term_term _ _ _ Eq_term)
609-
s1) (compRenSubst_term xi_term tau_term theta_term Eq_term s2)
612+
s1)
613+
(compRenSubst_term xi_term tau_term theta_term Eq_term s2)
610614
(compRenSubst_term xi_term tau_term theta_term Eq_term s3)
611615
| tFst s0 =>
612616
congr_tFst (compRenSubst_term xi_term tau_term theta_term Eq_term s0)
@@ -627,7 +631,8 @@ subst_term tau_term (ren_term xi_term s) = subst_term theta_term s :=
627631
(up_term_term (up_term_term tau_term))
628632
(up_term_term (up_term_term theta_term))
629633
(up_ren_subst_term_term _ _ _
630-
(up_ren_subst_term_term _ _ _ Eq_term)) s2)
634+
(up_ren_subst_term_term _ _ _ Eq_term))
635+
s2)
631636
(compRenSubst_term xi_term tau_term theta_term Eq_term s3)
632637
(compRenSubst_term xi_term tau_term theta_term Eq_term s4)
633638
(compRenSubst_term xi_term tau_term theta_term Eq_term s5)
@@ -736,7 +741,8 @@ ren_term zeta_term (subst_term sigma_term s) = subst_term theta_term s :=
736741
(upRen_term_term (upRen_term_term zeta_term))
737742
(up_term_term (up_term_term theta_term))
738743
(up_subst_ren_term_term _ _ _
739-
(up_subst_ren_term_term _ _ _ Eq_term)) s2)
744+
(up_subst_ren_term_term _ _ _ Eq_term))
745+
s2)
740746
(compSubstRen_term sigma_term zeta_term theta_term Eq_term s3)
741747
(compSubstRen_term sigma_term zeta_term theta_term Eq_term s4)
742748
(compSubstRen_term sigma_term zeta_term theta_term Eq_term s5)
@@ -760,7 +766,8 @@ exact (fun n =>
760766
(eq_sym
761767
(compSubstRen_term tau_term shift
762768
(funcomp (ren_term shift) tau_term) (fun x => eq_refl)
763-
(sigma n'))) (ap (ren_term shift) (Eq n')))
769+
(sigma n')))
770+
(ap (ren_term shift) (Eq n')))
764771
| O => eq_refl
765772
end).
766773
Qed.
@@ -847,7 +854,8 @@ subst_term tau_term (subst_term sigma_term s) = subst_term theta_term s :=
847854
(up_term_term (up_term_term tau_term))
848855
(up_term_term (up_term_term theta_term))
849856
(up_subst_subst_term_term _ _ _
850-
(up_subst_subst_term_term _ _ _ Eq_term)) s2)
857+
(up_subst_subst_term_term _ _ _ Eq_term))
858+
s2)
851859
(compSubstSubst_term sigma_term tau_term theta_term Eq_term s3)
852860
(compSubstSubst_term sigma_term tau_term theta_term Eq_term s4)
853861
(compSubstSubst_term sigma_term tau_term theta_term Eq_term s5)
@@ -989,7 +997,8 @@ Fixpoint rinst_inst_term (xi_term : nat -> nat) (sigma_term : nat -> term)
989997
(rinst_inst_term (upRen_term_term (upRen_term_term xi_term))
990998
(up_term_term (up_term_term sigma_term))
991999
(rinstInst_up_term_term _ _ (rinstInst_up_term_term _ _ Eq_term))
992-
s2) (rinst_inst_term xi_term sigma_term Eq_term s3)
1000+
s2)
1001+
(rinst_inst_term xi_term sigma_term Eq_term s3)
9931002
(rinst_inst_term xi_term sigma_term Eq_term s4)
9941003
(rinst_inst_term xi_term sigma_term Eq_term s5)
9951004
end.
@@ -1156,7 +1165,8 @@ Ltac asimpl := check_no_evars;
11561165
repeat
11571166
unfold VarInstance_term, Var, ids, Ren_term, Ren1, ren1,
11581167
Up_term_term, Up_term, up_term, Subst_term, Subst1, subst1
1159-
in *; asimpl'; minimize.
1168+
in *;
1169+
asimpl'; minimize.
11601170

11611171
Tactic Notation "asimpl" "in" hyp(J) := revert J; asimpl; intros J.
11621172

theories/AutoSubst/Ast_preamble

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
(** * LogRel.AutoSubst.Ast: abstract syntax tree, definitions of renamings, substitutions and many lemmas, generated using AutoSubst. *)
2+
13
From LogRel.AutoSubst Require Import core unscoped.
24
From LogRel.Syntax Require Import BasicAst.
3-
From Coq Require Import Setoid Morphisms Relation_Definitions.
5+
From Stdlib Require Import Setoid Morphisms Relation_Definitions.
46

57

0 commit comments

Comments
 (0)