mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-19 20:33:38 +00:00
Code Activity

compiler warnings

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2021-01-27 19:50:34 -08:00
parent 1800b48258
commit e61949059d
2 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2487,7 +2487,7 @@ public class Context implements AutoCloseable {
/** /**
* Creates a universal quantifier using a list of constants that will form the set of bound variables. * Creates a universal quantifier using a list of constants that will form the set of bound variables.
* @see #mkForall(Sort[],Symbol[],Expr,int,Pattern[],Expr[],Symbol,Symbol) * @see #mkForall(Sort[],Symbol[],Expr<BoolSort>,int,Pattern[],Expr<?>[],Symbol,Symbol)
**/ **/
public Quantifier mkForall(Expr<?>[] boundConstants, Expr<BoolSort> body, int weight, public Quantifier mkForall(Expr<?>[] boundConstants, Expr<BoolSort> body, int weight,
Pattern[] patterns, Expr<?>[] noPatterns, Symbol quantifierID, Pattern[] patterns, Expr<?>[] noPatterns, Symbol quantifierID,
@ -2500,7 +2500,7 @@ public class Context implements AutoCloseable {
/** /**
* Creates an existential quantifier using de-Bruijn indexed variables. * Creates an existential quantifier using de-Bruijn indexed variables.
* @see #mkForall(Sort[],Symbol[],Expr,int,Pattern[],Expr[],Symbol,Symbol) * @see #mkForall(Sort[],Symbol[],Expr<BoolSort>,int,Pattern[],Expr<?>[],Symbol,Symbol)
**/ **/
public Quantifier mkExists(Sort[] sorts, Symbol[] names, Expr<BoolSort> body, public Quantifier mkExists(Sort[] sorts, Symbol[] names, Expr<BoolSort> body,
int weight, Pattern[] patterns, Expr<?>[] noPatterns, int weight, Pattern[] patterns, Expr<?>[] noPatterns,
@ -2513,7 +2513,7 @@ public class Context implements AutoCloseable {
/** /**
* Creates an existential quantifier using a list of constants that will form the set of bound variables. * Creates an existential quantifier using a list of constants that will form the set of bound variables.
* @see #mkForall(Sort[],Symbol[],Expr,int,Pattern[],Expr[],Symbol,Symbol) * @see #mkForall(Sort[],Symbol[],Expr<BoolSort>,int,Pattern[],Expr<?>[],Symbol,Symbol)
**/ **/
public Quantifier mkExists(Expr<?>[] boundConstants, Expr<BoolSort> body, int weight, public Quantifier mkExists(Expr<?>[] boundConstants, Expr<BoolSort> body, int weight,
Pattern[] patterns, Expr<?>[] noPatterns, Symbol quantifierID, Pattern[] patterns, Expr<?>[] noPatterns, Symbol quantifierID,
@ -2526,7 +2526,7 @@ public class Context implements AutoCloseable {
/** /**
* Create a Quantifier. * Create a Quantifier.
* @see #mkForall(Sort[],Symbol[],Expr,int,Pattern[],Expr[],Symbol,Symbol) * @see #mkForall(Sort[],Symbol[],Expr<BoolSort>,int,Pattern[],Expr<?>[],Symbol,Symbol)
**/ **/
public Quantifier mkQuantifier(boolean universal, Sort[] sorts, public Quantifier mkQuantifier(boolean universal, Sort[] sorts,
Symbol[] names, Expr<BoolSort> body, int weight, Pattern[] patterns, Symbol[] names, Expr<BoolSort> body, int weight, Pattern[] patterns,
@ -2544,7 +2544,7 @@ public class Context implements AutoCloseable {
/** /**
* Create a Quantifier * Create a Quantifier
* @see #mkForall(Sort[],Symbol[],Expr,int,Pattern[],Expr[],Symbol,Symbol) * @see #mkForall(Sort[],Symbol[],Expr<BoolSort>,int,Pattern[],Expr<?>[],Symbol,Symbol)
**/ **/
public Quantifier mkQuantifier(boolean universal, Expr<?>[] boundConstants, public Quantifier mkQuantifier(boolean universal, Expr<?>[] boundConstants,
Expr<BoolSort> body, int weight, Pattern[] patterns, Expr<?>[] noPatterns, Expr<BoolSort> body, int weight, Pattern[] patterns, Expr<?>[] noPatterns,

17
src/ast/euf/euf_egraph.cpp
View file

@ -801,7 +801,7 @@ Insert: for each p in r1.P:
if p.cg == p: if p.cg == p:
append p to r2.P append p to r2.P
else else
add (p.cg == p) to 'to_merge' add (p.cg == p) to "to_merge"
Unmerge(r1, r2) Unmerge(r1, r2)
--------------- ---------------
@ -836,7 +836,6 @@ Claim: a node participates in a path along right adjoining sub-trees at most O(l
Justification (very roughly): the size of a right adjoining subtree can at most Justification (very roughly): the size of a right adjoining subtree can at most
be equal to the left adjoining sub-tree. This entails a logarithmic number of be equal to the left adjoining sub-tree. This entails a logarithmic number of
re-examinations from the right adjoining tree. re-examinations from the right adjoining tree.
(TBD check how Hopcroft's main argument is phrased)
The parent lists are bounded by the maximal arity of functions. The parent lists are bounded by the maximal arity of functions.
@ -844,16 +843,16 @@ Example:
Initially: Initially:
n1 := f(a,b) has root n1 n1 := f(a,b) has root n1
n2 := f(a',b) has root n2 n2 := f(a1,b) has root n2
table = [f(a,b) |-> n1, f(a',b) |-> n2] table = [f(a,b) |-> n1, f(a1,b) |-> n2]
merge(a,a') (a' becomes root) merge(a,a1) (a1 becomes root)
table = [f(a',b) |-> n2] table = [f(a1,b) |-> n2]
n1.cg = n2 n1.cg = n2
a'.P = [n2] a1.P = [n2]
n1 is not added as parent because it is not a cc root after the assignment a.root := a' n1 is not added as parent because it is not a cc root after the assignment a.root := a1
unmerge(a,a') unmerge(a,a1)
- nothing is erased - nothing is erased
- n1 is reinserted. It used to be a root. - n1 is reinserted. It used to be a root.