mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-15 13:28:47 +00:00
Code Activity

expose BoolExpr[] for ASTVector and merge common functionality

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2015-05-22 08:57:05 -07:00
parent 4d8af9191c
commit 279ef05713
4 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/api/java/ASTVector.java
View file

@ -119,4 +119,12 @@ public class ASTVector extends Z3Object
getContext().getASTVectorDRQ().add(o); getContext().getASTVectorDRQ().add(o);
super.decRef(o); super.decRef(o);
} }
BoolExpr[] ToBoolArray() {
int n = size();
BoolExpr[] res = new BoolExpr[n];
for (int i = 0; i < n; i++)
res[i] = new BoolExpr(getContext(), get(i).getNativeObject());
return res;
}
} }

12
src/api/java/Fixedpoint.java
View file

@ -298,11 +298,7 @@ public class Fixedpoint extends Z3Object
ASTVector v = new ASTVector(getContext(), Native.fixedpointGetRules( ASTVector v = new ASTVector(getContext(), Native.fixedpointGetRules(
getContext().nCtx(), getNativeObject())); getContext().nCtx(), getNativeObject()));
int n = v.size(); return v.ToBoolArray();
BoolExpr[] res = new BoolExpr[n];
for (int i = 0; i < n; i++)
res[i] = new BoolExpr(getContext(), v.get(i).getNativeObject());
return res;
} }
/** /**
@ -315,11 +311,7 @@ public class Fixedpoint extends Z3Object
ASTVector v = new ASTVector(getContext(), Native.fixedpointGetAssertions( ASTVector v = new ASTVector(getContext(), Native.fixedpointGetAssertions(
getContext().nCtx(), getNativeObject())); getContext().nCtx(), getNativeObject()));
int n = v.size(); return v.ToBoolArray();
BoolExpr[] res = new BoolExpr[n];
for (int i = 0; i < n; i++)
res[i] = new BoolExpr(getContext(), v.get(i).getNativeObject());
return res;
} }
/** /**

8
src/api/java/InterpolationContext.java
View file

@ -90,7 +90,7 @@ public class InterpolationContext extends Context
public class ComputeInterpolantResult public class ComputeInterpolantResult
{ {
public Z3_lbool status = Z3_lbool.Z3_L_UNDEF; public Z3_lbool status = Z3_lbool.Z3_L_UNDEF;
public ASTVector interp = null; public BoolExpr[] interp = null;
public Model model = null; public Model model = null;
}; };
@ -109,8 +109,10 @@ public class InterpolationContext extends Context
ComputeInterpolantResult res = new ComputeInterpolantResult(); ComputeInterpolantResult res = new ComputeInterpolantResult();
Native.LongPtr n_i = new Native.LongPtr(); Native.LongPtr n_i = new Native.LongPtr();
Native.LongPtr n_m = new Native.LongPtr(); Native.LongPtr n_m = new Native.LongPtr();
res.status =Z3_lbool.fromInt(Native.computeInterpolant(nCtx(), pat.getNativeObject(), p.getNativeObject(), n_i, n_m)); res.status = Z3_lbool.fromInt(Native.computeInterpolant(nCtx(), pat.getNativeObject(), p.getNativeObject(), n_i, n_m));
if (res.status == Z3_lbool.Z3_L_FALSE) res.interp = new ASTVector(this, n_i.value); if (res.status == Z3_lbool.Z3_L_FALSE) {
res.interp = (new ASTVector(this, n_i.value)).ToBoolArray();
}
if (res.status == Z3_lbool.Z3_L_TRUE) res.model = new Model(this, n_m.value); if (res.status == Z3_lbool.Z3_L_TRUE) res.model = new Model(this, n_m.value);
return res; return res;
} }

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

@ -190,11 +190,7 @@ public class Solver extends Z3Object
{ {
ASTVector assrts = new ASTVector(getContext(), Native.solverGetAssertions( ASTVector assrts = new ASTVector(getContext(), Native.solverGetAssertions(
getContext().nCtx(), getNativeObject())); getContext().nCtx(), getNativeObject()));
int n = assrts.size(); return assrts.ToBoolArray();
BoolExpr[] res = new BoolExpr[n];
for (int i = 0; i < n; i++)
res[i] = new BoolExpr(getContext(), assrts.get(i).getNativeObject());
return res;
} }
/** /**