3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-23 17:15:31 +00:00

prepare symbols to be more abstract, update mbi, delay initialize some modules

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2020-01-10 12:02:08 -08:00
parent 74d3493d74
commit 78a1736bd2
25 changed files with 286 additions and 357 deletions

View file

@ -4,9 +4,10 @@ Copyright (c) 2015 Microsoft Corporation
--*/
#include "muz/fp/datalog_parser.h"
#include "ast/ast_pp.h"
#include "ast/arith_decl_plugin.h"
#include "ast/reg_decl_plugins.h"
#include "muz/fp/datalog_parser.h"
#include "muz/base/dl_context.h"
#include "smt/params/smt_params.h"
#include "muz/fp/dl_register_engine.h"
@ -62,6 +63,7 @@ static lbool dl_context_eval_unary_predicate(ast_manager & m, context & ctx, cha
static void dl_context_simple_query_test(params_ref & params) {
ast_manager m;
reg_decl_plugins(m);
dl_decl_util decl_util(m);
register_engine re;
smt_params fparams;

View file

@ -5,6 +5,7 @@ Copyright (c) 2015 Microsoft Corporation
--*/
#ifdef _WINDOWS
#include "ast/reg_decl_plugins.h"
#include "muz/base/dl_context.h"
#include "muz/fp/dl_register_engine.h"
#include "muz/rel/dl_finite_product_relation.h"
@ -29,6 +30,7 @@ namespace datalog {
void test_functional_columns(smt_params fparams, params_ref& params) {
ast_manager m;
reg_decl_plugins(m);
register_engine re;
context ctx(m, re, fparams);
rel_context_base& rctx = *ctx.get_rel_context();
@ -133,6 +135,7 @@ namespace datalog {
void test_finite_product_relation(smt_params fparams, params_ref& params) {
ast_manager m;
reg_decl_plugins(m);
register_engine re;
context ctx(m, re, fparams);
ctx.updt_params(params);

View file

@ -5,6 +5,8 @@ Copyright (c) 2015 Microsoft Corporation
--*/
#ifdef _WINDOWS
#include "ast/reg_decl_plugins.h"
#include "muz/base/dl_context.h"
#include "muz/fp/dl_register_engine.h"
#include "muz/rel/dl_relation_manager.h"
@ -18,6 +20,7 @@ namespace datalog {
static void test_interval_relation() {
smt_params params;
ast_manager ast_m;
reg_decl_plugins(ast_m);
register_engine re;
context ctx(ast_m, re, params);
arith_util autil(ast_m);
@ -122,6 +125,7 @@ namespace datalog {
smt_params params;
ast_manager ast_m;
reg_decl_plugins(ast_m);
register_engine re;
context ctx(ast_m, re, params);
arith_util autil(ast_m);

View file

@ -1,6 +1,7 @@
/*++
Copyright (c) 2015 Microsoft Corporation
--*/
#include "ast/reg_decl_plugins.h"
#include "muz/base/dl_context.h"
#include "muz/rel/dl_table.h"
#include "muz/fp/dl_register_engine.h"
@ -22,6 +23,7 @@ static void test_table(mk_table_fn mk_table) {
sig.push_back(4);
smt_params params;
ast_manager ast_m;
reg_decl_plugins(ast_m);
datalog::register_engine re;
datalog::context ctx(ast_m, re, params);
datalog::relation_manager & m = ctx.get_rel_context()->get_rmanager();

View file

@ -4,14 +4,16 @@ Copyright (c) 2015 Microsoft Corporation
--*/
#include "smt/smt_context.h"
#include "ast/dl_decl_plugin.h"
#include "ast/ast_pp.h"
#include "model/model_v2_pp.h"
#include "ast/reg_decl_plugins.h"
#include "ast/ast_pp.h"
#include "ast/reg_decl_plugins.h"
#include "smt/smt_context.h"
#include "model/model_v2_pp.h"
void tst_theory_dl() {
ast_manager m;
reg_decl_plugins(m);
smt_params params;
params.m_model = true;
datalog::dl_decl_util u(m);