From 53bad1c4c995ee44f145439add930177ac49f16f Mon Sep 17 00:00:00 2001 From: Leni Aniva Date: Sun, 15 Dec 2024 12:52:08 -0800 Subject: [PATCH] refactor: Remove obsolete sanitize option --- Pantograph/Delate.lean | 20 ++++++++++---------- Test/Proofs.lean | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Pantograph/Delate.lean b/Pantograph/Delate.lean index c68d7cd..38d8bda 100644 --- a/Pantograph/Delate.lean +++ b/Pantograph/Delate.lean @@ -264,25 +264,24 @@ def serializeName (name: Name) (sanitize: Bool := true): String := if n.contains Lean.idBeginEscape then s!"{quote}{n}{quote}" else n /-- serialize a sort level. Expression is optimized to be compact e.g. `(+ u 2)` -/ -partial def serializeSortLevel (level: Level) (sanitize: Bool): String := +partial def serializeSortLevel (level: Level) : String := let k := level.getOffset let u := level.getLevelOffset let u_str := match u with | .zero => "0" | .succ _ => panic! "getLevelOffset should not return .succ" | .max v w => - let v := serializeSortLevel v sanitize - let w := serializeSortLevel w sanitize + let v := serializeSortLevel v + let w := serializeSortLevel w s!"(:max {v} {w})" | .imax v w => - let v := serializeSortLevel v sanitize - let w := serializeSortLevel w sanitize + let v := serializeSortLevel v + let w := serializeSortLevel w s!"(:imax {v} {w})" | .param name => - let name := serializeName name sanitize s!"{name}" | .mvar id => - let name := serializeName id.name sanitize + let name := id.name s!"(:mv {name})" match k, u with | 0, _ => u_str @@ -295,7 +294,7 @@ partial def serializeSortLevel (level: Level) (sanitize: Bool): String := A `_` symbol in the AST indicates automatic deductions not present in the original expression. -/ -partial def serializeExpressionSexp (expr: Expr) (sanitize: Bool := true): MetaM String := do +partial def serializeExpressionSexp (expr: Expr) : MetaM String := do self expr where delayedMVarToSexp (e: Expr): MetaM (Option String) := do @@ -334,9 +333,10 @@ partial def serializeExpressionSexp (expr: Expr) (sanitize: Bool := true): MetaM let name := mvarId.name pure s!"(:{pref} {name})" | .sort level => - let level := serializeSortLevel level sanitize + let level := serializeSortLevel level pure s!"(:sort {level})" | .const declName _ => + let declName := serializeName declName (sanitize := false) -- The universe level of the const expression is elided since it should be -- inferrable from surrounding expression pure s!"(:c {declName})" @@ -532,7 +532,7 @@ protected def GoalState.diag (goalState: GoalState) (parent?: Option GoalState : then instantiateAll decl.type else pure $ decl.type let type_sexp ← if options.printSexp then - let sexp ← serializeExpressionSexp type (sanitize := false) + let sexp ← serializeExpressionSexp type pure <| " " ++ sexp else pure "" diff --git a/Test/Proofs.lean b/Test/Proofs.lean index a6b5487..104a849 100644 --- a/Test/Proofs.lean +++ b/Test/Proofs.lean @@ -97,7 +97,7 @@ def test_identity: TestM Unit := do addTest $ LSpec.check tactic ((← state1.serializeGoals (options := ← read)).map (·.name) = #[inner]) let state1parent ← state1.withParentContext do - serializeExpressionSexp (← instantiateAll state1.parentExpr?.get!) (sanitize := false) + serializeExpressionSexp (← instantiateAll state1.parentExpr?.get!) addTest $ LSpec.test "(1 parent)" (state1parent == s!"(:lambda p (:sort 0) (:lambda h 0 (:subst (:mv {inner}) 1 0)))") -- Individual test cases @@ -259,7 +259,7 @@ def test_or_comm: TestM Unit := do addTest $ LSpec.check "(1 root)" state1.rootExpr?.isNone let state1parent ← state1.withParentContext do - serializeExpressionSexp (← instantiateAll state1.parentExpr?.get!) (sanitize := false) + serializeExpressionSexp (← instantiateAll state1.parentExpr?.get!) addTest $ LSpec.test "(1 parent)" (state1parent == s!"(:lambda p (:sort 0) (:lambda q (:sort 0) (:lambda h ((:c Or) 1 0) (:subst (:mv {state1g0}) 2 1 0))))") let tactic := "cases h" let state2 ← match ← state1.tacticOn (goalId := 0) (tactic := tactic) with @@ -276,7 +276,7 @@ def test_or_comm: TestM Unit := do addTest $ LSpec.check "(2 root)" state2.rootExpr?.isNone let state2parent ← state2.withParentContext do - serializeExpressionSexp (← instantiateAll state2.parentExpr?.get!) (sanitize := false) + serializeExpressionSexp (← instantiateAll state2.parentExpr?.get!) let orPQ := s!"((:c Or) (:fv {fvP}) (:fv {fvQ}))" let orQP := s!"((:c Or) (:fv {fvQ}) (:fv {fvP}))" let motive := s!"(:lambda t {orPQ} (:forall h ((:c Eq) ((:c Or) (:fv {fvP}) (:fv {fvQ})) (:fv {fvH}) 0) {orQP}))" @@ -292,7 +292,7 @@ def test_or_comm: TestM Unit := do addTest $ assertUnreachable $ other.toString return () let state3_1parent ← state3_1.withParentContext do - serializeExpressionSexp (← instantiateAll state3_1.parentExpr?.get!) (sanitize := false) + serializeExpressionSexp (← instantiateAll state3_1.parentExpr?.get!) addTest $ LSpec.test "(3_1 parent)" (state3_1parent == s!"((:c Or.inr) (:fv {fvQ}) (:fv {fvP}) (:mv _uniq.91))") addTest $ LSpec.check "· apply Or.inr" (state3_1.goals.length = 1) let state4_1 ← match ← state3_1.tacticOn (goalId := 0) (tactic := "assumption") with