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

[TC] fix compilation of instances in the ctx #640

Merged
merged 2 commits into from
Jun 20, 2024
Merged

[TC] fix compilation of instances in the ctx #640

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
19af480
[TC] fix: stop compiling ctx instance twice on solve calls
FissoreD Jun 19, 2024
8baa4dd
[TC] : mode-check before ctx compilation
FissoreD Jun 19, 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
5 changes: 1 addition & 4 deletions apps/tc/elpi/ho_compile.elpi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,10 +280,7 @@ namespace tc {
pred context i:goal-ctx, o:list prop.
:name "tc-compile-context"
context Ctx Clauses :-
section-var->decl SectionVarsR, % To be reversed in order to keep right priority
std.rev SectionVarsR SectionVars, !,
std.append Ctx SectionVars CtxAndSection,
std.assert! (instance.context CtxAndSection Clauses) "[TC] cannot compile context".
std.assert! (instance.context Ctx Clauses) "[TC] cannot compile context".

pred instance i:term, i:term, o:prop.
instance Ty ProofHd Clause :-
Expand Down
26 changes: 13 additions & 13 deletions apps/tc/elpi/solver.elpi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,16 @@ refine-proof Proof G GL :-

if-true print-solution (coq.say "[TC] The proof typechecks").

pred solve-w-modes i:term, o:term.
solve-w-modes Ty Proof :-
time-it oTC-time-mode-check (modes-check Ty) "mode check", !,
time-it oTC-time-compile-goal (build-query-from-goal Ty Proof Q PostProcess) "build query",
if-true print-compiled-goal (coq.say "[TC] the compiled goal is" Q),
pred solve-under-context i:term, o:term.
solve-under-context Ty Proof :-
time-it oTC-time-compile-goal (build-query-from-goal Ty Proof Q PostProcess) "build query", !,
if-true print-compiled-goal (coq.say "[TC] the compiled goal is" Q), !,
time-it oTC-time-instance-search (
do PostProcess, Q,
tc.link.solve-eta, % Trigger eta links
tc.link.solve-llam % Trigger llam links
) "instance search".

solve-w-modes _ tc.mode_fail.

pred solve-aux i:goal, o:list sealed-goal.
solve-aux (goal Ctx _ Ty P_ Ag_ as G) GL :-
time-it _ (solve-aux1 Ctx Ty Proof) "full instance search",
Expand All @@ -45,18 +42,21 @@ solve-aux (goal Ctx _ Ty P_ Ag_ as G) GL :-
pred solve-aux1 i:goal-ctx, i:term, o:term.
:name "solve-aux-intros"
solve-aux1 Ctx (prod N X T) Proof :- !,
@pi-decl N X x\
@pi-decl _ X x\
solve-aux1 [decl x N X | Ctx] (T x) (Proof' x),
Proof = fun N X Proof'.
if (Proof' x = tc.mode_fail)
(Proof = tc.mode_fail)
(Proof = fun N X Proof').

:name "solve-aux-conclusion"
solve-aux1 Ctx TyRaw Proof :-
time-it _ (tc.compile.context Ctx CtxClause) "compile context",
time-it _ (do-once (normalize-ty TyRaw Ty)) "normalize ty",
time-it _ (normalize-ty TyRaw Ty) "normalize ty",
if-true print-goal (coq.say "The goal is <<<" Ty ">>>"),
if-true print-goal-pp (coq.say "The goal is <<<" {coq.term->string Ty} ">>>"),
CtxClause => solve-w-modes Ty Proof.

time-it oTC-time-mode-check (modes-check Ty) "mode check", !,
time-it _ (tc.compile.context Ctx CtxClause) "compile context", !,
CtxClause => solve-under-context Ty Proof.
solve-aux1 _ _ tc.mode_fail :- if-true (print-solution; print-solution-pp) (coq.say "Invalid mode call").

pred print-solution. % Print the solution in HOAS
pred print-solution-pp. % Print the solution in coq pp
Expand Down
Loading