Revert "chore: switch to directly invoking theory solver"

This reverts commit 537b08a.

Author: bollu

src/Lean/Elab/Tactic/BVDecide/Frontend/Normalize/AC.lean

@@ -232,12 +232,7 @@ def CoefficientsMap.toExpr (coeff : CoefficientsMap) (op : Op) : VarStateM (Opti
       | some acc => some <| mkApp2 op.toExpr acc expr
   return acc
 
-open VarStateM Lean.Meta Lean.Elab Term Grind
-
-#check Grind.Arith.CommRing.check
-#check Grind.solve
-#check Grind.main
-
+open VarStateM Lean.Meta Lean.Elab Term
 
 /--
 Given two expressions `x, y` which are equal up to associativity and commutativity,
@@ -249,23 +244,11 @@ def proveEqualityByGrindCommRing (x y : Expr) : MetaM Expr := do
   let expectedType ← mkEq x y
   let mvar ← mkFreshExprMVar expectedType
   let config := {}
-  let params ← Grind.mkParams config
-  let grindComputation : GrindM Unit := do
-    -- | TODO: get params from GrindM
-    let goal ← Grind.mkGoal mvar.mvarId! params
-    let success? ← Grind.Arith.CommRing.check.run goal
-    return ()
-  -- let go : Grind.GrindM Grind.Result := withReducible do
-  --   let goal       ← initCore mvarId params
-  --   let failure?   ← solve goal
-  --   let issues     := (← get).issues
-  -- let result ← Grind.main mvar.mvarId! (← Grind.mkParams config) (pure ())
-  let result ← grindComputation.run params (pure ())
-  -- if let .some g := result.failure? then
-  --   throwError "grind failed with leftover goal: {indentD (← g.ppState)}"
-  -- else
-  --   instantiateMVars mvar
-  instantiateMVars mvar
+  let result ← Grind.main mvar.mvarId! (← Grind.mkParams config) (pure ())
+  if let .some g := result.failure? then
+    throwError "grind failed with leftover goal: {indentD (← g.ppState)}"
+  else
+    instantiateMVars mvar
 
 
 /--

src/Lean/Meta/Tactic/Grind/Main.lean

@@ -99,7 +99,7 @@ private def mkCleanState (mvarId : MVarId) (params : Params) : MetaM Clean.State
     used := used.insert localDecl.userName
   return { used }
 
-protected def mkGoal (mvarId : MVarId) (params : Params) : GrindM Goal := do
+private def mkGoal (mvarId : MVarId) (params : Params) : GrindM Goal := do
   let mvarId ← if params.config.clean then mvarId.exposeNames else pure mvarId
   let trueExpr ← getTrueExpr
   let falseExpr ← getFalseExpr
@@ -201,7 +201,7 @@ private def initCore (mvarId : MVarId) (params : Params) : GrindM Goal := do
   let mvarId ← mvarId.unfoldReducible
   let mvarId ← mvarId.betaReduce
   appendTagSuffix mvarId `grind
-  Grind.mkGoal mvarId params
+  mkGoal mvarId params
 
 def main (mvarId : MVarId) (params : Params) (fallback : Fallback) : MetaM Result := do profileitM Exception "grind" (← getOptions) do
   if debug.terminalTacticsAsSorry.get (← getOptions) then