mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-24 01:25:31 +00:00
Code Activity

rewrite terminology for policheck

Browse source 
Signed-off-by: nikolajbjorner <nbjorner@microsoft.com>
This commit is contained in:
nikolajbjorner 2015-02-19 19:09:12 -08:00
parent 7735a40752
commit aa40316268
5 changed files with 21 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/api/api_interp.cpp
View file

@ -293,10 +293,10 @@ extern "C" {
else {
model_ref _m;
m_solver.get()->get_model(_m);
Z3_model_ref *crap = alloc(Z3_model_ref);
crap->m_model = _m.get();
mk_c(c)->save_object(crap);
*model = of_model(crap);
Z3_model_ref *tmp_val = alloc(Z3_model_ref);
tmp_val->m_model = _m.get();
mk_c(c)->save_object(tmp_val);
*model = of_model(tmp_val);
}
*out_interp = of_ast_vector(v);
@ -490,8 +490,8 @@ extern "C" {
try {
std::string foo(filename);
if (foo.size() >= 5 && foo.substr(foo.size() - 5) == ".smt2"){
Z3_ast ass = Z3_parse_smtlib2_file(ctx, filename, 0, 0, 0, 0, 0, 0);
Z3_app app = Z3_to_app(ctx, ass);
Z3_ast assrts = Z3_parse_smtlib2_file(ctx, filename, 0, 0, 0, 0, 0, 0);
Z3_app app = Z3_to_app(ctx, assrts);
int nconjs = Z3_get_app_num_args(ctx, app);
assertions.resize(nconjs);
for (int k = 0; k < nconjs; k++)

10
src/api/java/Solver.java
View file

@ -176,9 +176,9 @@ public class Solver extends Z3Object
**/
public int getNumAssertions() throws Z3Exception
{
ASTVector ass = new ASTVector(getContext(), Native.solverGetAssertions(
ASTVector assrts = new ASTVector(getContext(), Native.solverGetAssertions(
getContext().nCtx(), getNativeObject()));
return ass.size();
return assrts.size();
}
/**
@ -188,12 +188,12 @@ public class Solver extends Z3Object
**/
public BoolExpr[] getAssertions() throws Z3Exception
{
ASTVector ass = new ASTVector(getContext(), Native.solverGetAssertions(
ASTVector assrts = new ASTVector(getContext(), Native.solverGetAssertions(
getContext().nCtx(), getNativeObject()));
int n = ass.size();
int n = assrts.size();
BoolExpr[] res = new BoolExpr[n];
for (int i = 0; i < n; i++)
res[i] = new BoolExpr(getContext(), ass.get(i).getNativeObject());
res[i] = new BoolExpr(getContext(), assrts.get(i).getNativeObject());
return res;
}