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

refactor: Unify call convention 

Induction like tactics should return `Array InductionSubgoal`. Branching
tactics should return their branch first.
This commit is contained in:
Leni Aniva 2024-08-17 16:47:21 -07:00
parent 5d43068ec3
commit 3733c10a4e
Signed by: aniva
GPG Key ID: 4D9B1C8D10EA4C50
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Pantograph/Tactic/MotivatedApply.lean
View File

@ -62,7 +62,7 @@ def collectMotiveArguments (forallBody: Expr): SSet Nat :=
| _ => SSet.empty | _ => SSet.empty
/-- Applies a symbol of the type `∀ (motive: α → Sort u) (a: α)..., (motive α)` -/ /-- Applies a symbol of the type `∀ (motive: α → Sort u) (a: α)..., (motive α)` -/
def motivatedApply (mvarId: MVarId) (recursor: Expr) : MetaM (List Meta.InductionSubgoal) := mvarId.withContext do def motivatedApply (mvarId: MVarId) (recursor: Expr) : MetaM (Array Meta.InductionSubgoal) := mvarId.withContext do
mvarId.checkNotAssigned `Pantograph.Tactic.motivatedApply mvarId.checkNotAssigned `Pantograph.Tactic.motivatedApply
let recursorType ← Meta.inferType recursor let recursorType ← Meta.inferType recursor
let resultant ← mvarId.getType let resultant ← mvarId.getType
@ -95,11 +95,11 @@ def motivatedApply (mvarId: MVarId) (recursor: Expr) : MetaM (List Meta.Inductio
mvarId.assign $ ← Meta.mkEqMP goalConduit (mkAppN recursor newMVars) mvarId.assign $ ← Meta.mkEqMP goalConduit (mkAppN recursor newMVars)
newMVars := newMVars ++ [goalConduit] newMVars := newMVars ++ [goalConduit]
return newMVars.toList.map (λ mvar => { mvarId := mvar.mvarId!}) return newMVars.map (λ mvar => { mvarId := mvar.mvarId!})
def evalMotivatedApply : Elab.Tactic.Tactic := fun stx => Elab.Tactic.withMainContext do def evalMotivatedApply : Elab.Tactic.Tactic := fun stx => Elab.Tactic.withMainContext do
let recursor ← Elab.Term.elabTerm (stx := stx) .none let recursor ← Elab.Term.elabTerm (stx := stx) .none
let nextGoals ← motivatedApply (← Elab.Tactic.getMainGoal) recursor let nextGoals ← motivatedApply (← Elab.Tactic.getMainGoal) recursor
Elab.Tactic.setGoals $ nextGoals.map (·.mvarId) Elab.Tactic.setGoals $ nextGoals.toList.map (·.mvarId)
end Pantograph.Tactic end Pantograph.Tactic

6
Pantograph/Tactic/Prograde.lean
View File

@ -24,8 +24,8 @@ def evalDefine (binderName: Name) (expr: Syntax): Elab.Tactic.TacticM Unit := do
structure BranchResult where structure BranchResult where
fvarId?: Option FVarId := .none fvarId?: Option FVarId := .none
main: MVarId
branch: MVarId branch: MVarId
main: MVarId
def «have» (mvarId: MVarId) (binderName: Name) (type: Expr): MetaM BranchResult := mvarId.withContext do def «have» (mvarId: MVarId) (binderName: Name) (type: Expr): MetaM BranchResult := mvarId.withContext do
mvarId.checkNotAssigned `Pantograph.Tactic.have mvarId.checkNotAssigned `Pantograph.Tactic.have
@ -47,8 +47,8 @@ def «have» (mvarId: MVarId) (binderName: Name) (type: Expr): MetaM BranchResul
return { return {
fvarId? := .some fvarId, fvarId? := .some fvarId,
main := mvarUpstream.mvarId!,
branch := mvarBranch.mvarId!, branch := mvarBranch.mvarId!,
main := mvarUpstream.mvarId!,
} }
def evalHave (binderName: Name) (type: Syntax): Elab.Tactic.TacticM Unit := do def evalHave (binderName: Name) (type: Syntax): Elab.Tactic.TacticM Unit := do
@ -74,8 +74,8 @@ def «let» (mvarId: MVarId) (binderName: Name) (type: Expr): MetaM BranchResult
pure mvarUpstream pure mvarUpstream
return { return {
main := mvarUpstream.mvarId!,
branch := mvarBranch.mvarId!, branch := mvarBranch.mvarId!,
main := mvarUpstream.mvarId!,
} }
def evalLet (binderName: Name) (type: Syntax): Elab.Tactic.TacticM Unit := do def evalLet (binderName: Name) (type: Syntax): Elab.Tactic.TacticM Unit := do