mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-23 09:05:31 +00:00
Code Activity

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

Browse source
This commit is contained in:
Leonardo de Moura 2012-12-03 16:58:56 -08:00
commit f0f90eecaa
50 changed files with 986 additions and 2517 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/api/api_datalog.cpp
View file

@ -48,7 +48,7 @@ namespace api {
if (!m.has_plugin(name)) {
m.register_plugin(name, alloc(datalog::dl_decl_plugin));
}
datalog::relation_manager& r = m_context.get_rmanager();
datalog::relation_manager& r = m_context.get_rel_context().get_rmanager();
r.register_plugin(alloc(datalog::external_relation_plugin, *this, r));
}
@ -295,7 +295,7 @@ extern "C" {
{
scoped_timer timer(timeout, &eh);
try {
r = to_fixedpoint_ref(d)->ctx().dl_query(num_relations, to_func_decls(relations));
r = to_fixedpoint_ref(d)->ctx().rel_query(num_relations, to_func_decls(relations));
}
catch (z3_exception& ex) {
mk_c(c)->handle_exception(ex);

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

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