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.

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

Jump to bottom

Weaker interface for neutral conversion #61

Merged
merged 2 commits into from
Jan 23, 2024
Merged

Weaker interface for neutral conversion #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bce8ab6
weaker interface for neutral
MevenBertrand Jan 23, 2024
27432e9
remove useless proof
MevenBertrand Jan 23, 2024
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
21 changes: 9 additions & 12 deletions theories/AlgorithmicConvProperties.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1147,18 +1147,15 @@ Qed.
* now etransitivity.
* now etransitivity.
* eassumption.
- intros Γ n n' A [? ? ? ? ? A' Hconvn HconvA].
assert [Γ |-[de] A] by boundary.
assert [Γ |-[de] n : A'] by
(eapply algo_conv_sound in Hconvn as [[]%boundary] ; tea ; now gen_typing).
assert [Γ |-[de] n' : A'] by
(eapply algo_conv_sound in Hconvn as [[]%boundary] ; tea ; now gen_typing).
split ; tea.
1-2: now gen_typing.
eapply algo_conv_conv ; tea.
2: now eapply ctx_refl.
apply ne_conv_conv; tea.
boundary.
- intros_bn.
+ boundary.
+ eapply algo_conv_sound in bun_conv_ne_conv as [[]%boundary] ; tea.
gen_typing.
+ eapply algo_conv_sound in bun_conv_ne_conv as [[]%boundary] ; tea.
gen_typing.
+ econstructor.
1-3: reflexivity.
now econstructor.
- intros_bn.
+ now constructor.
+ constructor ; tea.
Expand Down
2 changes: 1 addition & 1 deletion theories/DeclarativeInstance.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,7 @@ Module DeclarativeTypingProperties.
2: eassumption.
2: eapply TermSym.
all: now eapply RedConvTeC.
- intros ???? H; apply H.
- intros * ? H; apply H.
- intros.
now econstructor.
- intros.
Expand Down
5 changes: 3 additions & 2 deletions theories/GenericTyping.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,7 @@ Section GenericTyping.
[Γ |- A] -> [Γ |- t' : A] -> [Γ |- u' : A] ->
[Γ |- A ≅ A] -> [Γ |- t' ≅ u' : A] -> [Γ |- t ≅ u : A] ;
convtm_convneu {Γ n n' A} :
isPosType A ->
[Γ |- n ~ n' : A] -> [Γ |- n ≅ n' : A] ;
convtm_prod {Γ A A' B B'} :
[Γ |- A : U] ->
Expand Down Expand Up @@ -968,6 +969,7 @@ Section GenericConsequences.
[Γ |- A ≅ A'] ->
[Γ |- A ≅ B] ->
[Γ |- A ≅ C] ->
[Γ,, A |- tRel 0 ≅ tRel 0 : A⟨↑⟩] ->
[Γ |- idterm A ≅ idterm A' : arr B C].
Proof.
intros.
Expand Down Expand Up @@ -1001,8 +1003,7 @@ Section GenericConsequences.
- now eapply ty_var0.
- now eapply ty_var0.
- renToWk; tea; now eapply convty_wk.
- eapply convtm_convneu. eapply convneu_var.
now eapply ty_var0.
- eassumption.
Qed.

Lemma ty_comp {Γ A B C f g} :
Expand Down
5 changes: 5 additions & 0 deletions theories/LogicalRelation/Escape.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,11 @@ Section Escapes.
eapply convtm_exp ; tea.
all: gen_typing.
- intros ??? [ty] [] ; cbn in *.
assert (isPosType ty).
{
constructor.
now eapply convneu_whne.
}
eapply (convtm_conv (A := ty)).
eapply convtm_exp ; tea.
all: gen_typing.
Expand Down
Loading
Loading