Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove vestiges of old ml api #7597

Merged
merged 1 commit into from
Mar 27, 2025
Merged

Remove vestiges of old ml api #7597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/c/test_capi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,7 +592,7 @@ void display_function_interpretations(Z3_context c, FILE * out, Z3_model m)
Z3_symbol name;
Z3_ast func_else;
unsigned num_entries = 0, j;
Z3_func_interp_opt finterp;
Z3_func_interp finterp;

fdecl = Z3_model_get_func_decl(c, m, i);
finterp = Z3_model_get_func_interp(c, m, fdecl);
Expand Down
2 changes: 1 addition & 1 deletion src/api/api_model.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ extern "C" {
Z3_CATCH;
}

Z3_ast_opt Z3_API Z3_model_get_const_interp(Z3_context c, Z3_model m, Z3_func_decl a) {
Z3_ast Z3_API Z3_model_get_const_interp(Z3_context c, Z3_model m, Z3_func_decl a) {
Z3_TRY;
LOG_Z3_model_get_const_interp(c, m, a);
RESET_ERROR_CODE();
Expand Down
11 changes: 3 additions & 8 deletions src/api/z3_api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,8 @@ DEFINE_TYPE(Z3_symbol);
DEFINE_TYPE(Z3_config);
DEFINE_TYPE(Z3_context);
DEFINE_TYPE(Z3_sort);
#define Z3_sort_opt Z3_sort
DEFINE_TYPE(Z3_func_decl);
DEFINE_TYPE(Z3_ast);
#define Z3_ast_opt Z3_ast
DEFINE_TYPE(Z3_app);
DEFINE_TYPE(Z3_pattern);
DEFINE_TYPE(Z3_model);
Expand All @@ -31,7 +29,6 @@ DEFINE_TYPE(Z3_ast_vector);
DEFINE_TYPE(Z3_ast_map);
DEFINE_TYPE(Z3_apply_result);
DEFINE_TYPE(Z3_func_interp);
#define Z3_func_interp_opt Z3_func_interp
DEFINE_TYPE(Z3_func_entry);
DEFINE_TYPE(Z3_fixedpoint);
DEFINE_TYPE(Z3_optimize);
Expand Down Expand Up @@ -2083,7 +2080,7 @@ extern "C" {
Z3_symbol recognizer,
unsigned num_fields,
Z3_symbol const field_names[],
Z3_sort_opt const sorts[],
Z3_sort const sorts[],
unsigned sort_refs[]
);

Expand Down Expand Up @@ -5511,7 +5508,7 @@ extern "C" {

def_API('Z3_model_get_const_interp', AST, (_in(CONTEXT), _in(MODEL), _in(FUNC_DECL)))
*/
Z3_ast_opt Z3_API Z3_model_get_const_interp(Z3_context c, Z3_model m, Z3_func_decl a);
Z3_ast Z3_API Z3_model_get_const_interp(Z3_context c, Z3_model m, Z3_func_decl a);

/**
\brief Test if there exists an interpretation (i.e., assignment) for \c a in the model \c m.
Expand All @@ -5532,7 +5529,7 @@ extern "C" {

def_API('Z3_model_get_func_interp', FUNC_INTERP, (_in(CONTEXT), _in(MODEL), _in(FUNC_DECL)))
*/
Z3_func_interp_opt Z3_API Z3_model_get_func_interp(Z3_context c, Z3_model m, Z3_func_decl f);
Z3_func_interp Z3_API Z3_model_get_func_interp(Z3_context c, Z3_model m, Z3_func_decl f);

/**
\brief Return the number of constants assigned by the given model.
Expand Down Expand Up @@ -6033,7 +6030,6 @@ extern "C" {

/** @name Error Handling */
/**@{*/
#ifndef SAFE_ERRORS
/**
\brief Return the error code for the last API call.

Expand All @@ -6059,7 +6055,6 @@ extern "C" {
\sa Z3_get_error_code
*/
void Z3_API Z3_set_error_handler(Z3_context c, Z3_error_handler h);
#endif

/**
\brief Set an error.
Expand Down
Loading