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

Fix universe inconsistency issue in FoldCTree #28

Merged
merged 1 commit into from
Apr 19, 2023
Merged

Fix universe inconsistency issue in FoldCTree #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion theories/Eq/SSim.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1047,7 +1047,7 @@ Section Proof_Rules.
With invisible schedules, they are always equivalent: neither of them
produce any challenge for the other.
|*)
Lemma spinS_gen_nonempty : forall {Z Y D F} {L: rel (label E) (label F)} `{HasStuck': B0 -< D}
Lemma spinS_gen_nonempty : forall {Z X Y D F} {L: rel (label E) (label F)} `{HasStuck': B0 -< D}
(c: C X) (c': C Y) (x: X) (y: Y),
L tau tau ->
ssim L (@spinS_gen E C Z X c) (@spinS_gen F C Z Y c').
Expand Down
9 changes: 3 additions & 6 deletions theories/Interp/FoldCTree.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ Open Scope ctree_scope.
For now, we simply specialize results to specific [M]s.
*)

Unset Universe Checking.
Theorem ssim_interp_h {E F1 F2 C D1 D2 X Y}
`{HasB0 : B0 -< D1} `{HasB1 : B1 -< D1} `{HasB0' : B0 -< D2} `{HasB1' : B1 -< D2}
`{HC1 : C -< D1} `{HC2 : C -< D2}
Expand All @@ -47,9 +46,8 @@ Proof.
apply equ_vis_invT in H1 as ?. subst.
eapply ssim_clo_bind_gen with (R0 := eq).
+ red. reflexivity.
+ admit. (* FIXME universe inconsistency *)
(*eapply weq_ssim. apply update_val_rel_update_val_rel.
apply equ_vis_invE in H1 as [<- ?]. apply H0.*)
+ eapply weq_ssim. apply update_val_rel_update_val_rel.
apply equ_vis_invE in H1 as [<- ?]. apply H0.
+ intros. step. apply step_ss_ret. constructor.
apply equ_vis_invE in H1 as [<- ?]. subst. apply H1.
- unfold CTree.map. setoid_rewrite bind_branch.
Expand All @@ -58,8 +56,7 @@ Proof.
destruct vis.
+ step. apply step_ss_brS. intros. exists x0. step. apply step_ss_ret. constructor. apply H1. right; auto. 3: apply H. all: intros H2; inversion H2.
+ step. apply step_ss_brD. intros. exists x0. apply step_ss_ret. constructor. apply H1.
Admitted.
Set Universe Checking.
Qed.

Section FoldCTree.

Expand Down
2 changes: 1 addition & 1 deletion theories/Logic/ctl_yannick.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -732,7 +732,7 @@ Module Termination.
econstructor.
Qed.

End Termination
End Termination.


Module Scheduling.
Expand Down