Skip to content

Commit 20a6b2f

Browse files
committed
Minor fixes.
1 parent 1f0b357 commit 20a6b2f

File tree

3 files changed

+16
-4
lines changed

3 files changed

+16
-4
lines changed

cvc5.lean

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1144,7 +1144,7 @@ namespace EnvT
11441144
/-- Runs `EnvT` code. -/
11451145
def run [Monad m] [MonadLiftT BaseIO m] (code : EnvT m α) : m (Except Error α) := code
11461146

1147-
example [Monad m] [MonadLiftT BaseIO m] : MonadLift Env (EnvT m) where
1147+
instance [Monad m] [MonadLiftT BaseIO m] : MonadLift Env (EnvT m) where
11481148
monadLift code := do
11491149
match ← liftM <| run code with
11501150
| .ok a => return a
@@ -1328,7 +1328,7 @@ extern_def proofToString : (solver : Solver) → Proof → Env String
13281328
Commands that produce a result such as `(check-sat)`, `(get-model)`, ... are executed but the
13291329
results are ignored.
13301330
-/
1331-
extern_def parseCommands : (solver : Solver) → (query : String) → Env String
1331+
extern_def parseCommands : (solver : Solver) → (query : String) → Env (Array cvc5.Sort × Array Term)
13321332

13331333
end Solver
13341334

ffi/ffi.cpp

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1746,7 +1746,19 @@ LEAN_EXPORT lean_obj_res solver_parseCommands(lean_obj_arg solver,
17461746
// to out
17471747
cmd.invoke(slv, sm, out);
17481748
}
1749-
return env_val(mk_unit_unit(), ioWorld);
1749+
std::vector<Sort> sortVars = sm->getDeclaredSorts();
1750+
lean_object* svs = lean_mk_empty_array();
1751+
for (const Sort& sortVar : sortVars)
1752+
{
1753+
svs = lean_array_push(svs, sort_box(new Sort(sortVar)));
1754+
}
1755+
std::vector<Term> termVars = sm->getDeclaredTerms();
1756+
lean_object* tvs = lean_mk_empty_array();
1757+
for (const Term& termVar : termVars)
1758+
{
1759+
tvs = lean_array_push(tvs, term_box(new Term(termVar)));
1760+
}
1761+
return env_val(prod_mk(lean_box(0), lean_box(0), svs, tvs), ioWorld);
17501762
CVC5_LEAN_API_TRY_CATCH_ENV_END(ioWorld);
17511763
}
17521764
}

lean-toolchain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
leanprover/lean4:4.24.0
1+
leanprover/lean4:v4.24.0

0 commit comments

Comments
 (0)