mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-04 13:21:22 +00:00
Code Activity

Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable

Browse source
This commit is contained in:
Nikolaj Bjorner 2012-12-03 11:02:08 -08:00
commit 8425685ea3
2 changed files with 22 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/api/java/AST.java
View file

@ -37,13 +37,15 @@ public class AST extends Z3Object
**/ **/
public boolean equals(Object o) public boolean equals(Object o)
{ {
AST casted = null; AST casted = null;
try { try
casted = AST.class.cast(o); {
} catch (ClassCastException e) { casted = AST.class.cast(o);
return false; } catch (ClassCastException e)
} {
return false;
}
return this.NativeObject() == casted.NativeObject(); return this.NativeObject() == casted.NativeObject();
} }
@ -60,18 +62,20 @@ public class AST extends Z3Object
return 1; return 1;
AST oAST = null; AST oAST = null;
try { try
AST.class.cast(other); {
} catch (ClassCastException e) { oAST = AST.class.cast(other);
return 1; } catch (ClassCastException e)
} {
return 1;
}
if (Id() < oAST.Id()) if (Id() < oAST.Id())
return -1; return -1;
else if (Id() > oAST.Id()) else if (Id() > oAST.Id())
return +1; return +1;
else else
return 0; return 0;
} }
/** /**

2
src/cmd_context/tactic_cmds.cpp
View file

@ -497,7 +497,7 @@ static tactic * mk_using_params(cmd_context & ctx, sexpr * n) {
throw cmd_exception("invalid using-params combinator, keyword expected", c->get_line(), c->get_pos()); throw cmd_exception("invalid using-params combinator, keyword expected", c->get_line(), c->get_pos());
if (i == num_children) if (i == num_children)
throw cmd_exception("invalid using-params combinator, parameter value expected", c->get_line(), c->get_pos()); throw cmd_exception("invalid using-params combinator, parameter value expected", c->get_line(), c->get_pos());
symbol param_name = c->get_symbol(); symbol param_name = symbol(smt2_keyword_to_param(c->get_symbol()).c_str());
c = n->get_child(i); c = n->get_child(i);
i++; i++;
switch (descrs.get_kind(param_name)) { switch (descrs.get_kind(param_name)) {