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

fix: Print internal exceptions nicely

This commit is contained in:
Leni Aniva 2025-03-28 21:31:30 -07:00
parent 4610348fed
commit 0528a1592e
Signed by: aniva
GPG Key ID: 4D9B1C8D10EA4C50
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Repl.lean
View File

@ -18,8 +18,9 @@ structure State where
-- Parser state -- Parser state
scope : Elab.Command.Scope := { header := "" } scope : Elab.Command.Scope := { header := "" }
/-- Main state monad for executing commands -/ /-- Main monad for executing commands -/
abbrev MainM := ReaderT Context $ StateRefT State IO abbrev MainM := ReaderT Context $ StateRefT State IO
/-- Main with possible exception -/
abbrev EMainM := Protocol.FallibleT $ ReaderT Context $ StateRefT State IO abbrev EMainM := Protocol.FallibleT $ ReaderT Context $ StateRefT State IO
def getMainState : MainM State := get def getMainState : MainM State := get
@ -54,13 +55,17 @@ def runCoreM { α } (coreM : CoreM α) : EMainM α := do
} }
-- Remap the coreM to capture every exception -- Remap the coreM to capture every exception
let coreM' : CoreM _ := let coreM' : CoreM _ :=
Core.tryCatchRuntimeEx (Except.ok <$> coreM) λ ex => do try
Except.ok <$> coreM
catch ex =>
let desc ← ex.toMessageData.toString let desc ← ex.toMessageData.toString
return Except.error $ ({ error := "exception", desc } : Protocol.InteractionError) return Except.error $ ({ error := "exception", desc } : Protocol.InteractionError)
let io := coreM'.toIO coreCtx coreState
if let .some token := cancelTk? then if let .some token := cancelTk? then
runCancelTokenWithTimeout token (timeout := .mk options.timeout) runCancelTokenWithTimeout token (timeout := .mk options.timeout)
let (result, state') ← io let (result, state') ← match ← (coreM'.run coreCtx coreState).toIO' with
| Except.error (Exception.error _ msg) => Protocol.throw $ { error := "core", desc := ← msg.toString }
| Except.error (Exception.internal id _) => Protocol.throw $ { error := "internal", desc := (← id.getName).toString }
| Except.ok a => pure a
if result matches .ok _ then if result matches .ok _ then
modifyEnv λ _ => state'.env modifyEnv λ _ => state'.env
liftExcept result liftExcept result

2
Test/Integration.lean
View File

@ -101,7 +101,7 @@ def test_tactic_timeout : Test :=
step "options.set" ({ timeout? := .some 10 } : Protocol.OptionsSet) step "options.set" ({ timeout? := .some 10 } : Protocol.OptionsSet)
({ }: Protocol.OptionsSetResult), ({ }: Protocol.OptionsSetResult),
step "goal.tactic" ({ stateId := 0, expr? := .some "by\nsleep 1000; simp" }: Protocol.GoalTactic) step "goal.tactic" ({ stateId := 0, expr? := .some "by\nsleep 1000; simp" }: Protocol.GoalTactic)
({ error := "io", desc := "internal exception #6" }: Protocol.InteractionError), ({ error := "internal", desc := "interrupt" }: Protocol.InteractionError),
-- ensure graceful recovery -- ensure graceful recovery
step "options.set" ({ timeout? := .some 0 } : Protocol.OptionsSet) step "options.set" ({ timeout? := .some 0 } : Protocol.OptionsSet)
({ }: Protocol.OptionsSetResult), ({ }: Protocol.OptionsSetResult),