mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-29 03:45:51 +00:00
Code Activity

patch for #5164

Browse source
This commit is contained in:
Nikolaj Bjorner 2021-04-09 12:29:13 -07:00
parent 7aa4fc2d8f
commit 070eba0fe8
2 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/cmd_context/cmd_context.cpp
View file

@ -52,9 +52,10 @@ Notes:
#include "cmd_context/basic_cmds.h"
#include "cmd_context/cmd_context.h"
func_decls::func_decls(ast_manager & m, func_decl * f):
func_decls::func_decls(ast_manager & _m, func_decl * f):
m(&_m),
m_decls(TAG(func_decl*, f, 0)) {
m.inc_ref(f);
_m.inc_ref(f);
}
void func_decls::finalize(ast_manager & m) {
@ -94,9 +95,9 @@ bool func_decls::contains(func_decl * f) const {
}
else {
func_decl_set * fs = UNTAG(func_decl_set *, m_decls);
for (func_decl* g : *fs) {
if (signatures_collide(f, g)) return true;
}
for (func_decl* g : *fs)
if (signatures_collide(f, g))
return true;
}
return false;
}
@ -203,8 +204,18 @@ bool func_decls::check_signature(func_decl* f, unsigned arity, sort * const* dom
return false;
unsigned i = 0;
for (i = 0; domain && i < arity; i++) {
if (f->get_domain(i) != domain[i])
sort* s1 = f->get_domain(i);
sort* s2 = domain[i];
if (s1 != s2)
continue;
if (!m)
return false;
arith_util au(*m);
if (au.is_real(s1) && au.is_int(s2))
continue;
if (au.is_real(s2) && au.is_int(s1))
continue;
return false;
}
return i == arity || !domain;
}

5
src/cmd_context/cmd_context.h
View file

@ -43,11 +43,12 @@ Notes:
class func_decls {
func_decl * m_decls;
ast_manager* m { nullptr };
func_decl * m_decls { nullptr };
bool signatures_collide(func_decl* f, func_decl* g) const;
bool signatures_collide(unsigned n, sort*const* domain, sort* range, func_decl* g) const;
public:
func_decls():m_decls(nullptr) {}
func_decls() {}
func_decls(ast_manager & m, func_decl * f);
void finalize(ast_manager & m);
bool contains(func_decl * f) const;