aniva/Pantograph
aniva
/
Pantograph
1
1
Fork 0
Code Issues 10 Pull Requests 1 Packages Projects Releases 1 Wiki Activity

fix: Coupling from unrelated goals

This commit is contained in:
Leni Aniva 2024-04-09 09:11:15 -07:00
parent f02f9592d7
commit 30c1fd894f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Pantograph/Goal.lean
View File

@ -32,7 +32,7 @@ structure GoalState where
parentMVar: Option MVarId parentMVar: Option MVarId
-- Existence of this field shows that we are currently in `conv` mode. -- Existence of this field shows that we are currently in `conv` mode.
convMVar: Option (MVarId × MVarId × List MVarId) := .none convMVar: Option (MVarId × MVarId) := .none
protected def GoalState.create (expr: Expr): Elab.TermElabM GoalState := do protected def GoalState.create (expr: Expr): Elab.TermElabM GoalState := do
-- May be necessary to immediately synthesise all metavariables if we need to leave the elaboration context. -- May be necessary to immediately synthesise all metavariables if we need to leave the elaboration context.
@ -278,7 +278,7 @@ protected def GoalState.conv (state: GoalState) (goalId: Nat):
savedState := nextSavedState savedState := nextSavedState
newMVars := newMVarSet prevMCtx nextMCtx, newMVars := newMVarSet prevMCtx nextMCtx,
parentMVar := .some goal, parentMVar := .some goal,
convMVar := .some (convRhs, goal, state.goals), convMVar := .some (convRhs, goal),
} }
catch exception => catch exception =>
return .failure #[← exception.toMessageData.toString] return .failure #[← exception.toMessageData.toString]
@ -286,7 +286,7 @@ protected def GoalState.conv (state: GoalState) (goalId: Nat):
/-- Exit from `conv` mode. Resumes all goals before the mode starts and applys the conv -/ /-- Exit from `conv` mode. Resumes all goals before the mode starts and applys the conv -/
protected def GoalState.convExit (state: GoalState): protected def GoalState.convExit (state: GoalState):
Elab.TermElabM TacticResult := do Elab.TermElabM TacticResult := do
let (convRhs, convGoal, savedGoals) ← match state.convMVar with let (convRhs, convGoal) ← match state.convMVar with
| .some mvar => pure mvar | .some mvar => pure mvar
| .none => return .invalidAction "Not in conv state" | .none => return .invalidAction "Not in conv state"
let tacticM : Elab.Tactic.TacticM Elab.Tactic.SavedState:= do let tacticM : Elab.Tactic.TacticM Elab.Tactic.SavedState:= do
@ -303,7 +303,7 @@ protected def GoalState.convExit (state: GoalState):
throwError "convert tactic failed, there are unsolved goals\n{Elab.goalsToMessageData (← Elab.Tactic.getGoals)}" throwError "convert tactic failed, there are unsolved goals\n{Elab.goalsToMessageData (← Elab.Tactic.getGoals)}"
IO.println "Caching" IO.println "Caching"
Elab.Tactic.setGoals savedGoals Elab.Tactic.setGoals [convGoal]
let targetNew ← instantiateMVars (.mvar convRhs) let targetNew ← instantiateMVars (.mvar convRhs)
let proof ← instantiateMVars (.mvar convGoal) let proof ← instantiateMVars (.mvar convGoal)